diff --git a/dmp-backend/dmp-backend.iml b/dmp-backend/dmp-backend.iml
deleted file mode 100644
index c5ac1805e..000000000
--- a/dmp-backend/dmp-backend.iml
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index 3e400ccc2..7c979186d 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -5,16 +5,20 @@
dmp-backend
dmp-backend
0.0.1-SNAPSHOT
- war
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 1.5.9.RELEASE
+
1.19.0
1.19.0
0.0.1-SNAPSHOT
4.3.8.RELEASE
-
+
4.2.3.RELEASE
1.19.1
7.0.35
@@ -41,6 +45,16 @@
+
+
+
+
+
+ org.json
+ json
+ 20160810
+
+
org.hibernate
@@ -53,266 +67,96 @@
hibernate-c3p0
${hibernate.version}
-
-
-
-
+
+
- javax.servlet
- javax.servlet-api
- ${javax.servlet.servlet-api.version}
- provided
+ com.google.api-client
+ google-api-client
+ 1.23.0
-
+
- org.springframework
- spring-core
- ${org.springframework.version}
+ com.jayway.jsonpath
+ json-path
+ 2.4.0
-
- org.springframework
- spring-aop
- ${org.springframework.version}
-
-
- org.springframework
- spring-tx
- ${org.springframework.version}
-
-
- org.springframework
- spring-context-support
- ${org.springframework.version}
-
-
-
-
+
- org.springframework
- spring-orm
- ${org.springframework.version}
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-xml
+ 2.9.3
-
-
- org.springframework
- spring-webmvc
- ${org.springframework.version}
-
-
-
-
- org.springframework.security
- spring-security-core
- ${org.springframework.security.version}
-
-
-
- org.springframework.security
- spring-security-web
- ${org.springframework.security.version}
-
-
org.springframework.security
- spring-security-config
- ${org.springframework.security.version}
+ spring-security-web
+ 4.2.3.RELEASE
-
- javax.servlet
- jstl
- 1.2
-
-
-
- commons-fileupload
- commons-fileupload
- 1.2.1
-
+
+
-
- com.fasterxml.jackson.core
- jackson-annotations
- ${com.fasterxml.jackson}
-
-
- com.fasterxml.jackson.core
- jackson-core
- ${com.fasterxml.jackson}
+ org.springframework.boot
+ spring-boot-starter-web
+
+
com.fasterxml.jackson.core
jackson-databind
- ${com.fasterxml.jackson}
-
-
-
- com.fasterxml.jackson.datatype
- jackson-datatype-hibernate5
- ${com.fasterxml.jackson}
-
-
-
- com.fasterxml.jackson.dataformat
- jackson-dataformat-xml
- ${com.fasterxml.jackson}
-
-
-
-
-
- org.json
- json
- 20160810
-
-
-
-
-
- org.apache.tomcat
- tomcat-jdbc
- ${org.apache.tomcat.tomcat-jdbc.version}
- provided
-
-
-
-
- junit
- junit
- ${org.junit.version}
- test
-
-
-
- com.google.code.gson
- gson
- 2.8.2
- test
-
-
-
-
-
- org.postgresql
- postgresql
- 9.4.1212
-
-
-
-
-
- log4j
- log4j
- ${log4j.version}
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
- commons-codec
- commons-codec
- ${commons-codec.version}
+ com.fasterxml.jackson.core
+ jackson-annotations
+ 2.9.0
-
-
+
- org.slf4j
- jcl-over-slf4j
- ${slf4j.version}
- runtime
+ org.springframework
+ spring-context
+ 4.3.10.RELEASE
-
- org.slf4j
- slf4j-log4j12
- ${slf4j.version}
- runtime
-
-
- log4j
- log4j
- ${log4j.version}
- runtime
-
-
-
- com.jayway.jsonpath
- json-path
- 2.4.0
-
-
-
-
-
-
-
-
-
-
- com.google.apis
- google-api-services-oauth2
- v2-rev75-1.19.0
-
-
- com.google.guava
- guava-jdk5
-
-
-
-
- com.google.http-client
- google-http-client-jackson2
- ${project.http.version}
-
-
- com.google.oauth-client
- google-oauth-client-jetty
- ${project.oauth.version}
-
-
-
-
-
-
- org.springframework.security
- spring-security-web
- ${org.springframework.security.version}
-
-
- org.springframework.security
- spring-security-config
- ${org.springframework.security.version}
-
-
-
- org.springframework
- spring-tx
- ${org.springframework.version}
-
-
-
-
+
com.google.guava
guava
23.0
-
-
-
-
- io.springfox
- springfox-swagger2
- 2.7.0
-
-
-
-
-
-
-
+
+
+ org.springframework
+ spring-context-support
+ 4.0.0.RELEASE
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
+
+
+ junit
+ junit
+ 4.12
+ test
+
+
+
+ postgresql
+ postgresql
+ 9.1-901.jdbc4
+
io.springfox
@@ -333,35 +177,20 @@
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
org.apache.maven.plugins
maven-compiler-plugin
- 3.1
1.8
- UTF-8
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
- 2.10
-
-
- analyze
-
- analyze-only
-
-
- false
-
-
-
-
-
${project.artifactId}
diff --git a/dmp-backend/src/main/java/checks/EnvironmentChecker.java b/dmp-backend/src/main/java/checks/EnvironmentChecker.java
deleted file mode 100644
index fe70e6227..000000000
--- a/dmp-backend/src/main/java/checks/EnvironmentChecker.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package checks;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-public class EnvironmentChecker implements ServletContextListener {
-
- @Override
- public void contextDestroyed(ServletContextEvent arg0) {
-
- }
-
- @Override
- public void contextInitialized(ServletContextEvent arg0) {
- try{
- MessageDigest.getInstance("SHA-256");
- System.out.println("SHA-256 algorithm found, as expected!");
- }
- catch(NoSuchAlgorithmException ex) {
- System.out.println("\n\n\n\nSEVERE ERROR: COULD NOT FIND WITHIN JVM THE SHA-256 ALGORITHM. PLEASE UPDATE THE JRE TO A VERSION >= 1.7\n\n\n\n");
- //shutting down the webapp should also be considered
- }
-
-
-
- }
-
-}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/configs/WebConfiguration.java b/dmp-backend/src/main/java/configs/WebConfiguration.java
deleted file mode 100644
index 3f5245123..000000000
--- a/dmp-backend/src/main/java/configs/WebConfiguration.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package configs;
-
-import java.util.List;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
-import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module.Feature;
-
-@Configuration
-@EnableWebMvc
-public class WebConfiguration extends WebMvcConfigurerAdapter {
-
- @Override
- public void configureMessageConverters(List> converters) {
-
- Hibernate5Module module = new Hibernate5Module();
- module.enable(Feature.SERIALIZE_IDENTIFIER_FOR_LAZY_NOT_LOADED_OBJECTS);
- ObjectMapper objectMapper = new ObjectMapper()
-// .setSerializationInclusion(Include.NON_NULL)
-// .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
- .registerModule(new Hibernate5Module())
- ;
-
- converters.add(new MappingJackson2HttpMessageConverter(objectMapper));
-
- System.out.println("Using custom json serializer loaded with module Hibernate5Module");
-
- }
-}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/controller/UIController.java b/dmp-backend/src/main/java/controller/UIController.java
deleted file mode 100644
index 2f1a2d66f..000000000
--- a/dmp-backend/src/main/java/controller/UIController.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package controller;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import dao.entities.DMPDao;
-
-@Controller
-public class UIController {
-
- @Autowired private DMPDao dMPDao;
-
- @RequestMapping(value = "/home", method = RequestMethod.GET)
- public String printWelcome(ModelMap model) {
- model.addAttribute("DMPs", dMPDao.getAll());
- return "home";
- }
-
-}
diff --git a/dmp-backend/src/main/java/dao/entities/DMPProfileDao.java b/dmp-backend/src/main/java/dao/entities/DMPProfileDao.java
deleted file mode 100644
index 23ed9e85e..000000000
--- a/dmp-backend/src/main/java/dao/entities/DMPProfileDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package dao.entities;
-
-import java.util.List;
-import java.util.UUID;
-
-import dao.Dao;
-import entities.DMPProfile;
-import entities.responses.IDLabelPair;
-
-public interface DMPProfileDao extends Dao {
-
- List listAllIDs();
-
- List listAllIDsLabels();
-
-}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/dao/entities/DMPResearcherDao.java b/dmp-backend/src/main/java/dao/entities/DMPResearcherDao.java
deleted file mode 100644
index c97e6c78d..000000000
--- a/dmp-backend/src/main/java/dao/entities/DMPResearcherDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package dao.entities;
-
-import java.util.UUID;
-
-import dao.Dao;
-import entities.DMPResearcher;
-import entities.Researcher;
-
-public interface DMPResearcherDao extends Dao {
-
-
- Researcher getResearcherByEmail(String email);
-
-}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/dao/entities/DatasetProfileRulesetDao.java b/dmp-backend/src/main/java/dao/entities/DatasetProfileRulesetDao.java
deleted file mode 100644
index 478579922..000000000
--- a/dmp-backend/src/main/java/dao/entities/DatasetProfileRulesetDao.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package dao.entities;
-
-import java.util.UUID;
-
-import dao.Dao;
-import entities.DatasetProfileRuleset;
-
-public interface DatasetProfileRulesetDao extends Dao {
-
-}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/dao/entities/DatasetProfileViewstyleDao.java b/dmp-backend/src/main/java/dao/entities/DatasetProfileViewstyleDao.java
deleted file mode 100644
index 6fee75767..000000000
--- a/dmp-backend/src/main/java/dao/entities/DatasetProfileViewstyleDao.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package dao.entities;
-
-import java.util.UUID;
-
-import dao.Dao;
-import entities.DatasetProfileViewstyle;
-
-public interface DatasetProfileViewstyleDao extends Dao {
-
-}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/dao/entities/DatasetRegistryDao.java b/dmp-backend/src/main/java/dao/entities/DatasetRegistryDao.java
deleted file mode 100644
index 715048c7e..000000000
--- a/dmp-backend/src/main/java/dao/entities/DatasetRegistryDao.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package dao.entities;
-
-import java.util.UUID;
-
-import dao.Dao;
-import entities.DatasetRegistry;
-
-public interface DatasetRegistryDao extends Dao {
-
-}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/dao/entities/DatasetServiceDao.java b/dmp-backend/src/main/java/dao/entities/DatasetServiceDao.java
deleted file mode 100644
index fe1e7c5be..000000000
--- a/dmp-backend/src/main/java/dao/entities/DatasetServiceDao.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package dao.entities;
-
-import java.util.UUID;
-
-import dao.Dao;
-import entities.DatasetService;
-
-public interface DatasetServiceDao extends Dao {
-
-}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/entities/DatasetDataRepository.java b/dmp-backend/src/main/java/entities/DatasetDataRepository.java
deleted file mode 100644
index a98ee5645..000000000
--- a/dmp-backend/src/main/java/entities/DatasetDataRepository.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package entities;
-
-
-import java.io.Serializable;
-import java.util.UUID;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Proxy;
-import org.hibernate.annotations.Type;
-
-import com.fasterxml.jackson.annotation.JsonIdentityInfo;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-
-
-@Entity
-@Table(name="\"DatasetDataRepository\"")
-@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
-public class DatasetDataRepository implements Serializable {
-
-
- private static final long serialVersionUID = 576327201656132811L;
-
- public DatasetDataRepository () {}
-
-
- @Id
- @GeneratedValue
- @GenericGenerator(name = "uuid2", strategy = "uuid2")
- @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
- private UUID id;
-
- @Type(type="org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL
- @Column(name = "\"Dataset\"", nullable = false)
- private UUID dataset;
-
- @Type(type="org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL
- @Column(name = "\"DataRepository\"", nullable = false)
- private UUID dataRepository;
-
- @Column(name = "\"Role\"")
- private Integer role;
-
- public UUID getId() {
- return id;
- }
-
- public void setId(UUID id) {
- this.id = id;
- }
-
- public UUID getDataset() {
- return dataset;
- }
-
- public void setDataset(UUID dataset) {
- this.dataset = dataset;
- }
-
- public UUID getDataRepository() {
- return dataRepository;
- }
-
- public void setDataRepository(UUID dataRepository) {
- this.dataRepository = dataRepository;
- }
-
- public Integer getRole() {
- return role;
- }
-
- public void setRole(Integer role) {
- this.role = role;
- }
-
-
-
-
-}
diff --git a/dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java b/dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java
deleted file mode 100644
index 5523ecd3e..000000000
--- a/dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package entities.xmlmodels.modeldefinition;
-
-import utilities.DatabaseDefinition;
-
-public interface DatabaseModelDefinition extends DatabaseDefinition{
-
-}
diff --git a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/DatabaseViewStyleDefinition.java b/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/DatabaseViewStyleDefinition.java
deleted file mode 100644
index d7998eaf7..000000000
--- a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/DatabaseViewStyleDefinition.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package entities.xmlmodels.viewstyledefinition;
-
-import utilities.DatabaseDefinition;
-
-public interface DatabaseViewStyleDefinition extends DatabaseDefinition{
-
-}
diff --git a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/Field.java b/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/Field.java
deleted file mode 100644
index 251093a12..000000000
--- a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/Field.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package entities.xmlmodels.viewstyledefinition;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import entities.xmlmodels.modeldefinition.DatabaseModelDefinition;
-import models.components.commons.ViewStyle;
-import models.components.commons.Visibility;
-import models.components.commons.datafield.FieldData;
-import utilities.XmlSerializable;
-import utilities.builders.ModelBuilder;
-import utilities.builders.XmlBuilder;
-
-public class Field implements DatabaseViewStyleDefinition,XmlSerializable{
- private String id;
- private int ordinal;
- private boolean defaultVisibility;
- private String title;
- private String description;
- private String extendedDescription;
- private ViewStyle viewStyle;
- private Visibility visible;
- private FieldData data;
- public String getId() {
- return id;
- }
- public void setId(String id) {
- this.id = id;
- }
- public int getOrdinal() {
- return ordinal;
- }
- public void setOrdinal(int ordinal) {
- this.ordinal = ordinal;
- }
- public boolean getDefaultVisibility() {
- return defaultVisibility;
- }
- public void setDefaultVisibility(boolean defaultVisibility) {
- this.defaultVisibility = defaultVisibility;
- }
- public String getTitle() {
- return title;
- }
- public void setTitle(String title) {
- this.title = title;
- }
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
- public String getExtendedDescription() {
- return extendedDescription;
- }
- public void setExtendedDescription(String extendedDescription) {
- this.extendedDescription = extendedDescription;
- }
- public ViewStyle getViewStyle() {
- return viewStyle;
- }
- public void setViewStyle(ViewStyle viewStyle) {
- this.viewStyle = viewStyle;
- }
-
- public FieldData getData() {
- return data;
- }
- public void setData(FieldData data) {
- this.data = data;
- }
-
- public Visibility getVisible() {
- return visible;
- }
- public void setVisible(Visibility visible) {
- this.visible = visible;
- }
- @Override
- public Element toXml(Document doc) {
- Element rootElement = doc.createElement("field");
- rootElement.setAttribute("id", this.id);
- rootElement.setAttribute("ordinal", ""+this.ordinal);
- rootElement.setAttribute("defaultVisibility",""+this.defaultVisibility);
-
- Element extendedDescription = doc.createElement("extendedDescription");
- extendedDescription.setTextContent(this.extendedDescription);
-
- Element description = doc.createElement("description");
- description.setTextContent(this.description);
-
- Element title = doc.createElement("title");
- title.setTextContent(this.title);
-
- Element viewStyle = doc.createElement("viewStyle");
- viewStyle.setAttribute("renderstyle", this.viewStyle.getRenderStyle());
- viewStyle.setAttribute("cssClass", this.viewStyle.getCssClass());
-
- Element visibility = this.visible.toXml(doc);
-
- rootElement.appendChild(title);
- rootElement.appendChild(visibility);
- rootElement.appendChild(extendedDescription);
- rootElement.appendChild(viewStyle);
- rootElement.appendChild(description);
- if(this.data!=null)rootElement.appendChild(this.data.toXml(doc));
- return rootElement;
- }
- @Override
- public Field fromXml(Element element) {
- this.id = element.getAttribute("id");
- this.ordinal = Integer.parseInt(element.getAttribute("ordinal"));
- this.defaultVisibility = Boolean.valueOf(element.getAttribute("defaultVisibility")).booleanValue();
-
- Element extendedDescription = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "extendedDescription");
-
- this.extendedDescription = extendedDescription.getTextContent();
-
- Element description = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "description");
-
- this.description = description.getTextContent();
-
- Element title = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "title");
-
- this.title = title.getTextContent();
-
- this.viewStyle = new ViewStyle();
- Element viewStyle = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "viewStyle");
-
- this.viewStyle.setRenderStyle(viewStyle.getAttribute("renderstyle"));
- this.viewStyle.setCssClass(viewStyle.getAttribute("cssClass"));
-
- Element visibility = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "visible");
-
- this.visible = new Visibility().fromXml(visibility);
-
- Element dataElement = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "data");
-
- this.data = new ModelBuilder().toFieldData(null, this.viewStyle.getRenderStyle(),dataElement);
- if(this.data!=null)this.data.fromXml(dataElement);
- return this;
- }
-
-}
diff --git a/dmp-backend/src/main/java/cache/ResponsesCache.java b/dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java
similarity index 98%
rename from dmp-backend/src/main/java/cache/ResponsesCache.java
rename to dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java
index 4b4200a3a..4e2d4c3a7 100644
--- a/dmp-backend/src/main/java/cache/ResponsesCache.java
+++ b/dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java
@@ -1,4 +1,4 @@
-package cache;
+package eu.eudat.cache;
import java.util.ArrayList;
diff --git a/dmp-backend/src/main/java/rest/entities/Admin.java b/dmp-backend/src/main/java/eu/eudat/controllers/Admin.java
similarity index 60%
rename from dmp-backend/src/main/java/rest/entities/Admin.java
rename to dmp-backend/src/main/java/eu/eudat/controllers/Admin.java
index 8e8385ef0..0d67e9d55 100644
--- a/dmp-backend/src/main/java/rest/entities/Admin.java
+++ b/dmp-backend/src/main/java/eu/eudat/controllers/Admin.java
@@ -1,39 +1,24 @@
-package rest.entities;
+package eu.eudat.controllers;
-import java.util.List;
import java.util.UUID;
-import java.util.stream.Collectors;
+import eu.eudat.dao.entities.*;
+import eu.eudat.managers.DashBoardManager;
+import eu.eudat.models.dashboard.DashBoardStatistics;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import eu.eudat.managers.AdminManager;
+import eu.eudat.models.admin.composite.DatasetProfile;
-import dao.entities.DatasetProfileDao;
-import dao.entities.DatasetProfileRulesetDao;
-import dao.entities.DatasetProfileViewstyleDao;
-import entities.DatasetProfileViewstyle;
-import entities.xmlmodels.modeldefinition.FieldGroup;
-import entities.xmlmodels.viewstyledefinition.Section;
-import managers.AdminManager;
-import models.admin.components.datasetprofile.FieldSet;
-import models.admin.composite.DatasetProfile;
-import utilities.builders.ModelBuilder;
-import utilities.builders.XmlBuilder;
-import utilities.helpers.ModelBuilderCollector;
+import javax.transaction.Transactional;
@RestController
@CrossOrigin
@@ -47,8 +32,8 @@ public class Admin {
@RequestMapping(method = RequestMethod.POST, value = { "/admin/addDmp" },consumes = "application/json", produces="application/json")
public ResponseEntity