diff --git a/Dockerfile b/Dockerfile
index 78343ef..2bc1b7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,8 @@ FROM tomcat:7.0.90-jre8
MAINTAINER "pkanakakis@di.uoa.gr"
RUN ["rm", "-fr", "/usr/local/tomcat/webapps/ROOT"]
COPY ./target/uoa-repository-manager-service.war /usr/local/tomcat/webapps/uoa-repository-manager-service.war
-COPY src/main/resources/dnet-override-new.properties /usr/local/tomcat/lib/dnet-override.properties
+#COPY src/main/resources/dnet-override-new.properties /usr/local/tomcat/lib/dnet-override.properties
+COPY src/main/resources/application.properties /usr/local/tomcat/lib/dnet-override.properties
#COPY src/main/resources/application.properties /usr/local/tomcat/lib/application.properties
#COPY src/main/resources/email-texts.properties /usr/local/tomcat/lib/email-texts.properties
VOLUME /var/log/uoa-repository-manager-service:/var/log/uoa-repository-manager-service/
diff --git a/pom.xml b/pom.xml
index 7df06b4..a1daa72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -246,6 +246,41 @@
1.1.5.RELEASE
+
+
+ javax.xml.ws
+ jaxws-api
+ 2.3.0
+
+
+
+ javax.jws
+ javax.jws-api
+ 1.1
+
+
+ javax.xml.bind
+ jaxb-api
+ 2.3.0
+
+
+ com.sun.xml.bind
+ jaxb-impl
+ 2.3.0
+
+
+
+ com.sun.xml.bind
+ jaxb-core
+ 2.3.0
+
+
+ javax.activation
+ activation
+ 1.1-rev-1
+
+
+
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java
new file mode 100644
index 0000000..3c9befc
--- /dev/null
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java
@@ -0,0 +1,31 @@
+package eu.dnetlib.repo.manager.controllers;
+
+import eu.dnetlib.repo.manager.domain.RepositorySummaryInfo;
+import eu.dnetlib.repo.manager.service.DashboardService;
+import io.swagger.annotations.Api;
+import org.json.JSONException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "/dashboard")
+@Api(description = "Dashboard API", tags = {"dashboard"})
+public class DashboardController {
+
+ @Autowired
+ DashboardService dashboardService;
+
+ @RequestMapping(value = "/getRepositoriesSummary/{userEmail}/{page}/{size}" , method = RequestMethod.GET,
+ produces = MediaType.APPLICATION_JSON_VALUE)
+ @ResponseBody
+ @PreAuthorize("hasRole('ROLE_USER')")
+ public List getRepositoriesSummaryInfo(@PathVariable("userEmail") String userEmail,
+ @PathVariable("page") String page,
+ @PathVariable("size") String size) throws JSONException {
+ return dashboardService.getRepositoriesSummaryInfo(userEmail, page, size);
+ }
+}
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
index a6c0dbb..571fec2 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
@@ -28,7 +28,7 @@ public class PiWikController {
}
@RequestMapping(value = "/savePiwikInfo" , method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
- @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PORTAL_ADMIN') or (hasRole('ROLE_USER') " +
+ @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN') or (hasRole('ROLE_USER') " +
"and #piwikInfo.requestorEmail == authentication.userInfo.email)")
public PiwikInfo savePiwikInfo(@RequestBody PiwikInfo piwikInfo) {
return piWikService.savePiwikInfo(piwikInfo);
@@ -41,7 +41,7 @@ public class PiWikController {
@RequestMapping(value = "/approvePiwikSite/{repositoryId}" , method = RequestMethod.GET)
@ResponseBody
- @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PORTAL_ADMIN')")
+ @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_PROVIDE_ADMIN')")
public ResponseEntity