Updating interfaces to not include IsSerializable

pom.xml

@@ -33,7 +33,7 @@
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>(1.2, 1.5]</version>
-            <scope>compile</scope>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -71,8 +71,11 @@
             <artifactId>dnet-openaire-usage-stats-sushilite</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
-
-
+        <dependency>
+            <groupId>eu.dnetlib</groupId>
+            <artifactId>dnet-openaire-broker-common</artifactId>
+            <version>1.0.2-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
@@ -279,6 +282,7 @@
             <artifactId>openaire-cris-validator</artifactId>
             <version>1.0.1-SNAPSHOT</version>
         </dependency>
+
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

src/main/java/eu/dnetlib/repo/manager/controllers/BrokerController.java

@@ -1,9 +1,9 @@
 package eu.dnetlib.repo.manager.controllers;
 
 import eu.dnetlib.repo.manager.service.BrokerServiceImpl;
-import eu.dnetlib.repo.manager.shared.BrokerException;
-import eu.dnetlib.repo.manager.shared.Term;
-import eu.dnetlib.repo.manager.shared.broker.*;
+import eu.dnetlib.repo.manager.domain.BrokerException;
+import eu.dnetlib.repo.manager.domain.Term;
+import eu.dnetlib.repo.manager.domain.broker.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import org.json.JSONException;
@@ -25,7 +25,6 @@ public class BrokerController{
     @Autowired
     private BrokerServiceImpl brokerService;
 
-
     @RequestMapping(value = "/getDatasourcesOfUser" , method = RequestMethod.GET,
             produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody

src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java

@@ -8,10 +8,9 @@ import eu.dnetlib.repo.manager.service.BrokerService;
 import eu.dnetlib.repo.manager.service.DashboardService;
 import eu.dnetlib.repo.manager.service.PiWikService;
 import eu.dnetlib.repo.manager.service.RepositoryService;
-import eu.dnetlib.repo.manager.shared.AggregationDetails;
-import eu.dnetlib.repo.manager.shared.BrokerException;
-import eu.dnetlib.repo.manager.shared.MetricsInfo;
-import eu.dnetlib.repo.manager.shared.RepositoryServiceException;
+import eu.dnetlib.repo.manager.domain.AggregationDetails;
+import eu.dnetlib.repo.manager.domain.BrokerException;
+import eu.dnetlib.repo.manager.domain.RepositoryServiceException;
 import io.swagger.annotations.Api;
 import org.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java

@@ -5,7 +5,7 @@ import eu.dnetlib.api.functionality.ValidatorServiceException;
 import eu.dnetlib.repo.manager.exception.EndPointException;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
 import eu.dnetlib.repo.manager.exception.ServerError;
-import eu.dnetlib.repo.manager.shared.BrokerException;
+import eu.dnetlib.repo.manager.domain.BrokerException;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.json.JSONException;

src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java

@@ -3,7 +3,7 @@ package eu.dnetlib.repo.manager.controllers;
 import eu.dnetlib.api.functionality.ValidatorServiceException;
 import eu.dnetlib.domain.functionality.validator.StoredJob;
 import eu.dnetlib.repo.manager.service.MonitorServiceImpl;
-import eu.dnetlib.repo.manager.shared.JobsOfUser;
+import eu.dnetlib.repo.manager.domain.JobsOfUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import org.apache.log4j.Logger;

src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java

@@ -6,7 +6,7 @@ import eu.dnetlib.repo.manager.domain.OrderByType;
 import eu.dnetlib.repo.manager.domain.Paging;
 import eu.dnetlib.repo.manager.service.PiWikServiceImpl;
 import eu.dnetlib.repo.manager.service.RepositoryService;
-import eu.dnetlib.repo.manager.shared.RepositoryServiceException;
+import eu.dnetlib.repo.manager.domain.RepositoryServiceException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -15,13 +15,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PostAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintWriter;

src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java

@@ -3,22 +3,18 @@ package eu.dnetlib.repo.manager.controllers;
 import eu.dnetlib.api.functionality.ValidatorServiceException;
 import eu.dnetlib.domain.data.Repository;
 import eu.dnetlib.domain.data.RepositoryInterface;
-import eu.dnetlib.repo.manager.domain.RepositorySnippet;
+import eu.dnetlib.repo.manager.domain.*;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
 import eu.dnetlib.repo.manager.service.RepositoryServiceImpl;
-import eu.dnetlib.repo.manager.shared.*;
 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.PostAuthorize;
-import org.springframework.security.access.prepost.PostFilter;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
-import javax.ws.rs.Path;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;

src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java

@@ -1,15 +1,12 @@
 package eu.dnetlib.repo.manager.controllers;
 
 import eu.dnetlib.api.functionality.ValidatorServiceException;
-import eu.dnetlib.domain.data.RepositoryInterface;
-import eu.dnetlib.domain.functionality.validator.JobResultEntry;
 import eu.dnetlib.domain.functionality.validator.StoredJob;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
 import eu.dnetlib.repo.manager.service.EmailUtils;
-import eu.dnetlib.repo.manager.service.RepositoryService;
 import eu.dnetlib.repo.manager.service.ValidatorServiceImpl;
-import eu.dnetlib.repo.manager.shared.InterfaceInformation;
-import eu.dnetlib.repo.manager.shared.ValidationServiceException;
+import eu.dnetlib.repo.manager.domain.InterfaceInformation;
+import eu.dnetlib.repo.manager.domain.ValidationServiceException;
 import eu.dnetlib.domain.functionality.validator.JobForValidation;
 import eu.dnetlib.domain.functionality.validator.RuleSet;
 
@@ -24,8 +21,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.ws.rs.Path;
-
 
 @RestController
 @RequestMapping(value = "/validator")

src/main/java/eu/dnetlib/repo/manager/domain/AggregationDetails.java

@@ -1,11 +1,9 @@
-package eu.dnetlib.repo.manager.shared;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
+package eu.dnetlib.repo.manager.domain;
 
 import java.util.Calendar;
 import java.util.Date;
 
-public class AggregationDetails implements IsSerializable{
+public class AggregationDetails{
 
 
     private String aggregationStage;

src/main/java/eu/dnetlib/repo/manager/domain/Aggregations.java

@@ -1,11 +1,9 @@
-package eu.dnetlib.repo.manager.shared;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
+package eu.dnetlib.repo.manager.domain;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class Aggregations implements IsSerializable{
+public class Aggregations{
 
     private List<AggregationDetails> aggregationHistory = new ArrayList<>();
     private AggregationDetails lastCollection;

src/main/java/eu/dnetlib/repo/manager/domain/BrokerException.java

@@ -1,4 +1,4 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
 
 
 /**

src/main/java/eu/dnetlib/repo/manager/domain/BrokerSummary.java

@@ -1,7 +1,7 @@
 package eu.dnetlib.repo.manager.domain;
 
-import eu.dnetlib.repo.manager.shared.broker.BrowseEntry;
-import eu.dnetlib.repo.manager.shared.broker.SimpleSubscriptionDesc;
+import eu.dnetlib.repo.manager.domain.broker.BrowseEntry;
+import eu.dnetlib.repo.manager.domain.broker.SimpleSubscriptionDesc;
 
 import java.util.List;
 import java.util.Map;

src/main/java/eu/dnetlib/repo/manager/domain/CollectionMonitorSummary.java

@@ -1,11 +1,6 @@
 package eu.dnetlib.repo.manager.domain;
 
-import eu.dnetlib.repo.manager.shared.AggregationDetails;
-import eu.dnetlib.repo.manager.shared.broker.BrowseEntry;
-import eu.dnetlib.repo.manager.shared.broker.SimpleSubscriptionDesc;
-
 import java.util.List;
-import java.util.Map;
 
 public class CollectionMonitorSummary {
     private List<AggregationDetails> aggregationDetails;

src/main/java/eu/dnetlib/repo/manager/domain/Constants.java

@@ -1,12 +1,12 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
+
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 /**
  * Created by nikonas on 23/12/15.
  */
 
-public class Constants implements IsSerializable {
+public class Constants{
 
     public static final String MODE_LOCAL = "local";
     public static final String MODE_DNET = "dnet";

src/main/java/eu/dnetlib/repo/manager/domain/Country.java

@@ -1,4 +1,4 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
 
 public class Country {
 

src/main/java/eu/dnetlib/repo/manager/domain/DatasourceRegistrationState.java

@@ -1,12 +1,11 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 import eu.dnetlib.domain.data.Repository;
 
 /**
  * Created by stefania on 12/17/15.
  */
-public class DatasourceRegistrationState extends WizardState implements IsSerializable {
+public class DatasourceRegistrationState extends WizardState {
 
     private String mode;
     private String selectedRepositoryId;

src/main/java/eu/dnetlib/repo/manager/domain/DatasourceVocabularies.java

@@ -1,6 +1,5 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 import java.util.List;
 import java.util.Map;
@@ -8,7 +7,7 @@ import java.util.Map;
 /**
  * Created by nikonas on 21/12/15.
  */
-public class DatasourceVocabularies implements IsSerializable {
+public class DatasourceVocabularies{
 
     private Map<String, String> countries;
     private List<Timezone> timezones;

src/main/java/eu/dnetlib/repo/manager/domain/DatasourcesCollection.java

@@ -1,6 +1,5 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 import eu.dnetlib.domain.data.Repository;
 
 import java.util.ArrayList;
@@ -9,7 +8,7 @@ import java.util.List;
 /**
  * Created by nikonas on 14/1/16.
  */
-public class DatasourcesCollection implements IsSerializable{
+public class DatasourcesCollection{
 
     private List<Repository> datasourcesOfUser;
     private List<Repository> sharedDatasources;

src/main/java/eu/dnetlib/repo/manager/domain/InterfaceInformation.java

@@ -1,13 +1,12 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 import java.util.List;
 
 /**
  * Created by nikonas on 7/1/16.
  */
-public class InterfaceInformation implements IsSerializable {
+public class InterfaceInformation{
 
     private boolean identified;
     private List<String> sets;

src/main/java/eu/dnetlib/repo/manager/domain/JobsOfUser.java

@@ -1,6 +1,6 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
+
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 import eu.dnetlib.domain.functionality.validator.StoredJob;
 
 import java.util.List;
@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * Created by nikonas on 29/3/16.
  */
-public class JobsOfUser implements IsSerializable {
+public class JobsOfUser   {
 
     private int totalJobs;
     private int totalJobsSuccessful;

src/main/java/eu/dnetlib/repo/manager/domain/MetricsInfo.java

@@ -1,11 +1,11 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
+
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 /**
  * Created by stefania on 11/6/17.
  */
-public class MetricsInfo implements IsSerializable {
+public class MetricsInfo   {
 
     private MetricsNumbers metricsNumbers;
     private String diagramsBaseURL;

src/main/java/eu/dnetlib/repo/manager/domain/MetricsNumbers.java

@@ -1,14 +1,13 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 import java.util.List;
 
 /**
  * Created by stefania on 11/7/17.
  */
-public class MetricsNumbers implements IsSerializable {
+public class MetricsNumbers{
 
     private List<String> downloads;
     private List<String> views;

src/main/java/eu/dnetlib/repo/manager/domain/Organization.java

@@ -1,8 +1,8 @@
 package eu.dnetlib.repo.manager.domain;
 
-import java.io.Serializable;
 
-public class Organization implements Serializable {
+
+public class Organization{
     private String country;
     private String legalname;
     private String websiteurl;

src/main/java/eu/dnetlib/repo/manager/domain/RepositoryServiceException.java

@@ -1,13 +1,11 @@
-package eu.dnetlib.repo.manager.shared;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
+package eu.dnetlib.repo.manager.domain;
 
 /**
  * Created by nikonas on 7/12/15.
  */
-public class RepositoryServiceException extends Exception implements IsSerializable {
+public class RepositoryServiceException extends Exception {
 
-    public enum ErrorCode implements IsSerializable {
+    public enum ErrorCode{
         REPOSITORY_ALREADY_EXISTS,
         SQL_ERROR,
         NOT_ACTIVATED,

src/main/java/eu/dnetlib/repo/manager/domain/RepositorySnippet.java

@@ -1,8 +1,8 @@
 package eu.dnetlib.repo.manager.domain;
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
-public class RepositorySnippet implements IsSerializable {
+
+public class RepositorySnippet {
 
     private String id;
     private String officialname;

src/main/java/eu/dnetlib/repo/manager/domain/RepositorySummaryInfo.java

@@ -1,10 +1,10 @@
 package eu.dnetlib.repo.manager.domain;
 
-import com.google.gwt.user.client.rpc.IsSerializable;
+
 
 import java.util.Date;
 
-public class RepositorySummaryInfo implements IsSerializable {
+public class RepositorySummaryInfo{
 
     String id;
     String repositoryName;

src/main/java/eu/dnetlib/repo/manager/domain/Term.java

@@ -1,11 +1,11 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
+
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 /**
  * Created by panagiotis on 15/1/2018.
  */
-public class Term implements IsSerializable {
+public class Term   {
 
     private String englishName;
     private String nativeName;

src/main/java/eu/dnetlib/repo/manager/domain/Timezone.java

@@ -1,8 +1,7 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
-public class Timezone implements IsSerializable {
+public class Timezone{
 	private String name;
 	private double offset;
 

src/main/java/eu/dnetlib/repo/manager/domain/Triple.java

@@ -1,11 +1,11 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
+
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 /**
  * Created by stefania on 3/8/16.
  */
-public class Triple<K, V, L> extends Tuple<K, V> implements IsSerializable {
+public class Triple<K, V, L> extends Tuple<K, V>   {
 
     private L third;
 

src/main/java/eu/dnetlib/repo/manager/domain/Tuple.java

@@ -1,11 +1,11 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
+
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 /**
  * Created by stefania on 12/18/15.
  */
-public class Tuple<K, V> implements IsSerializable {
+public class Tuple<K, V>   {
 
     private K first;
     private V second;

src/main/java/eu/dnetlib/repo/manager/domain/UsageSummary.java

@@ -1,12 +1,6 @@
 package eu.dnetlib.repo.manager.domain;
 
 import eu.dnetlib.domain.data.PiwikInfo;
-import eu.dnetlib.repo.manager.shared.MetricsInfo;
-import eu.dnetlib.repo.manager.shared.broker.BrowseEntry;
-import eu.dnetlib.repo.manager.shared.broker.SimpleSubscriptionDesc;
-
-import java.util.List;
-import java.util.Map;
 
 public class UsageSummary {
     private MetricsInfo metricsInfo;

src/main/java/eu/dnetlib/repo/manager/domain/UserAccessException.java

@@ -1,13 +1,13 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
+
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 /**
  * Created by nikonas on 7/12/15.
  */
-public class UserAccessException extends Exception implements IsSerializable {
+public class UserAccessException extends Exception   {
 
-    public enum ErrorCode implements IsSerializable {
+    public enum ErrorCode   {
         USER_ALREADY_EXISTS,
         SQL_ERROR,
         INVALID_USERNAME,

src/main/java/eu/dnetlib/repo/manager/domain/ValidationServiceException.java

@@ -1,13 +1,11 @@
-package eu.dnetlib.repo.manager.shared;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
+package eu.dnetlib.repo.manager.domain;
 
 /**
  * Created by nikonas on 7/12/15.
  */
-public class ValidationServiceException extends Exception implements IsSerializable {
+public class ValidationServiceException extends Exception{
 
-    public enum ErrorCode implements IsSerializable {
+    public enum ErrorCode{
         NO_ADMIN_EMAILS,
         NOT_VALID_BASEURL,
         GENERAL_ERROR, NOT_VALID_SET

src/main/java/eu/dnetlib/repo/manager/domain/ValidationState.java

@@ -1,12 +1,12 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
+
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 import eu.dnetlib.domain.functionality.validator.JobForValidation;
 
 /**
  * Created by stefania on 2/10/16.
  */
-public class ValidationState extends WizardState implements IsSerializable {
+public class ValidationState extends WizardState   {
 
     private JobForValidation jobForValidation = new JobForValidation();
 

src/main/java/eu/dnetlib/repo/manager/domain/Vocabulary.java

@@ -1,11 +1,11 @@
-package eu.dnetlib.repo.manager.shared;
+package eu.dnetlib.repo.manager.domain;
+
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 /**
  * Created by stefania on 3/8/16.
  */
-public class Vocabulary implements IsSerializable {
+public class Vocabulary   {
 
     private String id;
     private String name;

src/main/java/eu/dnetlib/repo/manager/domain/WizardState.java

@@ -0,0 +1,9 @@
+package eu.dnetlib.repo.manager.domain;
+
+
+
+/**
+ * Created by stefania on 2/10/16.
+ */
+public class WizardState   {
+}

src/main/java/eu/dnetlib/repo/manager/domain/broker/AdvQueryObject.java

@@ -1,11 +1,11 @@
-package eu.dnetlib.repo.manager.shared.broker;
+package eu.dnetlib.repo.manager.domain.broker;
+
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class AdvQueryObject implements IsSerializable {
+public class AdvQueryObject   {
 
     private String datasource = "";
     private String topic = "";

src/main/java/eu/dnetlib/repo/manager/domain/broker/BrowseEntry.java

@@ -1,11 +1,9 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
+package eu.dnetlib.repo.manager.domain.broker;
 
 /**
  * Created by stefanos on 26/10/2016.
  */
-public class BrowseEntry implements Comparable<BrowseEntry>, IsSerializable{
+public class BrowseEntry implements Comparable<BrowseEntry>{
 
     private String value;
     private Long size;

src/main/java/eu/dnetlib/repo/manager/domain/broker/ConditionOperator.java

@@ -0,0 +1,10 @@
+package eu.dnetlib.repo.manager.domain.broker;
+
+
+
+/**
+ * Created by stefanos on 17/3/2017.
+ */
+public enum ConditionOperator   {
+    EXACT, MATCH_ANY, MATCH_ALL, RANGE
+}

src/main/java/eu/dnetlib/repo/manager/domain/broker/ConditionParams.java

@@ -1,11 +1,9 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
+package eu.dnetlib.repo.manager.domain.broker;
 
 /**
  * Created by stefanos on 17/3/2017.
  */
-public class ConditionParams implements IsSerializable {
+public class ConditionParams {
 
     private String value;
     private String otherValue;

src/main/java/eu/dnetlib/repo/manager/domain/broker/DatasourcesBroker.java

@@ -1,14 +1,14 @@
-package eu.dnetlib.repo.manager.shared.broker;
+package eu.dnetlib.repo.manager.domain.broker;
 
-import com.google.gwt.user.client.rpc.IsSerializable;
-import eu.dnetlib.repo.manager.shared.Tuple;
+
+import eu.dnetlib.repo.manager.domain.Tuple;
 
 import java.util.List;
 
 /**
  * Created by stefanos on 31/10/2016.
  */
-public class DatasourcesBroker implements IsSerializable {
+public class DatasourcesBroker   {
 
     private List<Tuple<BrowseEntry, String>> datasourcesOfUser;
     private List<Tuple<BrowseEntry, String>> sharedDatasources;

src/main/java/eu/dnetlib/repo/manager/domain/broker/EventsPage.java

@@ -1,14 +1,13 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
+package eu.dnetlib.repo.manager.domain.broker;
 
+import eu.dnetlib.broker.objects.OpenAireEventPayload;
 
 import java.util.List;
 
 /**
  * Created by stefanos on 26/10/2016.
  */
-public class EventsPage implements IsSerializable{
+public class EventsPage{
 
     private String datasource;
     private String topic;

src/main/java/eu/dnetlib/repo/manager/domain/broker/MapConditions.java

@@ -1,6 +1,6 @@
-package eu.dnetlib.repo.manager.shared.broker;
+package eu.dnetlib.repo.manager.domain.broker;
+
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * Created by stefanos on 17/3/2017.
  */
-public class MapConditions implements IsSerializable {
+public class MapConditions   {
 
     private String field;
     private MapValueType fieldType;

src/main/java/eu/dnetlib/repo/manager/domain/broker/MapValueType.java

@@ -1,10 +1,9 @@
-package eu.dnetlib.repo.manager.shared.broker;
+package eu.dnetlib.repo.manager.domain.broker;
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 /**
  * Created by stefanos on 17/3/2017.
  */
-public enum MapValueType implements IsSerializable {
+public enum MapValueType {
     STRING, INTEGER, FLOAT, DATE, BOOLEAN, LIST_STRING, LIST_INTEGER, LIST_FLOAT, LIST_DATE, LIST_BOOLEAN;
 }

src/main/java/eu/dnetlib/repo/manager/domain/broker/NotificationFrequency.java

@@ -0,0 +1,10 @@
+package eu.dnetlib.repo.manager.domain.broker;
+
+
+
+/**
+ * Created by stefanos on 10-Mar-17.
+ */
+public enum NotificationFrequency   {
+    never, realtime, daily, weekly, monthly
+}

src/main/java/eu/dnetlib/repo/manager/domain/broker/NotificationMode.java

@@ -0,0 +1,10 @@
+package eu.dnetlib.repo.manager.domain.broker;
+
+
+
+/**
+ * Created by stefanos on 10-Mar-17.
+ */
+public enum NotificationMode   {
+    MOCK, EMAIL
+}

src/main/java/eu/dnetlib/repo/manager/domain/broker/OpenaireSubscription.java

@@ -1,12 +1,11 @@
-package eu.dnetlib.repo.manager.shared.broker;
+package eu.dnetlib.repo.manager.domain.broker;
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 /**
  * Created by stefanos on 10-Mar-17.
  */
 
-public class OpenaireSubscription implements IsSerializable {
+public class OpenaireSubscription {
 
     private String subscriber;
     private NotificationFrequency frequency;

src/main/java/eu/dnetlib/repo/manager/domain/broker/Range.java

@@ -1,11 +1,9 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
+package eu.dnetlib.repo.manager.domain.broker;
 
 /**
  * Created by stefanos on 26/10/2016.
  */
-public class Range implements IsSerializable {
+public class Range{
 
     private String min;
     private String max;

src/main/java/eu/dnetlib/repo/manager/domain/broker/SimpleSubscriptionDesc.java

@@ -1,13 +1,13 @@
-package eu.dnetlib.repo.manager.shared.broker;
+package eu.dnetlib.repo.manager.domain.broker;
+
 
-import com.google.gwt.user.client.rpc.IsSerializable;
 
 import java.util.Date;
 
 /**
  * Created by stefanos on 10-Mar-17.
  */
-public class SimpleSubscriptionDesc implements IsSerializable {
+public class SimpleSubscriptionDesc   {
 
     private String id;
     private String datasource;

src/main/java/eu/dnetlib/repo/manager/domain/broker/Subscription.java

@@ -1,17 +1,15 @@
-package eu.dnetlib.repo.manager.shared.broker;
+package eu.dnetlib.repo.manager.domain.broker;
 
 /**
  * Created by stefanos on 10-Mar-17.
  */
 
 
-import com.google.gwt.user.client.rpc.IsSerializable;
-
 import java.util.Date;
 import java.util.List;
 
 
-public class Subscription implements IsSerializable {
+public class Subscription{
 
     private String subscriptionId;
 

src/main/java/eu/dnetlib/repo/manager/service/BrokerService.java

@@ -1,16 +1,10 @@
 package eu.dnetlib.repo.manager.service;
 
-import eu.dnetlib.repo.manager.shared.BrokerException;
-import eu.dnetlib.repo.manager.shared.Term;
-import eu.dnetlib.repo.manager.shared.broker.*;
-import io.swagger.annotations.Api;
+import eu.dnetlib.repo.manager.domain.BrokerException;
+import eu.dnetlib.repo.manager.domain.Term;
+import eu.dnetlib.repo.manager.domain.broker.*;
 import org.json.JSONException;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
 import java.util.List;

src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java

@@ -3,10 +3,10 @@ package eu.dnetlib.repo.manager.service;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.dnetlib.domain.data.Repository;
-import eu.dnetlib.repo.manager.shared.BrokerException;
-import eu.dnetlib.repo.manager.shared.Term;
-import eu.dnetlib.repo.manager.shared.Tuple;
-import eu.dnetlib.repo.manager.shared.broker.*;
+import eu.dnetlib.repo.manager.domain.BrokerException;
+import eu.dnetlib.repo.manager.domain.Term;
+import eu.dnetlib.repo.manager.domain.Tuple;
+import eu.dnetlib.repo.manager.domain.broker.*;
 import org.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -78,7 +78,7 @@ public class BrokerServiceImpl implements BrokerService {
 
     @Override
     public DatasourcesBroker getDatasourcesOfUser(String user,String includeShared,String includeByOthers) throws JSONException {
-
+        long start = System.currentTimeMillis();
         DatasourcesBroker ret = new DatasourcesBroker();
         try {
             ret.setDatasourcesOfUser(getDatasourcesOfUserType(getRepositoriesOfUser(user)));
@@ -95,7 +95,8 @@ public class BrokerServiceImpl implements BrokerService {
             LOGGER.debug("Exception on getDatasourcesOfUser" , e);
             emailUtils.reportException(e);
         }
-
+        long end = System.currentTimeMillis();
+        System.out.println("Getting datasources of user in " + (end-start)+"ms");
         return ret;
     }
 

src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java

@@ -2,18 +2,15 @@ package eu.dnetlib.repo.manager.service;
 
 import eu.dnetlib.domain.data.Repository;
 import eu.dnetlib.repo.manager.domain.RepositorySummaryInfo;
-import eu.dnetlib.repo.manager.shared.AggregationDetails;
-import eu.dnetlib.repo.manager.shared.BrokerException;
-import eu.dnetlib.repo.manager.shared.MetricsInfo;
-import eu.dnetlib.repo.manager.shared.RepositoryServiceException;
-import eu.dnetlib.repo.manager.shared.broker.BrowseEntry;
+import eu.dnetlib.repo.manager.domain.AggregationDetails;
+import eu.dnetlib.repo.manager.domain.BrokerException;
+import eu.dnetlib.repo.manager.domain.MetricsInfo;
+import eu.dnetlib.repo.manager.domain.RepositoryServiceException;
+import eu.dnetlib.repo.manager.domain.broker.BrowseEntry;
 import org.apache.log4j.Logger;
-import org.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PathVariable;
 
-import javax.xml.ws.ServiceMode;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -42,7 +39,6 @@ public class DashboardServiceImpl implements DashboardService {
 
                 List<Repository> repositoriesOfUser = repositoryService.getRepositoriesOfUser(userEmail, page, size);
                 for(Repository repository: repositoriesOfUser) {
-
                     RepositorySummaryInfo repositorySummaryInfo = new RepositorySummaryInfo();
                     repositorySummaryInfo.setId(repository.getId());
                     repositorySummaryInfo.setRepositoryName(repository.getOfficialName());

src/main/java/eu/dnetlib/repo/manager/service/EmailUtils.java

@@ -4,9 +4,6 @@ import eu.dnetlib.domain.data.PiwikInfo;
 import eu.dnetlib.domain.data.Repository;
 import eu.dnetlib.domain.data.RepositoryInterface;
 import eu.dnetlib.domain.functionality.validator.JobForValidation;
-import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
-import eu.dnetlib.repo.manager.shared.ValidationServiceException;
-import org.json.JSONException;
 import org.springframework.security.core.Authentication;
 
 public interface EmailUtils {

src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java

@@ -5,12 +5,9 @@ import eu.dnetlib.domain.data.Repository;
 import eu.dnetlib.domain.data.RepositoryInterface;
 import eu.dnetlib.domain.functionality.validator.JobForValidation;
 import eu.dnetlib.repo.manager.config.CascadingPropertyLoader;
-import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
-import eu.dnetlib.repo.manager.shared.ValidationServiceException;
+import eu.dnetlib.repo.manager.domain.ValidationServiceException;
 import eu.dnetlib.utils.MailLibrary;
 import org.apache.log4j.Logger;
-import org.json.JSONException;
-import org.mitre.openid.connect.model.OIDCAuthenticationToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;

src/main/java/eu/dnetlib/repo/manager/service/MonitorService.java

@@ -2,11 +2,8 @@ package eu.dnetlib.repo.manager.service;
 
 import eu.dnetlib.api.functionality.ValidatorServiceException;
 import eu.dnetlib.domain.functionality.validator.StoredJob;
-import eu.dnetlib.repo.manager.shared.JobsOfUser;
-import io.swagger.annotations.Api;
+import eu.dnetlib.repo.manager.domain.JobsOfUser;
 import org.json.JSONException;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
 
 
 public interface MonitorService {

src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java

@@ -4,8 +4,8 @@ import eu.dnetlib.api.functionality.ValidatorService;
 import eu.dnetlib.api.functionality.ValidatorServiceException;
 import eu.dnetlib.domain.functionality.validator.JobForValidation;
 import eu.dnetlib.domain.functionality.validator.StoredJob;
-import eu.dnetlib.repo.manager.shared.Constants;
-import eu.dnetlib.repo.manager.shared.JobsOfUser;
+import eu.dnetlib.repo.manager.domain.Constants;
+import eu.dnetlib.repo.manager.domain.JobsOfUser;
 import gr.uoa.di.driver.util.ServiceLocator;
 import org.apache.log4j.Logger;
 import org.eurocris.openaire.cris.validator.model.Job;

src/main/java/eu/dnetlib/repo/manager/service/PiWikService.java

@@ -4,7 +4,7 @@ package eu.dnetlib.repo.manager.service;
 import eu.dnetlib.domain.data.PiwikInfo;
 import eu.dnetlib.repo.manager.domain.OrderByField;
 import eu.dnetlib.repo.manager.domain.OrderByType;
-import eu.dnetlib.repo.manager.shared.RepositoryServiceException;
+import eu.dnetlib.repo.manager.domain.RepositoryServiceException;
 import org.springframework.http.ResponseEntity;
 
 import java.util.List;

src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java

@@ -5,7 +5,7 @@ import eu.dnetlib.domain.data.PiwikInfo;
 import eu.dnetlib.domain.data.Repository;
 import eu.dnetlib.repo.manager.domain.OrderByField;
 import eu.dnetlib.repo.manager.domain.OrderByType;
-import eu.dnetlib.repo.manager.shared.RepositoryServiceException;
+import eu.dnetlib.repo.manager.domain.RepositoryServiceException;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,29 +15,19 @@ import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.PreparedStatementSetter;
 import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.sql.DataSource;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
 import java.sql.Types;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Service("piwikService")
 public class PiWikServiceImpl implements PiWikService {

src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java

@@ -3,9 +3,8 @@ package eu.dnetlib.repo.manager.service;
 import eu.dnetlib.api.functionality.ValidatorServiceException;
 import eu.dnetlib.domain.data.Repository;
 import eu.dnetlib.domain.data.RepositoryInterface;
-import eu.dnetlib.repo.manager.domain.RepositorySnippet;
+import eu.dnetlib.repo.manager.domain.*;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
-import eu.dnetlib.repo.manager.shared.*;
 import org.json.JSONException;
 import org.springframework.security.core.Authentication;
 import java.io.IOException;

src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java

@@ -1,20 +1,15 @@
 package eu.dnetlib.repo.manager.service;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
 import eu.dnetlib.api.functionality.ValidatorServiceException;
 import eu.dnetlib.domain.data.Repository;
 import eu.dnetlib.domain.data.RepositoryInterface;
 import eu.dnetlib.domain.enabling.Vocabulary;
 import eu.dnetlib.domain.functionality.validator.JobForValidation;
-import eu.dnetlib.repo.manager.domain.RepositorySnippet;
-import eu.dnetlib.repo.manager.domain.RequestFilter;
+import eu.dnetlib.repo.manager.domain.*;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
-import eu.dnetlib.repo.manager.shared.*;
 import eu.dnetlib.repo.manager.utils.Converter;
 import gr.uoa.di.driver.enabling.vocabulary.VocabularyLoader;
-import gr.uoa.di.driver.xml.repository.INTERFACE;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONArray;
@@ -28,9 +23,6 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponents;
@@ -259,7 +251,8 @@ public class RepositoryServiceImpl implements RepositoryService {
             System.out.println("Converting json to repo list finished in " + (end-start)+"ms");
             start=System.currentTimeMillis();
             for (Repository r : repos)
-                this.updateRepositoryInfo(r);
+                r.setPiwikInfo(piWikService.getPiwikSiteForRepo(r.getId()));
+
             end=System.currentTimeMillis();
             System.out.println("Updating "+repos.size()+" repository infos in " + (end-start)+"ms");
             return repos;

src/main/java/eu/dnetlib/repo/manager/service/ValidatorService.java

@@ -2,12 +2,11 @@ package eu.dnetlib.repo.manager.service;
 
 import eu.dnetlib.api.functionality.ValidatorServiceException;
 import eu.dnetlib.domain.functionality.validator.JobForValidation;
-import eu.dnetlib.domain.functionality.validator.JobResultEntry;
 import eu.dnetlib.domain.functionality.validator.RuleSet;
 import eu.dnetlib.domain.functionality.validator.StoredJob;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
-import eu.dnetlib.repo.manager.shared.InterfaceInformation;
-import eu.dnetlib.repo.manager.shared.ValidationServiceException;
+import eu.dnetlib.repo.manager.domain.InterfaceInformation;
+import eu.dnetlib.repo.manager.domain.ValidationServiceException;
 import org.json.JSONException;
 import org.springframework.http.ResponseEntity;
 

src/main/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java

@@ -1,13 +1,14 @@
 package eu.dnetlib.repo.manager.service;
 
 import eu.dnetlib.api.functionality.ValidatorServiceException;
-import eu.dnetlib.domain.data.Repository;
 import eu.dnetlib.domain.data.RepositoryInterface;
-import eu.dnetlib.domain.functionality.validator.*;
-import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
-import eu.dnetlib.repo.manager.shared.Constants;
-import eu.dnetlib.repo.manager.shared.InterfaceInformation;
-import eu.dnetlib.repo.manager.shared.ValidationServiceException;
+import eu.dnetlib.domain.functionality.validator.JobForValidation;
+import eu.dnetlib.domain.functionality.validator.Rule;
+import eu.dnetlib.domain.functionality.validator.RuleSet;
+import eu.dnetlib.domain.functionality.validator.StoredJob;
+import eu.dnetlib.repo.manager.domain.Constants;
+import eu.dnetlib.repo.manager.domain.InterfaceInformation;
+import eu.dnetlib.repo.manager.domain.ValidationServiceException;
 import eu.dnetlib.repo.manager.utils.OaiTools;
 import gr.uoa.di.driver.util.ServiceLocator;
 import org.apache.log4j.Logger;

src/main/java/eu/dnetlib/repo/manager/shared/WizardState.java

@@ -1,9 +0,0 @@
-package eu.dnetlib.repo.manager.shared;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * Created by stefania on 2/10/16.
- */
-public class WizardState implements IsSerializable {
-}

src/main/java/eu/dnetlib/repo/manager/shared/broker/ConditionOperator.java

@@ -1,10 +0,0 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * Created by stefanos on 17/3/2017.
- */
-public enum ConditionOperator implements IsSerializable {
-    EXACT, MATCH_ANY, MATCH_ALL, RANGE
-}

src/main/java/eu/dnetlib/repo/manager/shared/broker/Dataset.java

@@ -1,58 +0,0 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-import java.util.List;
-
-public class Dataset implements IsSerializable {
-
-    private List<String> titles;
-
-    private List<String> collectedFrom;
-
-    private List<Pid> pids;
-
-    private List<Instance> instances;
-
-    public Dataset() {
-    }
-
-    public Dataset(final List<String> titles, final List<String> collectedFrom, final List<Pid> pids, final List<Instance> instances) {
-        this.titles = titles;
-        this.collectedFrom = collectedFrom;
-        this.pids = pids;
-        this.instances = instances;
-    }
-
-    public List<String> getTitles() {
-        return titles;
-    }
-
-    public void setTitles(List<String> titles) {
-        this.titles = titles;
-    }
-
-    public List<String> getCollectedFrom() {
-        return collectedFrom;
-    }
-
-    public void setCollectedFrom(List<String> collectedFrom) {
-        this.collectedFrom = collectedFrom;
-    }
-
-    public List<Pid> getPids() {
-        return pids;
-    }
-
-    public void setPids(List<Pid> pids) {
-        this.pids = pids;
-    }
-
-    public List<Instance> getInstances() {
-        return instances;
-    }
-
-    public void setInstances(List<Instance> instances) {
-        this.instances = instances;
-    }
-}

src/main/java/eu/dnetlib/repo/manager/shared/broker/ExternalReference.java

@@ -1,52 +0,0 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * Created by claudio on 22/07/16.
- */
-public class ExternalReference implements IsSerializable {
-
-    private String url;
-
-    private String sitename;
-
-    private String type;
-
-    private String refidentifier;
-
-    public ExternalReference() {
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getSitename() {
-        return sitename;
-    }
-
-    public void setSitename(String sitename) {
-        this.sitename = sitename;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getRefidentifier() {
-        return refidentifier;
-    }
-
-    public void setRefidentifier(String refidentifier) {
-        this.refidentifier = refidentifier;
-    }
-}

src/main/java/eu/dnetlib/repo/manager/shared/broker/Instance.java

@@ -1,52 +0,0 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * Created by claudio on 22/07/16.
- */
-public class Instance implements IsSerializable {
-
-    private String url;
-
-    private String license;
-
-    private String hostedby;
-
-    private String instancetype;
-
-    public Instance() {
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getLicense() {
-        return license;
-    }
-
-    public void setLicense(String license) {
-        this.license = license;
-    }
-
-    public String getHostedby() {
-        return hostedby;
-    }
-
-    public void setHostedby(String hostedby) {
-        this.hostedby = hostedby;
-    }
-
-    public String getInstancetype() {
-        return instancetype;
-    }
-
-    public void setInstancetype(String instancetype) {
-        this.instancetype = instancetype;
-    }
-}

src/main/java/eu/dnetlib/repo/manager/shared/broker/Journal.java

@@ -1,52 +0,0 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * Created by claudio on 22/07/16.
- */
-public class Journal implements IsSerializable {
-
-    private String name;
-
-    private String issn;
-
-    private String eissn;
-
-    private String lissn;
-
-    public Journal() {
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getIssn() {
-        return issn;
-    }
-
-    public void setIssn(String issn) {
-        this.issn = issn;
-    }
-
-    public String getEissn() {
-        return eissn;
-    }
-
-    public void setEissn(String eissn) {
-        this.eissn = eissn;
-    }
-
-    public String getLissn() {
-        return lissn;
-    }
-
-    public void setLissn(String lissn) {
-        this.lissn = lissn;
-    }
-}

src/main/java/eu/dnetlib/repo/manager/shared/broker/NotificationFrequency.java

@@ -1,10 +0,0 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * Created by stefanos on 10-Mar-17.
- */
-public enum NotificationFrequency implements IsSerializable {
-    never, realtime, daily, weekly, monthly
-}

src/main/java/eu/dnetlib/repo/manager/shared/broker/NotificationMode.java

@@ -1,10 +0,0 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * Created by stefanos on 10-Mar-17.
- */
-public enum NotificationMode implements IsSerializable {
-    MOCK, EMAIL
-}

src/main/java/eu/dnetlib/repo/manager/shared/broker/OpenAireEventPayload.java

@@ -1,52 +0,0 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * Created by claudio on 11/07/16.
- */
-public class OpenAireEventPayload implements IsSerializable {
-
-    private Publication publication;
-
-    private Publication highlight;
-
-    private Provenance provenance;
-
-    private float trust;
-
-    public OpenAireEventPayload() {
-    }
-
-    public Publication getPublication() {
-        return publication;
-    }
-
-    public void setPublication(Publication publication) {
-        this.publication = publication;
-    }
-
-    public Publication getHighlight() {
-        return highlight;
-    }
-
-    public void setHighlight(Publication highlight) {
-        this.highlight = highlight;
-    }
-
-    public Provenance getProvenance() {
-        return provenance;
-    }
-
-    public void setProvenance(Provenance provenance) {
-        this.provenance = provenance;
-    }
-
-    public float getTrust() {
-        return trust;
-    }
-
-    public void setTrust(float trust) {
-        this.trust = trust;
-    }
-}

src/main/java/eu/dnetlib/repo/manager/shared/broker/Pid.java

@@ -1,32 +0,0 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * Created by claudio on 22/07/16.
- */
-public class Pid implements IsSerializable {
-
-    private String value;
-
-    private String type;
-
-    public Pid() {
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-}

src/main/java/eu/dnetlib/repo/manager/shared/broker/Project.java

@@ -1,73 +0,0 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-public class Project implements IsSerializable {
-
-    private String code;
-    private String acronym;
-    private String title;
-    private String funder;
-    private String fundingProgram;
-    private String jurisdiction;
-
-    public Project() {
-    }
-
-    public Project(final String code, final String acronym, final String title, final String funder, final String fundingProgram, final String jurisdiction) {
-        this.code = code;
-        this.acronym = acronym;
-        this.title = title;
-        this.funder = funder;
-        this.fundingProgram = fundingProgram;
-        this.jurisdiction = jurisdiction;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getAcronym() {
-        return acronym;
-    }
-
-    public void setAcronym(String acronym) {
-        this.acronym = acronym;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getFunder() {
-        return funder;
-    }
-
-    public void setFunder(String funder) {
-        this.funder = funder;
-    }
-
-    public String getFundingProgram() {
-        return fundingProgram;
-    }
-
-    public void setFundingProgram(String fundingProgram) {
-        this.fundingProgram = fundingProgram;
-    }
-
-    public String getJurisdiction() {
-        return jurisdiction;
-    }
-
-    public void setJurisdiction(String jurisdiction) {
-        this.jurisdiction = jurisdiction;
-    }
-}

src/main/java/eu/dnetlib/repo/manager/shared/broker/Provenance.java

@@ -1,42 +0,0 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * Created by claudio on 26/07/16.
- */
-public class Provenance implements IsSerializable {
-
-    private String repositoryName;
-
-    private String url;
-
-    private String id;
-
-    public Provenance() {
-    }
-
-    public String getRepositoryName() {
-        return repositoryName;
-    }
-
-    public void setRepositoryName(String repositoryName) {
-        this.repositoryName = repositoryName;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-}

src/main/java/eu/dnetlib/repo/manager/shared/broker/Publication.java

@@ -1,195 +0,0 @@
-package eu.dnetlib.repo.manager.shared.broker;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by claudio on 22/07/16.
- */
-public class Publication implements IsSerializable {
-
-    private String originalId;
-
-    private List<String> titles = new ArrayList<>();
-
-    private List<String> abstracts = new ArrayList<>();
-
-    private String language;
-
-    private List<String> subjects = new ArrayList<>();
-
-    private List<String> creators = new ArrayList<>();
-
-    private String publicationdate;
-
-    private String publisher;
-
-    private String embargoenddate;
-
-    private List<String> contributor = new ArrayList<>();
-
-    private Journal journal;
-
-    private List<String> collectedFrom = new ArrayList<>();
-
-    private List<Pid> pids = new ArrayList<>();
-
-    private List<Instance> instances = new ArrayList<>();
-
-    private List<ExternalReference> externalReferences = new ArrayList<>();
-
-    private List<Project> projects = new ArrayList<>();
-
-    private List<Publication> publications = new ArrayList<>();
-
-    private List<Dataset> datasets = new ArrayList<>();
-
-    public Publication() {
-    }
-
-    public String getOriginalId() {
-        return originalId;
-    }
-
-    public void setOriginalId(String originalId) {
-        this.originalId = originalId;
-    }
-
-    public List<String> getTitles() {
-        return titles;
-    }
-
-    public void setTitles(List<String> titles) {
-        this.titles = titles;
-    }
-
-    public List<String> getAbstracts() {
-        return abstracts;
-    }
-
-    public void setAbstracts(List<String> abstracts) {
-        this.abstracts = abstracts;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public List<String> getSubjects() {
-        return subjects;
-    }
-
-    public void setSubjects(List<String> subjects) {
-        this.subjects = subjects;
-    }
-
-    public List<String> getCreators() {
-        return creators;
-    }
-
-    public void setCreators(List<String> creators) {
-        this.creators = creators;
-    }
-
-    public String getPublicationdate() {
-        return publicationdate;
-    }
-
-    public void setPublicationdate(String publicationdate) {
-        this.publicationdate = publicationdate;
-    }
-
-    public String getPublisher() {
-        return publisher;
-    }
-
-    public void setPublisher(String publisher) {
-        this.publisher = publisher;
-    }
-
-    public String getEmbargoenddate() {
-        return embargoenddate;
-    }
-
-    public void setEmbargoenddate(String embargoenddate) {
-        this.embargoenddate = embargoenddate;
-    }
-
-    public List<String> getContributor() {
-        return contributor;
-    }
-
-    public void setContributor(List<String> contributor) {
-        this.contributor = contributor;
-    }
-
-    public Journal getJournal() {
-        return journal;
-    }
-
-    public void setJournal(Journal journal) {
-        this.journal = journal;
-    }
-
-    public List<String> getCollectedFrom() {
-        return collectedFrom;
-    }
-
-    public void setCollectedFrom(List<String> collectedFrom) {
-        this.collectedFrom = collectedFrom;
-    }
-
-    public List<Pid> getPids() {
-        return pids;
-    }
-
-    public void setPids(List<Pid> pids) {
-        this.pids = pids;
-    }
-
-    public List<Instance> getInstances() {
-        return instances;
-    }
-
-    public void setInstances(List<Instance> instances) {
-        this.instances = instances;
-    }
-
-    public List<ExternalReference> getExternalReferences() {
-        return externalReferences;
-    }
-
-    public void setExternalReferences(List<ExternalReference> externalReferences) {
-        this.externalReferences = externalReferences;
-    }
-
-    public List<Project> getProjects() {
-        return projects;
-    }
-
-    public void setProjects(List<Project> projects) {
-        this.projects = projects;
-    }
-
-    public List<Dataset> getDatasets() {
-        return datasets;
-    }
-
-    public void setDatasets(List<Dataset> datasets) {
-        this.datasets = datasets;
-    }
-
-    public List<Publication> getPublications() {
-        return publications;
-    }
-
-    public void setPublications(List<Publication> publications) {
-        this.publications = publications;
-    }
-}

src/main/java/eu/dnetlib/repo/manager/utils/Converter.java

@@ -2,13 +2,12 @@ package eu.dnetlib.repo.manager.utils;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
 import eu.dnetlib.domain.data.PiwikInfo;
 import eu.dnetlib.domain.data.Repository;
 import eu.dnetlib.domain.data.RepositoryInterface;
 import eu.dnetlib.repo.manager.domain.RepositorySnippet;
-import eu.dnetlib.repo.manager.shared.AggregationDetails;
-import eu.dnetlib.repo.manager.shared.Timezone;
+import eu.dnetlib.repo.manager.domain.AggregationDetails;
+import eu.dnetlib.repo.manager.domain.Timezone;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONArray;

src/main/resources/log4j.properties

@@ -0,0 +1,13 @@
+log4j.rootLogger = INFO, R
+
+log4j.logger.eu.dnetlib = INFO
+log4j.logger.eu.dnetlib.repo.manager = INFO
+log4j.logger.eu.dnetlib.clients.data.datasourcemanager.ws.Converter = FATAL
+log4j.logger.org.springframework = INFO 
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=/var/log/dnet/repository-manager.log
+log4j.appender.R.MaxFileSize=10MB
+log4j.appender.R.MaxBackupIndex=10
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern= %d %p %t [%c] - %m%n

src/main/webapp/WEB-INF/log4j.properties

@@ -1,24 +1,13 @@
-log4j.rootLogger = WARN, R
+log4j.rootLogger = INFO, R
 
 log4j.logger.eu.dnetlib = INFO
 log4j.logger.eu.dnetlib.repo.manager = INFO
 log4j.logger.eu.dnetlib.clients.data.datasourcemanager.ws.Converter = FATAL
-
-log4j.logger.com.opensymphony.xwork2.ognl.OgnlValueStack = FATAL
-log4j.logger.com.opensymphony.xwork2.ObjectFactory = FATAL
+log4j.logger.org.springframework = INFO 
 
 log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=/tmp/repository-service.log
-#log4j.appender.R.File=/var/log/tomcat_dnet/8780/repository-service.log
+log4j.appender.R.File=/var/log/dnet/repository-manager.log
 log4j.appender.R.MaxFileSize=10MB
 log4j.appender.R.MaxBackupIndex=10
 log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern= %d %p %t [%c] - %m%n
-
-log4j.appender.S=org.apache.log4j.RollingFileAppender
-log4j.appender.S.File=/tmp/repository-service-spring.log
-#log4j.appender.S.File=/var/log/tomcat_dnet/8780/repository-service-spring.log
-log4j.appender.S.MaxFileSize=10MB
-log4j.appender.S.MaxBackupIndex=10
-log4j.appender.S.layout=org.apache.log4j.PatternLayout
-log4j.appender.S.layout.ConversionPattern= %d %p %t [%c] - %m%n
+log4j.appender.R.layout.ConversionPattern= %d %p %t [%c] - %m%n