diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 2bc1b7d..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-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/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/
-CMD ["catalina.sh", "run"]
-
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/CascadingPropertyLoader.java b/java/eu/dnetlib/repo/manager/config/CascadingPropertyLoader.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/config/CascadingPropertyLoader.java
rename to java/eu/dnetlib/repo/manager/config/CascadingPropertyLoader.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/Config.java b/java/eu/dnetlib/repo/manager/config/Config.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/config/Config.java
rename to java/eu/dnetlib/repo/manager/config/Config.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java b/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java
rename to java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/OpenAireProviderAuthoritiesMapper.java b/java/eu/dnetlib/repo/manager/config/OpenAireProviderAuthoritiesMapper.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/config/OpenAireProviderAuthoritiesMapper.java
rename to java/eu/dnetlib/repo/manager/config/OpenAireProviderAuthoritiesMapper.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/RepoManagerContextLoaderListener.java b/java/eu/dnetlib/repo/manager/config/RepoManagerContextLoaderListener.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/config/RepoManagerContextLoaderListener.java
rename to java/eu/dnetlib/repo/manager/config/RepoManagerContextLoaderListener.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java b/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java
rename to java/eu/dnetlib/repo/manager/config/SwaggerConfig.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/BrokerController.java b/java/eu/dnetlib/repo/manager/controllers/BrokerController.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/controllers/BrokerController.java
rename to java/eu/dnetlib/repo/manager/controllers/BrokerController.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java b/java/eu/dnetlib/repo/manager/controllers/DashboardController.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java
rename to java/eu/dnetlib/repo/manager/controllers/DashboardController.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java b/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java
rename to java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java b/java/eu/dnetlib/repo/manager/controllers/MonitorController.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java
rename to java/eu/dnetlib/repo/manager/controllers/MonitorController.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java b/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
rename to java/eu/dnetlib/repo/manager/controllers/PiWikController.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java b/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java
rename to java/eu/dnetlib/repo/manager/controllers/RepositoryController.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/RestTemplateResponseErrorHandler.java b/java/eu/dnetlib/repo/manager/controllers/RestTemplateResponseErrorHandler.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/controllers/RestTemplateResponseErrorHandler.java
rename to java/eu/dnetlib/repo/manager/controllers/RestTemplateResponseErrorHandler.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/StatsController.java b/java/eu/dnetlib/repo/manager/controllers/StatsController.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/controllers/StatsController.java
rename to java/eu/dnetlib/repo/manager/controllers/StatsController.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteController.java b/java/eu/dnetlib/repo/manager/controllers/SushiliteController.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteController.java
rename to java/eu/dnetlib/repo/manager/controllers/SushiliteController.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/UserController.java b/java/eu/dnetlib/repo/manager/controllers/UserController.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/controllers/UserController.java
rename to java/eu/dnetlib/repo/manager/controllers/UserController.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java b/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java
rename to java/eu/dnetlib/repo/manager/controllers/ValidatorController.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/domain/Organization.java b/java/eu/dnetlib/repo/manager/domain/Organization.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/domain/Organization.java
rename to java/eu/dnetlib/repo/manager/domain/Organization.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/domain/RepositorySnippet.java b/java/eu/dnetlib/repo/manager/domain/RepositorySnippet.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/domain/RepositorySnippet.java
rename to java/eu/dnetlib/repo/manager/domain/RepositorySnippet.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/domain/RepositorySummaryInfo.java b/java/eu/dnetlib/repo/manager/domain/RepositorySummaryInfo.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/domain/RepositorySummaryInfo.java
rename to java/eu/dnetlib/repo/manager/domain/RepositorySummaryInfo.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/domain/RequestFilter.java b/java/eu/dnetlib/repo/manager/domain/RequestFilter.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/domain/RequestFilter.java
rename to java/eu/dnetlib/repo/manager/domain/RequestFilter.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/exception/EndPointException.java b/java/eu/dnetlib/repo/manager/exception/EndPointException.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/exception/EndPointException.java
rename to java/eu/dnetlib/repo/manager/exception/EndPointException.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/exception/ResourceNotFoundException.java b/java/eu/dnetlib/repo/manager/exception/ResourceNotFoundException.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/exception/ResourceNotFoundException.java
rename to java/eu/dnetlib/repo/manager/exception/ResourceNotFoundException.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/exception/ServerError.java b/java/eu/dnetlib/repo/manager/exception/ServerError.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/exception/ServerError.java
rename to java/eu/dnetlib/repo/manager/exception/ServerError.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/BrokerService.java b/java/eu/dnetlib/repo/manager/service/BrokerService.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/BrokerService.java
rename to java/eu/dnetlib/repo/manager/service/BrokerService.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java b/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java
rename to java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/DashboardService.java b/java/eu/dnetlib/repo/manager/service/DashboardService.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/DashboardService.java
rename to java/eu/dnetlib/repo/manager/service/DashboardService.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java b/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java
rename to java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/EmailUtils.java b/java/eu/dnetlib/repo/manager/service/EmailUtils.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/EmailUtils.java
rename to java/eu/dnetlib/repo/manager/service/EmailUtils.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java b/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java
rename to java/eu/dnetlib/repo/manager/service/EmailUtilsImpl.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/MonitorService.java b/java/eu/dnetlib/repo/manager/service/MonitorService.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/MonitorService.java
rename to java/eu/dnetlib/repo/manager/service/MonitorService.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java b/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java
rename to java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/PiWikService.java b/java/eu/dnetlib/repo/manager/service/PiWikService.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/PiWikService.java
rename to java/eu/dnetlib/repo/manager/service/PiWikService.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java b/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java
rename to java/eu/dnetlib/repo/manager/service/PiWikServiceImpl.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java b/java/eu/dnetlib/repo/manager/service/RepositoryService.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java
rename to java/eu/dnetlib/repo/manager/service/RepositoryService.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java b/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java
rename to java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/StatsService.java b/java/eu/dnetlib/repo/manager/service/StatsService.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/StatsService.java
rename to java/eu/dnetlib/repo/manager/service/StatsService.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/StatsServiceImpl.java b/java/eu/dnetlib/repo/manager/service/StatsServiceImpl.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/StatsServiceImpl.java
rename to java/eu/dnetlib/repo/manager/service/StatsServiceImpl.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/SushiliteService.java b/java/eu/dnetlib/repo/manager/service/SushiliteService.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/SushiliteService.java
rename to java/eu/dnetlib/repo/manager/service/SushiliteService.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java b/java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java
rename to java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/UserService.java b/java/eu/dnetlib/repo/manager/service/UserService.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/UserService.java
rename to java/eu/dnetlib/repo/manager/service/UserService.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/UserServiceImpl.java b/java/eu/dnetlib/repo/manager/service/UserServiceImpl.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/UserServiceImpl.java
rename to java/eu/dnetlib/repo/manager/service/UserServiceImpl.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/ValidatorService.java b/java/eu/dnetlib/repo/manager/service/ValidatorService.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/ValidatorService.java
rename to java/eu/dnetlib/repo/manager/service/ValidatorService.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java b/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java
rename to java/eu/dnetlib/repo/manager/service/ValidatorServiceImpl.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/AggregatorsHystrixCommand.java b/java/eu/dnetlib/repo/manager/service/customHystrixCommands/AggregatorsHystrixCommand.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/AggregatorsHystrixCommand.java
rename to java/eu/dnetlib/repo/manager/service/customHystrixCommands/AggregatorsHystrixCommand.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/DataRepositoriesHystrixCommand.java b/java/eu/dnetlib/repo/manager/service/customHystrixCommands/DataRepositoriesHystrixCommand.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/DataRepositoriesHystrixCommand.java
rename to java/eu/dnetlib/repo/manager/service/customHystrixCommands/DataRepositoriesHystrixCommand.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/DatasetsHystrixCommand.java b/java/eu/dnetlib/repo/manager/service/customHystrixCommands/DatasetsHystrixCommand.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/DatasetsHystrixCommand.java
rename to java/eu/dnetlib/repo/manager/service/customHystrixCommands/DatasetsHystrixCommand.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/JournalHystrixCommand.java b/java/eu/dnetlib/repo/manager/service/customHystrixCommands/JournalHystrixCommand.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/JournalHystrixCommand.java
rename to java/eu/dnetlib/repo/manager/service/customHystrixCommands/JournalHystrixCommand.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/LastYearUsageStatsHystrixCommand.java b/java/eu/dnetlib/repo/manager/service/customHystrixCommands/LastYearUsageStatsHystrixCommand.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/LastYearUsageStatsHystrixCommand.java
rename to java/eu/dnetlib/repo/manager/service/customHystrixCommands/LastYearUsageStatsHystrixCommand.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/LiteratureHystrixCommand.java b/java/eu/dnetlib/repo/manager/service/customHystrixCommands/LiteratureHystrixCommand.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/LiteratureHystrixCommand.java
rename to java/eu/dnetlib/repo/manager/service/customHystrixCommands/LiteratureHystrixCommand.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/PublicationHystrixCommand.java b/java/eu/dnetlib/repo/manager/service/customHystrixCommands/PublicationHystrixCommand.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/PublicationHystrixCommand.java
rename to java/eu/dnetlib/repo/manager/service/customHystrixCommands/PublicationHystrixCommand.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/SoftwareHystrixCommand.java b/java/eu/dnetlib/repo/manager/service/customHystrixCommands/SoftwareHystrixCommand.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/SoftwareHystrixCommand.java
rename to java/eu/dnetlib/repo/manager/service/customHystrixCommands/SoftwareHystrixCommand.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/UsageStatsTotalHystrixCommand.java b/java/eu/dnetlib/repo/manager/service/customHystrixCommands/UsageStatsTotalHystrixCommand.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/service/customHystrixCommands/UsageStatsTotalHystrixCommand.java
rename to java/eu/dnetlib/repo/manager/service/customHystrixCommands/UsageStatsTotalHystrixCommand.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/AggregationDetails.java b/java/eu/dnetlib/repo/manager/shared/AggregationDetails.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/AggregationDetails.java
rename to java/eu/dnetlib/repo/manager/shared/AggregationDetails.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/Aggregations.java b/java/eu/dnetlib/repo/manager/shared/Aggregations.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/Aggregations.java
rename to java/eu/dnetlib/repo/manager/shared/Aggregations.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/BrokerException.java b/java/eu/dnetlib/repo/manager/shared/BrokerException.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/BrokerException.java
rename to java/eu/dnetlib/repo/manager/shared/BrokerException.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/Constants.java b/java/eu/dnetlib/repo/manager/shared/Constants.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/Constants.java
rename to java/eu/dnetlib/repo/manager/shared/Constants.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/Country.java b/java/eu/dnetlib/repo/manager/shared/Country.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/Country.java
rename to java/eu/dnetlib/repo/manager/shared/Country.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/DatasourceRegistrationState.java b/java/eu/dnetlib/repo/manager/shared/DatasourceRegistrationState.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/DatasourceRegistrationState.java
rename to java/eu/dnetlib/repo/manager/shared/DatasourceRegistrationState.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/DatasourceVocabularies.java b/java/eu/dnetlib/repo/manager/shared/DatasourceVocabularies.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/DatasourceVocabularies.java
rename to java/eu/dnetlib/repo/manager/shared/DatasourceVocabularies.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/DatasourcesCollection.java b/java/eu/dnetlib/repo/manager/shared/DatasourcesCollection.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/DatasourcesCollection.java
rename to java/eu/dnetlib/repo/manager/shared/DatasourcesCollection.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/InterfaceInformation.java b/java/eu/dnetlib/repo/manager/shared/InterfaceInformation.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/InterfaceInformation.java
rename to java/eu/dnetlib/repo/manager/shared/InterfaceInformation.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/JobsOfUser.java b/java/eu/dnetlib/repo/manager/shared/JobsOfUser.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/JobsOfUser.java
rename to java/eu/dnetlib/repo/manager/shared/JobsOfUser.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/MetricsInfo.java b/java/eu/dnetlib/repo/manager/shared/MetricsInfo.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/MetricsInfo.java
rename to java/eu/dnetlib/repo/manager/shared/MetricsInfo.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/MetricsNumbers.java b/java/eu/dnetlib/repo/manager/shared/MetricsNumbers.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/MetricsNumbers.java
rename to java/eu/dnetlib/repo/manager/shared/MetricsNumbers.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/RepositoryServiceException.java b/java/eu/dnetlib/repo/manager/shared/RepositoryServiceException.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/RepositoryServiceException.java
rename to java/eu/dnetlib/repo/manager/shared/RepositoryServiceException.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/Term.java b/java/eu/dnetlib/repo/manager/shared/Term.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/Term.java
rename to java/eu/dnetlib/repo/manager/shared/Term.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/Timezone.java b/java/eu/dnetlib/repo/manager/shared/Timezone.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/Timezone.java
rename to java/eu/dnetlib/repo/manager/shared/Timezone.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/Triple.java b/java/eu/dnetlib/repo/manager/shared/Triple.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/Triple.java
rename to java/eu/dnetlib/repo/manager/shared/Triple.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/Tuple.java b/java/eu/dnetlib/repo/manager/shared/Tuple.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/Tuple.java
rename to java/eu/dnetlib/repo/manager/shared/Tuple.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/UserAccessException.java b/java/eu/dnetlib/repo/manager/shared/UserAccessException.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/UserAccessException.java
rename to java/eu/dnetlib/repo/manager/shared/UserAccessException.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/ValidationServiceException.java b/java/eu/dnetlib/repo/manager/shared/ValidationServiceException.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/ValidationServiceException.java
rename to java/eu/dnetlib/repo/manager/shared/ValidationServiceException.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/ValidationState.java b/java/eu/dnetlib/repo/manager/shared/ValidationState.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/ValidationState.java
rename to java/eu/dnetlib/repo/manager/shared/ValidationState.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/Vocabulary.java b/java/eu/dnetlib/repo/manager/shared/Vocabulary.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/Vocabulary.java
rename to java/eu/dnetlib/repo/manager/shared/Vocabulary.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/WizardState.java b/java/eu/dnetlib/repo/manager/shared/WizardState.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/WizardState.java
rename to java/eu/dnetlib/repo/manager/shared/WizardState.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/AdvQueryObject.java b/java/eu/dnetlib/repo/manager/shared/broker/AdvQueryObject.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/AdvQueryObject.java
rename to java/eu/dnetlib/repo/manager/shared/broker/AdvQueryObject.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/BrowseEntry.java b/java/eu/dnetlib/repo/manager/shared/broker/BrowseEntry.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/BrowseEntry.java
rename to java/eu/dnetlib/repo/manager/shared/broker/BrowseEntry.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/ConditionOperator.java b/java/eu/dnetlib/repo/manager/shared/broker/ConditionOperator.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/ConditionOperator.java
rename to java/eu/dnetlib/repo/manager/shared/broker/ConditionOperator.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/ConditionParams.java b/java/eu/dnetlib/repo/manager/shared/broker/ConditionParams.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/ConditionParams.java
rename to java/eu/dnetlib/repo/manager/shared/broker/ConditionParams.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/Dataset.java b/java/eu/dnetlib/repo/manager/shared/broker/Dataset.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/Dataset.java
rename to java/eu/dnetlib/repo/manager/shared/broker/Dataset.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/DatasourcesBroker.java b/java/eu/dnetlib/repo/manager/shared/broker/DatasourcesBroker.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/DatasourcesBroker.java
rename to java/eu/dnetlib/repo/manager/shared/broker/DatasourcesBroker.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/EventsPage.java b/java/eu/dnetlib/repo/manager/shared/broker/EventsPage.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/EventsPage.java
rename to java/eu/dnetlib/repo/manager/shared/broker/EventsPage.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/ExternalReference.java b/java/eu/dnetlib/repo/manager/shared/broker/ExternalReference.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/ExternalReference.java
rename to java/eu/dnetlib/repo/manager/shared/broker/ExternalReference.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/Instance.java b/java/eu/dnetlib/repo/manager/shared/broker/Instance.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/Instance.java
rename to java/eu/dnetlib/repo/manager/shared/broker/Instance.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/Journal.java b/java/eu/dnetlib/repo/manager/shared/broker/Journal.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/Journal.java
rename to java/eu/dnetlib/repo/manager/shared/broker/Journal.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/MapConditions.java b/java/eu/dnetlib/repo/manager/shared/broker/MapConditions.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/MapConditions.java
rename to java/eu/dnetlib/repo/manager/shared/broker/MapConditions.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/MapValueType.java b/java/eu/dnetlib/repo/manager/shared/broker/MapValueType.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/MapValueType.java
rename to java/eu/dnetlib/repo/manager/shared/broker/MapValueType.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/NotificationFrequency.java b/java/eu/dnetlib/repo/manager/shared/broker/NotificationFrequency.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/NotificationFrequency.java
rename to java/eu/dnetlib/repo/manager/shared/broker/NotificationFrequency.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/NotificationMode.java b/java/eu/dnetlib/repo/manager/shared/broker/NotificationMode.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/NotificationMode.java
rename to java/eu/dnetlib/repo/manager/shared/broker/NotificationMode.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/OpenAireEventPayload.java b/java/eu/dnetlib/repo/manager/shared/broker/OpenAireEventPayload.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/OpenAireEventPayload.java
rename to java/eu/dnetlib/repo/manager/shared/broker/OpenAireEventPayload.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/OpenaireSubscription.java b/java/eu/dnetlib/repo/manager/shared/broker/OpenaireSubscription.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/OpenaireSubscription.java
rename to java/eu/dnetlib/repo/manager/shared/broker/OpenaireSubscription.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/Pid.java b/java/eu/dnetlib/repo/manager/shared/broker/Pid.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/Pid.java
rename to java/eu/dnetlib/repo/manager/shared/broker/Pid.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/Project.java b/java/eu/dnetlib/repo/manager/shared/broker/Project.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/Project.java
rename to java/eu/dnetlib/repo/manager/shared/broker/Project.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/Provenance.java b/java/eu/dnetlib/repo/manager/shared/broker/Provenance.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/Provenance.java
rename to java/eu/dnetlib/repo/manager/shared/broker/Provenance.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/Publication.java b/java/eu/dnetlib/repo/manager/shared/broker/Publication.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/Publication.java
rename to java/eu/dnetlib/repo/manager/shared/broker/Publication.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/Range.java b/java/eu/dnetlib/repo/manager/shared/broker/Range.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/Range.java
rename to java/eu/dnetlib/repo/manager/shared/broker/Range.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/SimpleSubscriptionDesc.java b/java/eu/dnetlib/repo/manager/shared/broker/SimpleSubscriptionDesc.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/SimpleSubscriptionDesc.java
rename to java/eu/dnetlib/repo/manager/shared/broker/SimpleSubscriptionDesc.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/shared/broker/Subscription.java b/java/eu/dnetlib/repo/manager/shared/broker/Subscription.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/shared/broker/Subscription.java
rename to java/eu/dnetlib/repo/manager/shared/broker/Subscription.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java b/java/eu/dnetlib/repo/manager/utils/Converter.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/utils/Converter.java
rename to java/eu/dnetlib/repo/manager/utils/Converter.java
diff --git a/src/main/java/eu/dnetlib/repo/manager/utils/OaiTools.java b/java/eu/dnetlib/repo/manager/utils/OaiTools.java
similarity index 100%
rename from src/main/java/eu/dnetlib/repo/manager/utils/OaiTools.java
rename to java/eu/dnetlib/repo/manager/utils/OaiTools.java
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index a1daa72..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,394 +0,0 @@
-
-
-
-
- eu.dnetlib
- dnet45-parent
- 1.0.0-SNAPSHOT
-
- 4.0.0
- eu.dnetlib
- uoa-repository-manager-service
- 1.0.0-SNAPSHOT
- war
-
-
-
-
-
- org.springframework
- spring-webmvc
- ${spring.version}
-
-
-
- org.hibernate
- hibernate-validator-annotation-processor
- 4.1.0.Final
-
-
-
- log4j
- log4j
- (1.2, 1.5]
- compile
-
-
-
- eu.dnetlib
- dnet-runtime
- [1.0.0-SNAPSHOT, 2.0.0)
-
-
- org.apache.geronimo.specs
- geronimo-javamail_1.4_spec
-
-
-
-
-
- eu.dnetlib
- uoa-utils
- [2.0.0-SNAPSHOT, 3.0.0)
-
-
-
- eu.dnetlib
- uoa-domain
- [2.0.0-SNAPSHOT, 3.0.0)
-
-
- cglib
- cglib
-
-
-
-
-
- eu.dnetlib
- dnet-openaire-usage-stats-sushilite
- 1.0.0-SNAPSHOT
-
-
-
-
- cglib
- cglib-nodep
- 2.2
-
-
-
- eu.dnetlib
- uoa-commons
- [2.0.0-SNAPSHOT, 3.0.0)
-
-
- eu.dnetlib
- uoa-clients
- [2.0.0-SNAPSHOT, 3.0.0)
-
-
- eu.dnetlib
- uoa-hcm
- [2.0.0-SNAPSHOT, 3.0.0)
-
-
-
- commons-io
- commons-io
- 2.4
-
-
-
- se.kb
- oai4j
- [0.6b1,)
-
-
- xalan
- xalan
- 2.7.2
-
-
-
- xerces
- xercesImpl
- 2.11.0
-
-
-
- com.fasterxml.jackson.core
- jackson-core
- 2.5.1
- compile
-
-
- com.fasterxml.jackson.core
- jackson-databind
- 2.5.1
- compile
-
-
-
- org.springframework
- spring-context
- ${spring.version}
-
-
-
- org.springframework
- spring-jdbc
- ${spring.version}
-
-
-
- com.sun.jersey
- jersey-client
- 1.19.3
-
-
-
- org.aksw.gson
- gson-utils-core
- 1.0.0
-
-
- org.json
- json
- 20080701
-
-
-
- com.sun.mail
- javax.mail
- 1.6.0
-
-
-
- io.springfox
- springfox-swagger2
- 2.7.0
-
-
- io.springfox
- springfox-swagger-ui
- 2.7.0
-
-
-
-
-
-
- postgresql
- postgresql
- 9.1-901.jdbc3
-
-
-
-
- org.apache.tomcat
- tomcat-catalina
- LATEST
-
-
-
- commons-fileupload
- commons-fileupload
- LATEST
-
-
-
- org.mitre
- openid-connect-client
- 1.3.0
-
-
- org.slf4j
- jcl-over-slf4j
-
-
-
-
-
-
- org.springframework.session
- spring-session-data-redis
- 1.3.1.RELEASE
- pom
-
-
-
- redis.clients
- jedis
- 2.9.0
-
-
- com.google.code.gson
- gson
- 2.6.2
-
-
-
- com.thetransactioncompany
- cors-filter
- 2.5
-
-
-
- org.springframework.cloud
- spring-cloud-starter-hystrix
- 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
-
-
-
-
-
-
- ${project.build.directory}/${project.build.finalName}/WEB-INF/classes
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.7.0
-
-
- 1.8
- UTF-8
-
-
-
-
- maven-war-plugin
- 2.6
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- uoa-repository-manager-service
-
-
- src/main/resources
- true
-
-
-
-
-
-
diff --git a/src/main/resources/application-context.xml b/resources/application-context.xml
similarity index 100%
rename from src/main/resources/application-context.xml
rename to resources/application-context.xml
diff --git a/src/main/resources/application.properties b/resources/application.properties
similarity index 100%
rename from src/main/resources/application.properties
rename to resources/application.properties
diff --git a/src/main/resources/email-texts.properties b/resources/email-texts.properties
similarity index 100%
rename from src/main/resources/email-texts.properties
rename to resources/email-texts.properties
diff --git a/src/main/resources/eu/dnetlib/repo/manager/service/countries.txt b/resources/eu/dnetlib/repo/manager/service/countries.txt
similarity index 100%
rename from src/main/resources/eu/dnetlib/repo/manager/service/countries.txt
rename to resources/eu/dnetlib/repo/manager/service/countries.txt
diff --git a/src/main/resources/eu/dnetlib/repo/manager/service/timezones.txt b/resources/eu/dnetlib/repo/manager/service/timezones.txt
similarity index 100%
rename from src/main/resources/eu/dnetlib/repo/manager/service/timezones.txt
rename to resources/eu/dnetlib/repo/manager/service/timezones.txt
diff --git a/src/main/resources/eu/dnetlib/repo/manager/service/typologies.txt b/resources/eu/dnetlib/repo/manager/service/typologies.txt
similarity index 100%
rename from src/main/resources/eu/dnetlib/repo/manager/service/typologies.txt
rename to resources/eu/dnetlib/repo/manager/service/typologies.txt
diff --git a/src/test/java/unitest/PiwikTest.java b/src/test/java/unitest/PiwikTest.java
deleted file mode 100644
index 3b55e6b..0000000
--- a/src/test/java/unitest/PiwikTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-package unitest;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.dnetlib.repo.manager.config.RepoManagerContextLoaderListener;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.Map;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = RepoManagerContextLoaderListener.class)
-public class PiwikTest {
-
- String analyticsURL = "https://analytics.openaire.eu/addsite.php?";
-
- @Test
- public void enableMetricsRepo1(){
-
- String officialName = "BỘ SƯU TẬP SỐ";
- String repoWebsite = "http://www.vnulib.edu.vn:8000/dspace/";
-
- enableMetrics(officialName, repoWebsite, analyticsURL);
-
- }
-
- @Test
- public void enableMetricsRepo2(){
-
- String officialName = "ILC4CLARIN repository of language resources and tools";
- String repoWebsite = "https://dspace-clarin-it.ilc.cnr.it/repository/xmlui";
-
- enableMetrics(officialName, repoWebsite, analyticsURL);
- }
-
- @Test
- public void enableMetricsRepo3(){
-
- String officialName = "ANSTO Publications Online";
- String repoWebsite = "http://apo.ansto.gov.au/dspace/";
-
- enableMetrics(officialName, repoWebsite, analyticsURL);
- }
-
- private void enableMetrics(String officialName, String repoWebsite, String analyticsURL) {
- String url;
- try {
- url = analyticsURL + "siteName=" + URLEncoder.encode(officialName, "UTF-8") + "&url="
- + URLEncoder.encode(repoWebsite, "UTF-8");
- url = StringEscapeUtils.escapeJava(url);
-
- Map map = null;
- String siteId = null;
-
- URL u = new URL(url);
- map = new ObjectMapper().readValue(u, Map.class);
- if(map.get("value")!=null) {
- siteId = map.get("value").toString();
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}*/
diff --git a/src/test/java/unitest/ValidatorTest.java b/src/test/java/unitest/ValidatorTest.java
deleted file mode 100644
index 3c5ce65..0000000
--- a/src/test/java/unitest/ValidatorTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-//package unitest;
-//
-//import eu.dnetlib.repo.manager.config.RepoManagerContextLoaderListener;
-//import eu.dnetlib.repo.manager.utils.OaiTools;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.test.context.ContextConfiguration;
-//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-//
-//@RunWith(SpringJUnit4ClassRunner.class)
-//@ContextConfiguration(classes = RepoManagerContextLoaderListener.class)
-////@WebAppConfiguration
-//public class ValidatorTest {
-//
-//
-// @Test
-// public void identiFy(){
-//
-// String url = "https://repozitorij.srce.unizg.hr/oai";
-//
-//
-// System.out.println("Identify repository with url : " + url);
-// try {
-// System.out.println(OaiTools.identifyRepository(url));
-// } catch (Exception e) {
-// System.out.println(e);
-// }
-// }
-//
-//
-//}
diff --git a/src/test/resources/application-context.xml b/src/test/resources/application-context.xml
deleted file mode 100644
index b8a5cac..0000000
--- a/src/test/resources/application-context.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- classpath*:/gr/**/springContext-*.properties
- classpath*:/eu/**/springContext-*.properties
-
- classpath*:/application.properties
- classpath*:/email-texts.properties
-
- classpath*:dnet-site-wizard.properties
- classpath*:dnet-site-override.properties
- classpath*:dnet-wizard.properties
- classpath*:dnet-override-new.properties
- classpath*:dnet-validator-wizard.properties
- classpath*:dnet-validator-override.properties
- classpath*:dnet-site-force-override.properties
- classpath*:dnet-force-override.properties
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/test/resources/applicationContext.xml b/src/test/resources/applicationContext.xml
deleted file mode 100644
index 13e712e..0000000
--- a/src/test/resources/applicationContext.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- classpath*:/gr/**/springContext-*.properties
- classpath*:/eu/**/springContext-*.properties
-
- classpath*:/application.properties
- classpath*:/email-texts.properties
-
- classpath*:dnet-site-wizard.properties
- classpath*:dnet-site-override.properties
- classpath*:dnet-wizard.properties
- classpath*:dnet-override-new.properties
- classpath*:dnet-validator-wizard.properties
- classpath*:dnet-validator-override.properties
- classpath*:dnet-site-force-override.properties
- classpath*:dnet-force-override.properties
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/aai-security.xml b/webapp/WEB-INF/aai-security.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/aai-security.xml
rename to webapp/WEB-INF/aai-security.xml
diff --git a/src/main/webapp/WEB-INF/applicationContext.xml b/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/applicationContext.xml
rename to webapp/WEB-INF/applicationContext.xml
diff --git a/src/main/webapp/WEB-INF/log4j.properties b/webapp/WEB-INF/log4j.properties
similarity index 97%
rename from src/main/webapp/WEB-INF/log4j.properties
rename to webapp/WEB-INF/log4j.properties
index 50eb138..d267bed 100644
--- a/src/main/webapp/WEB-INF/log4j.properties
+++ b/webapp/WEB-INF/log4j.properties
@@ -8,7 +8,7 @@ log4j.additivity.org.springframework = false
log4j.logger.com.opensymphony.xwork2.ognl.OgnlValueStack = FATAL
log4j.logger.com.opensymphony.xwork2.ObjectFactory = FATAL
-log4j.logger.eu.dnetlib.repo.manager=DEBUG
+log4j.logger.eu.dnetlib.repo.manager=INFO
log4j.appender.R=org.apache.log4j.RollingFileAppender
log4j.appender.R.File=/tmp/repository-service.log
diff --git a/src/main/webapp/WEB-INF/spring-servlet.xml b/webapp/WEB-INF/spring-servlet.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/spring-servlet.xml
rename to webapp/WEB-INF/spring-servlet.xml
diff --git a/src/main/webapp/WEB-INF/web.xml b/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/web.xml
rename to webapp/WEB-INF/web.xml