diff --git a/config/application.tmpl b/config/application.tmpl
index b82aed60ae4d5a7200a1eb307b1c34ab0fef0d27..5086566bd829d2e58d8921dbb52c888b2ab3d5aa 100644
--- a/config/application.tmpl
+++ b/config/application.tmpl
@@ -1,4 +1,4 @@
-# Configuration for the portal running inside a Docker container
+# Configuration template for the portal running inside a Docker container
spring:
datasource:
diff --git a/config/application.yml b/config/application.yml
index de62b378fa6305e3614eb8bc199735c37b40a5ee..e1f4fd78cc195cacf3a2b0a47800fc547bfa48c5 100644
--- a/config/application.yml
+++ b/config/application.yml
@@ -1,4 +1,4 @@
-# Configuration for the portal running inside a Docker container
+# ONLY FOR DEVELOPMENT - Configuration for the portal running inside a Docker container
spring:
datasource:
diff --git a/pom.xml b/pom.xml
index 2726b792b10f1c0eb89bde75ea2b578390aa8f4b..23c8733a7d86b1ed42b9bba7030b697cc5147351 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.hbp.mip</groupId>
- <artifactId>backend-services</artifactId>
+ <groupId>eu.hbp.mip</groupId>
+ <artifactId>portal-backend</artifactId>
<version>DOCKER_BUILD</version>
<packaging>jar</packaging>
- <name>backend-services</name>
- <description>Medical Informatics Platform : backend restful services</description>
+ <name>portal-backend</name>
+ <description>Medical Informatics Platform - portal-backend</description>
<parent>
<groupId>org.springframework.boot</groupId>
@@ -20,8 +20,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <sonar.host.url>http://dockerhost:9000</sonar.host.url>
- <sonar.projectName>MIP Backend</sonar.projectName>
+ <sonar.host.url>https://hbps1.chuv.ch/sonarqube/</sonar.host.url>
+ <sonar.projectName>MIP portal-backend</sonar.projectName>
<sonar.sources>src/main/java/</sonar.sources>
<java.version>1.8</java.version>
<asciidoctor.maven.plugin.version>1.5.3</asciidoctor.maven.plugin.version>
diff --git a/src/docker/build/Dockerfile b/src/docker/build/Dockerfile
index b4318d788f65cf01d672e59aab38c69b6e4aa17f..2f62e5c9a4456109c38283a0e513022ab22e3aa0 100644
--- a/src/docker/build/Dockerfile
+++ b/src/docker/build/Dockerfile
@@ -1,5 +1,7 @@
FROM maven:3-jdk-8
+MAINTAINER mirco.nasuti@chuv.ch
+
COPY ./build-in-docker.sh /build-in-docker.sh
VOLUME /opt/portal/
diff --git a/src/docker/run/Dockerfile b/src/docker/run/Dockerfile
index f9c7d30b090aac13ba320651e1d6c97fe39d5662..cc8d0655438ed1f00d3cc8e0b68d2a99b8d35630 100644
--- a/src/docker/run/Dockerfile
+++ b/src/docker/run/Dockerfile
@@ -1,6 +1,8 @@
FROM java:openjdk-8u92-jdk-alpine
-COPY ./target/backend-services-DOCKER_BUILD.jar backend.jar
+MAINTAINER mirco.nasuti@chuv.ch
+
+COPY ./target/portal-backend-DOCKER_BUILD.jar backend.jar
RUN apk add --update ca-certificates wget && rm -rf /var/cache/apk/* /tmp/* && update-ca-certificates
RUN wget https://github.com/jwilder/dockerize/releases/download/v0.2.0/dockerize-linux-amd64-v0.2.0.tar.gz
diff --git a/src/main/java/org/hbp/mip/MIPApplication.java b/src/main/java/eu/hbp/mip/MIPApplication.java
similarity index 94%
rename from src/main/java/org/hbp/mip/MIPApplication.java
rename to src/main/java/eu/hbp/mip/MIPApplication.java
index 51fd6f3ea36b5e273d70adc99e09659dd8e983b9..ef20c9f9ffd625d0ef82844897455f4f8326fc97 100644
--- a/src/main/java/org/hbp/mip/MIPApplication.java
+++ b/src/main/java/eu/hbp/mip/MIPApplication.java
@@ -2,7 +2,7 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip;
+package eu.hbp.mip;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
similarity index 89%
rename from src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
rename to src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
index 35ce472e97215226e3bc4bd26e647d22d3498b2b..0a01e433fdee87eb61462fd1094ba28fa5964b99 100644
--- a/src/main/java/org/hbp/mip/configuration/PersistenceConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
@@ -1,7 +1,7 @@
-package org.hbp.mip.configuration;
+package eu.hbp.mip.configuration;
+import eu.hbp.mip.utils.CSVUtil;
import org.flywaydb.core.Flyway;
-import org.hbp.mip.utils.CSVUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.orm.jpa.EntityScan;
import org.springframework.context.annotation.Bean;
@@ -19,8 +19,8 @@ import javax.sql.DataSource;
*/
@Configuration
-@EnableJpaRepositories(value = "org.hbp.mip.repositories")
-@EntityScan(basePackages = "org.hbp.mip.model")
+@EnableJpaRepositories(value = "eu.hbp.mip.repositories")
+@EntityScan(basePackages = "eu.hbp.mip.model")
public class PersistenceConfiguration {
@Autowired
diff --git a/src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
similarity index 97%
rename from src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java
rename to src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
index f8d78b38f2ab690d508c5b718bd8e19bf24213dd..7f076ab80ed44567525352ec42a78d0e39a85b16 100644
--- a/src/main/java/org/hbp/mip/configuration/SecurityConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
@@ -1,14 +1,14 @@
-package org.hbp.mip.configuration;
+package eu.hbp.mip.configuration;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import eu.hbp.mip.controllers.ArticlesApi;
+import eu.hbp.mip.utils.CORSFilter;
import io.swagger.annotations.ApiParam;
import org.apache.log4j.Logger;
-import org.hbp.mip.controllers.ArticlesApi;
-import org.hbp.mip.model.User;
-import org.hbp.mip.repositories.UserRepository;
-import org.hbp.mip.utils.CORSFilter;
-import org.hbp.mip.utils.CustomLoginUrlAuthenticationEntryPoint;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.repositories.UserRepository;
+import eu.hbp.mip.utils.CustomLoginUrlAuthenticationEntryPoint;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.security.oauth2.resource.ResourceServerProperties;
diff --git a/src/main/java/org/hbp/mip/configuration/WebConfiguration.java b/src/main/java/eu/hbp/mip/configuration/WebConfiguration.java
similarity index 91%
rename from src/main/java/org/hbp/mip/configuration/WebConfiguration.java
rename to src/main/java/eu/hbp/mip/configuration/WebConfiguration.java
index 888fbd1e7e58c5725c60782c2c02aa220e3e33cc..96826c1a6df5bed220c62de30fc8f9ef82a74916 100644
--- a/src/main/java/org/hbp/mip/configuration/WebConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/WebConfiguration.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.configuration;
+package eu.hbp.mip.configuration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -29,7 +29,7 @@ public class WebConfiguration {
public Docket documentation() {
return new Docket(DocumentationType.SWAGGER_2)
.select()
- .apis(RequestHandlerSelectors.basePackage("org.hbp.mip.controllers"))
+ .apis(RequestHandlerSelectors.basePackage("eu.hbp.mip.controllers"))
.build()
.pathMapping("/")
.apiInfo(metadata());
diff --git a/src/main/java/org/hbp/mip/controllers/AppsApi.java b/src/main/java/eu/hbp/mip/controllers/AppsApi.java
similarity index 88%
rename from src/main/java/org/hbp/mip/controllers/AppsApi.java
rename to src/main/java/eu/hbp/mip/controllers/AppsApi.java
index 351a2efb069e6b23831857e461a2a7db6f16a1a2..0bc610acac1c8fbc4f635f8535e318114403a314 100644
--- a/src/main/java/org/hbp/mip/controllers/AppsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/AppsApi.java
@@ -2,17 +2,17 @@
* Created by mirco on 20.05.16.
*/
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
+import eu.hbp.mip.configuration.SecurityConfiguration;
+import eu.hbp.mip.repositories.AppRepository;
import io.swagger.annotations.*;
import org.apache.log4j.Logger;
-import org.hbp.mip.configuration.SecurityConfiguration;
-import org.hbp.mip.model.App;
-import org.hbp.mip.model.User;
-import org.hbp.mip.model.Vote;
-import org.hbp.mip.repositories.AppRepository;
-import org.hbp.mip.repositories.UserRepository;
-import org.hbp.mip.repositories.VoteRepository;
+import eu.hbp.mip.model.App;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.model.Vote;
+import eu.hbp.mip.repositories.UserRepository;
+import eu.hbp.mip.repositories.VoteRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/org/hbp/mip/controllers/ArticlesApi.java b/src/main/java/eu/hbp/mip/controllers/ArticlesApi.java
similarity index 96%
rename from src/main/java/org/hbp/mip/controllers/ArticlesApi.java
rename to src/main/java/eu/hbp/mip/controllers/ArticlesApi.java
index 83eed713395da1593b216eb44431370fdcd8d214..0b85ff02c62df94e66c2981f121018e983b7544c 100644
--- a/src/main/java/org/hbp/mip/controllers/ArticlesApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ArticlesApi.java
@@ -2,16 +2,16 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
import com.github.slugify.Slugify;
+import eu.hbp.mip.model.Article;
import io.swagger.annotations.*;
import org.apache.log4j.Logger;
-import org.hbp.mip.configuration.SecurityConfiguration;
-import org.hbp.mip.model.Article;
-import org.hbp.mip.model.User;
-import org.hbp.mip.repositories.ArticleRepository;
+import eu.hbp.mip.configuration.SecurityConfiguration;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.repositories.ArticleRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/org/hbp/mip/controllers/DatasetsApi.java b/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
similarity index 90%
rename from src/main/java/org/hbp/mip/controllers/DatasetsApi.java
rename to src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
index 05fc11d6a8b93a573e0c5ffe149de1e2d2a9a1fc..e82c226bdd43b8fcc5a752e09901f7c4abdc641b 100644
--- a/src/main/java/org/hbp/mip/controllers/DatasetsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/DatasetsApi.java
@@ -2,12 +2,12 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
import io.swagger.annotations.*;
-import org.hbp.mip.model.Dataset;
-import org.hbp.mip.repositories.DatasetRepository;
+import eu.hbp.mip.model.Dataset;
+import eu.hbp.mip.repositories.DatasetRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
diff --git a/src/main/java/org/hbp/mip/controllers/ExperimentApi.java b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
similarity index 97%
rename from src/main/java/org/hbp/mip/controllers/ExperimentApi.java
rename to src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
index 99275314da2f0fdd068157e99e927b57aa949ca8..c472f0760e88238b60a05b1577c2d9f23143abe0 100644
--- a/src/main/java/org/hbp/mip/controllers/ExperimentApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
@@ -1,16 +1,16 @@
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
import com.google.common.collect.Lists;
import com.google.gson.*;
+import eu.hbp.mip.configuration.SecurityConfiguration;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.utils.HTTPUtil;
import io.swagger.annotations.*;
import org.apache.log4j.Logger;
-import org.hbp.mip.configuration.SecurityConfiguration;
-import org.hbp.mip.model.Experiment;
-import org.hbp.mip.model.User;
-import org.hbp.mip.repositories.ExperimentRepository;
-import org.hbp.mip.repositories.ModelRepository;
-import org.hbp.mip.utils.HTTPUtil;
-import org.hbp.mip.utils.JSONUtil;
+import eu.hbp.mip.model.Experiment;
+import eu.hbp.mip.repositories.ExperimentRepository;
+import eu.hbp.mip.repositories.ModelRepository;
+import eu.hbp.mip.utils.JSONUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
diff --git a/src/main/java/org/hbp/mip/controllers/GroupsApi.java b/src/main/java/eu/hbp/mip/controllers/GroupsApi.java
similarity index 91%
rename from src/main/java/org/hbp/mip/controllers/GroupsApi.java
rename to src/main/java/eu/hbp/mip/controllers/GroupsApi.java
index 48574e48cec79d8a23005db34c3125521d7f9c7a..ead40a093f1109ee7d217449483045c11a166962 100644
--- a/src/main/java/org/hbp/mip/controllers/GroupsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/GroupsApi.java
@@ -2,14 +2,14 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
-import org.hbp.mip.model.Group;
-import org.hbp.mip.repositories.GroupRepository;
+import eu.hbp.mip.model.Group;
+import eu.hbp.mip.repositories.GroupRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/org/hbp/mip/controllers/ModelsApi.java b/src/main/java/eu/hbp/mip/controllers/ModelsApi.java
similarity index 95%
rename from src/main/java/org/hbp/mip/controllers/ModelsApi.java
rename to src/main/java/eu/hbp/mip/controllers/ModelsApi.java
index 2570b9a6770cd6b264549d472528ec55fd517e34..31d736d2a04ad60c7add4afafb1580a2d3466006 100644
--- a/src/main/java/org/hbp/mip/controllers/ModelsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ModelsApi.java
@@ -2,18 +2,21 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
import com.github.slugify.Slugify;
+import eu.hbp.mip.configuration.SecurityConfiguration;
+import eu.hbp.mip.model.Filter;
+import eu.hbp.mip.model.Model;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.model.Variable;
+import eu.hbp.mip.repositories.ConfigRepository;
+import eu.hbp.mip.repositories.ModelRepository;
+import eu.hbp.mip.utils.CSVUtil;
import io.swagger.annotations.*;
import org.apache.log4j.Logger;
-import org.hbp.mip.configuration.SecurityConfiguration;
-import org.hbp.mip.model.*;
-import org.hbp.mip.repositories.ConfigRepository;
-import org.hbp.mip.repositories.DatasetRepository;
-import org.hbp.mip.repositories.ModelRepository;
-import org.hbp.mip.repositories.QueryRepository;
-import org.hbp.mip.utils.CSVUtil;
+import eu.hbp.mip.repositories.DatasetRepository;
+import eu.hbp.mip.repositories.QueryRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/org/hbp/mip/controllers/RequestsApi.java b/src/main/java/eu/hbp/mip/controllers/RequestsApi.java
similarity index 90%
rename from src/main/java/org/hbp/mip/controllers/RequestsApi.java
rename to src/main/java/eu/hbp/mip/controllers/RequestsApi.java
index 76527eba6de906c48a50823ed348c4388cfc2dc0..c3ace60ee80811a7339f6a6e871917c7b87dce1d 100644
--- a/src/main/java/org/hbp/mip/controllers/RequestsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/RequestsApi.java
@@ -2,12 +2,12 @@
* Created by mirco on 18.01.16.
*/
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
import io.swagger.annotations.*;
-import org.hbp.mip.model.Dataset;
-import org.hbp.mip.model.Query;
-import org.hbp.mip.utils.CSVUtil;
+import eu.hbp.mip.model.Dataset;
+import eu.hbp.mip.model.Query;
+import eu.hbp.mip.utils.CSVUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
diff --git a/src/main/java/org/hbp/mip/controllers/StatsApi.java b/src/main/java/eu/hbp/mip/controllers/StatsApi.java
similarity index 87%
rename from src/main/java/org/hbp/mip/controllers/StatsApi.java
rename to src/main/java/eu/hbp/mip/controllers/StatsApi.java
index 3f6883f28f9d19e7887519105e9a07bd58d5679d..4dd13b39d0710d02675b15fe9a5163647c3256bd 100644
--- a/src/main/java/org/hbp/mip/controllers/StatsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/StatsApi.java
@@ -2,16 +2,16 @@
* Created by mirco on 18.01.16.
*/
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
+import eu.hbp.mip.repositories.VariableRepository;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
-import org.hbp.mip.model.GeneralStats;
-import org.hbp.mip.repositories.ArticleRepository;
-import org.hbp.mip.repositories.UserRepository;
-import org.hbp.mip.repositories.VariableRepository;
+import eu.hbp.mip.model.GeneralStats;
+import eu.hbp.mip.repositories.ArticleRepository;
+import eu.hbp.mip.repositories.UserRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/org/hbp/mip/controllers/UsersApi.java b/src/main/java/eu/hbp/mip/controllers/UsersApi.java
similarity index 91%
rename from src/main/java/org/hbp/mip/controllers/UsersApi.java
rename to src/main/java/eu/hbp/mip/controllers/UsersApi.java
index eabeffca1e196a3201a9068b46c1dc395946f2fb..7859a669a8a0ba0f955f22f4096ae4dc8a17f5ba 100644
--- a/src/main/java/org/hbp/mip/controllers/UsersApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/UsersApi.java
@@ -2,11 +2,11 @@
* Created by mirco on 14.01.16.
*/
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
import io.swagger.annotations.*;
-import org.hbp.mip.model.User;
-import org.hbp.mip.repositories.UserRepository;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.repositories.UserRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
diff --git a/src/main/java/org/hbp/mip/controllers/VariablesApi.java b/src/main/java/eu/hbp/mip/controllers/VariablesApi.java
similarity index 95%
rename from src/main/java/org/hbp/mip/controllers/VariablesApi.java
rename to src/main/java/eu/hbp/mip/controllers/VariablesApi.java
index b5f2d72f2f5ea151070fb2598007f22a49b475f6..77cfc404a813919b793dd1498bb8506ddd28a304 100644
--- a/src/main/java/org/hbp/mip/controllers/VariablesApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/VariablesApi.java
@@ -2,13 +2,13 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.controllers;
+package eu.hbp.mip.controllers;
+import eu.hbp.mip.repositories.VariableRepository;
import io.swagger.annotations.*;
-import org.hbp.mip.model.Value;
-import org.hbp.mip.model.Variable;
-import org.hbp.mip.repositories.VariableRepository;
+import eu.hbp.mip.model.Value;
+import eu.hbp.mip.model.Variable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/org/hbp/mip/model/App.java b/src/main/java/eu/hbp/mip/model/App.java
similarity index 98%
rename from src/main/java/org/hbp/mip/model/App.java
rename to src/main/java/eu/hbp/mip/model/App.java
index c328c36ca8330b538d66028cd085407959a4b5ca..8629865a864ea689b5b81e54b6359cb7fa12c2e1 100644
--- a/src/main/java/org/hbp/mip/model/App.java
+++ b/src/main/java/eu/hbp/mip/model/App.java
@@ -2,7 +2,7 @@
* Created by mirco on 20.05.16.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/hbp/mip/model/Article.java b/src/main/java/eu/hbp/mip/model/Article.java
similarity index 99%
rename from src/main/java/org/hbp/mip/model/Article.java
rename to src/main/java/eu/hbp/mip/model/Article.java
index b7821db0ca22566bb2aff06a847d566fff0a40e7..508ad89c48e06f1314b0f1dfa0166d962e67120f 100644
--- a/src/main/java/org/hbp/mip/model/Article.java
+++ b/src/main/java/eu/hbp/mip/model/Article.java
@@ -2,7 +2,7 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/hbp/mip/model/Config.java b/src/main/java/eu/hbp/mip/model/Config.java
similarity index 98%
rename from src/main/java/org/hbp/mip/model/Config.java
rename to src/main/java/eu/hbp/mip/model/Config.java
index 08bed89798cda8f97015ae62717a7a2300b7126d..d950d5074f2e231533c1047f16219ecb5205a065 100644
--- a/src/main/java/org/hbp/mip/model/Config.java
+++ b/src/main/java/eu/hbp/mip/model/Config.java
@@ -2,7 +2,7 @@
* Created by mirco on 25.02.16.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/model/Dataset.java b/src/main/java/eu/hbp/mip/model/Dataset.java
similarity index 98%
rename from src/main/java/org/hbp/mip/model/Dataset.java
rename to src/main/java/eu/hbp/mip/model/Dataset.java
index 023cecf06d6738dc31f7cfde5edb2dccf2dbd09f..f0dab7c4b2fb91a19372ec738fef4de5929c9594 100644
--- a/src/main/java/org/hbp/mip/model/Dataset.java
+++ b/src/main/java/eu/hbp/mip/model/Dataset.java
@@ -2,7 +2,7 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/model/ExaremeQueryElement.java b/src/main/java/eu/hbp/mip/model/ExaremeQueryElement.java
similarity index 96%
rename from src/main/java/org/hbp/mip/model/ExaremeQueryElement.java
rename to src/main/java/eu/hbp/mip/model/ExaremeQueryElement.java
index dba6d6269da25986a0d39028d927f61563b39ae8..0b7005c19dd985d4ae639768053df2c61f836ac7 100644
--- a/src/main/java/org/hbp/mip/model/ExaremeQueryElement.java
+++ b/src/main/java/eu/hbp/mip/model/ExaremeQueryElement.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/model/Experiment.java b/src/main/java/eu/hbp/mip/model/Experiment.java
similarity index 99%
rename from src/main/java/org/hbp/mip/model/Experiment.java
rename to src/main/java/eu/hbp/mip/model/Experiment.java
index f42ffbd6cbc11aa6e297bde4adfdc383b23ea5dd..9fac6af1717a4d7fc98de2cf4ca637d9048d949a 100644
--- a/src/main/java/org/hbp/mip/model/Experiment.java
+++ b/src/main/java/eu/hbp/mip/model/Experiment.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git a/src/main/java/org/hbp/mip/model/Filter.java b/src/main/java/eu/hbp/mip/model/Filter.java
similarity index 98%
rename from src/main/java/org/hbp/mip/model/Filter.java
rename to src/main/java/eu/hbp/mip/model/Filter.java
index 27af1d69c9b26fd1475d1395f1e3a6432c86bf81..e55b405e95e36cffb75dfbafcb4abf1c077ecdc5 100644
--- a/src/main/java/org/hbp/mip/model/Filter.java
+++ b/src/main/java/eu/hbp/mip/model/Filter.java
@@ -2,7 +2,7 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/hbp/mip/model/GeneralStats.java b/src/main/java/eu/hbp/mip/model/GeneralStats.java
similarity index 96%
rename from src/main/java/org/hbp/mip/model/GeneralStats.java
rename to src/main/java/eu/hbp/mip/model/GeneralStats.java
index b9366c013e3e2913a220e598cfe6c3264d231b6a..8953828d4fa4313d6ca51f05dce781ee3f0c2190 100644
--- a/src/main/java/org/hbp/mip/model/GeneralStats.java
+++ b/src/main/java/eu/hbp/mip/model/GeneralStats.java
@@ -2,7 +2,7 @@
* Created by mirco on 03.02.16.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/model/Group.java b/src/main/java/eu/hbp/mip/model/Group.java
similarity index 98%
rename from src/main/java/org/hbp/mip/model/Group.java
rename to src/main/java/eu/hbp/mip/model/Group.java
index 32cf44f662107d113c214901ee77113d6e434d85..a77de20394660978c72920dc7eb37f2a7d18f52e 100644
--- a/src/main/java/org/hbp/mip/model/Group.java
+++ b/src/main/java/eu/hbp/mip/model/Group.java
@@ -2,7 +2,7 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/hbp/mip/model/Model.java b/src/main/java/eu/hbp/mip/model/Model.java
similarity index 94%
rename from src/main/java/org/hbp/mip/model/Model.java
rename to src/main/java/eu/hbp/mip/model/Model.java
index fb871152fe562a4fab41a0b7def52123cd26394b..d788436a6d9a5b0c42fa1b616cdcc3be443ed1a0 100644
--- a/src/main/java/org/hbp/mip/model/Model.java
+++ b/src/main/java/eu/hbp/mip/model/Model.java
@@ -2,7 +2,7 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.google.gson.annotations.Expose;
@@ -36,7 +36,7 @@ public class Model {
@ManyToOne
@Cascade(CascadeType.SAVE_UPDATE)
- private Query query = null;
+ private eu.hbp.mip.model.Query query = null;
@ManyToOne
@Cascade(CascadeType.SAVE_UPDATE)
@@ -92,11 +92,11 @@ public class Model {
}
- public Query getQuery() {
+ public eu.hbp.mip.model.Query getQuery() {
return query;
}
- public void setQuery(Query query) {
+ public void setQuery(eu.hbp.mip.model.Query query) {
this.query = query;
}
diff --git a/src/main/java/org/hbp/mip/model/Query.java b/src/main/java/eu/hbp/mip/model/Query.java
similarity index 99%
rename from src/main/java/org/hbp/mip/model/Query.java
rename to src/main/java/eu/hbp/mip/model/Query.java
index fddb0c7a7c68ffb5a79c733032d9a36c4564008b..61b979ff4400e709d8079ff034317dc1d869ce10 100644
--- a/src/main/java/org/hbp/mip/model/Query.java
+++ b/src/main/java/eu/hbp/mip/model/Query.java
@@ -2,7 +2,7 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/hbp/mip/model/Tag.java b/src/main/java/eu/hbp/mip/model/Tag.java
similarity index 95%
rename from src/main/java/org/hbp/mip/model/Tag.java
rename to src/main/java/eu/hbp/mip/model/Tag.java
index 6619bd75f57a66dfe66446e4f710b4d515663199..e09f86fc2666fb73598629a499da2020a2bf542c 100644
--- a/src/main/java/org/hbp/mip/model/Tag.java
+++ b/src/main/java/eu/hbp/mip/model/Tag.java
@@ -2,7 +2,7 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/model/User.java b/src/main/java/eu/hbp/mip/model/User.java
similarity index 99%
rename from src/main/java/org/hbp/mip/model/User.java
rename to src/main/java/eu/hbp/mip/model/User.java
index 7d12a47f5265f9f4aebd58463b7dcde0c93140b1..11b6b8fd477e55bef26e6f0f5b66fdfe210cebb6 100644
--- a/src/main/java/org/hbp/mip/model/User.java
+++ b/src/main/java/eu/hbp/mip/model/User.java
@@ -2,7 +2,7 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/hbp/mip/model/Value.java b/src/main/java/eu/hbp/mip/model/Value.java
similarity index 96%
rename from src/main/java/org/hbp/mip/model/Value.java
rename to src/main/java/eu/hbp/mip/model/Value.java
index b9c2705c59e3ecd524a4d4b289a478aadf02601e..17ca49d52b29ae99359963cf1f07a5effb3f4b1c 100644
--- a/src/main/java/org/hbp/mip/model/Value.java
+++ b/src/main/java/eu/hbp/mip/model/Value.java
@@ -2,7 +2,7 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/model/Variable.java b/src/main/java/eu/hbp/mip/model/Variable.java
similarity index 99%
rename from src/main/java/org/hbp/mip/model/Variable.java
rename to src/main/java/eu/hbp/mip/model/Variable.java
index 2bc6a37c8637930c0ea1466633250bfb467ac9b2..1f8d58bd157bb3fb9ee9d12adcea2bf4b4a8a068 100644
--- a/src/main/java/org/hbp/mip/model/Variable.java
+++ b/src/main/java/eu/hbp/mip/model/Variable.java
@@ -2,7 +2,7 @@
* Created by mirco on 04.12.15.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/src/main/java/org/hbp/mip/model/Vote.java b/src/main/java/eu/hbp/mip/model/Vote.java
similarity index 97%
rename from src/main/java/org/hbp/mip/model/Vote.java
rename to src/main/java/eu/hbp/mip/model/Vote.java
index b9981a8e92a96092b8c0fa8e4e833f70846dedfd..8c79537840d81cb09134132200ac47a49a36b09a 100644
--- a/src/main/java/org/hbp/mip/model/Vote.java
+++ b/src/main/java/eu/hbp/mip/model/Vote.java
@@ -2,7 +2,7 @@
* Created by mirco on 24.05.16.
*/
-package org.hbp.mip.model;
+package eu.hbp.mip.model;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
diff --git a/src/main/java/org/hbp/mip/repositories/AppRepository.java b/src/main/java/eu/hbp/mip/repositories/AppRepository.java
similarity index 73%
rename from src/main/java/org/hbp/mip/repositories/AppRepository.java
rename to src/main/java/eu/hbp/mip/repositories/AppRepository.java
index ba00367afe2b6419d61f1a810b5f21acfb7596f6..949e7b3f6efdd94897376a3f1b25aa18bbd5bc76 100644
--- a/src/main/java/org/hbp/mip/repositories/AppRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/AppRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.App;
+import eu.hbp.mip.model.App;
import org.springframework.data.repository.CrudRepository;
/**
diff --git a/src/main/java/org/hbp/mip/repositories/ArticleRepository.java b/src/main/java/eu/hbp/mip/repositories/ArticleRepository.java
similarity index 77%
rename from src/main/java/org/hbp/mip/repositories/ArticleRepository.java
rename to src/main/java/eu/hbp/mip/repositories/ArticleRepository.java
index b27ecfaa4d7d44a66d7f80e065f06df545a69dfd..4ad0e3942b533b524700868428a05dc9941ffe40 100644
--- a/src/main/java/org/hbp/mip/repositories/ArticleRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/ArticleRepository.java
@@ -1,7 +1,7 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.Article;
-import org.hbp.mip.model.User;
+import eu.hbp.mip.model.Article;
+import eu.hbp.mip.model.User;
import org.springframework.data.repository.CrudRepository;
/**
diff --git a/src/main/java/org/hbp/mip/repositories/ConfigRepository.java b/src/main/java/eu/hbp/mip/repositories/ConfigRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/ConfigRepository.java
rename to src/main/java/eu/hbp/mip/repositories/ConfigRepository.java
index f54f379144b1769eda2bca8db2b9be623c98fd06..deb286150c0ba9c7833b4dfa66a61d3890c011c4 100644
--- a/src/main/java/org/hbp/mip/repositories/ConfigRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/ConfigRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.Config;
+import eu.hbp.mip.model.Config;
import org.springframework.data.repository.CrudRepository;
/**
diff --git a/src/main/java/org/hbp/mip/repositories/DatasetRepository.java b/src/main/java/eu/hbp/mip/repositories/DatasetRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/DatasetRepository.java
rename to src/main/java/eu/hbp/mip/repositories/DatasetRepository.java
index 53883eb21f504b1fcd90178b44d1105785129fba..7c6da1e9745b8a144296d51a5d85434111213b96 100644
--- a/src/main/java/org/hbp/mip/repositories/DatasetRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/DatasetRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.Dataset;
+import eu.hbp.mip.model.Dataset;
import org.springframework.data.repository.CrudRepository;
/**
diff --git a/src/main/java/org/hbp/mip/repositories/ExperimentRepository.java b/src/main/java/eu/hbp/mip/repositories/ExperimentRepository.java
similarity index 75%
rename from src/main/java/org/hbp/mip/repositories/ExperimentRepository.java
rename to src/main/java/eu/hbp/mip/repositories/ExperimentRepository.java
index 3815879beab40747df7fba83f2a96d950af3ece9..6609d6450af5b72b300ec529c41cff7153c01aef 100644
--- a/src/main/java/org/hbp/mip/repositories/ExperimentRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/ExperimentRepository.java
@@ -1,7 +1,7 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.Experiment;
-import org.hbp.mip.model.User;
+import eu.hbp.mip.model.Experiment;
+import eu.hbp.mip.model.User;
import org.springframework.data.repository.CrudRepository;
import java.util.UUID;
diff --git a/src/main/java/org/hbp/mip/repositories/FilterRepository.java b/src/main/java/eu/hbp/mip/repositories/FilterRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/FilterRepository.java
rename to src/main/java/eu/hbp/mip/repositories/FilterRepository.java
index 7f4a1556924d00bbd33fd92135169f176fe749e6..d8d8e5ff440331608f6bdb7f368f209c27e49d06 100644
--- a/src/main/java/org/hbp/mip/repositories/FilterRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/FilterRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.Filter;
+import eu.hbp.mip.model.Filter;
import org.springframework.data.repository.CrudRepository;
/**
diff --git a/src/main/java/org/hbp/mip/repositories/GroupRepository.java b/src/main/java/eu/hbp/mip/repositories/GroupRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/GroupRepository.java
rename to src/main/java/eu/hbp/mip/repositories/GroupRepository.java
index 548653269f2c788bef529e1748b4b9fdca04126d..ab6839f71bb973de40cd139d10381ebc4a927d49 100644
--- a/src/main/java/org/hbp/mip/repositories/GroupRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/GroupRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.Group;
+import eu.hbp.mip.model.Group;
import org.springframework.data.repository.CrudRepository;
/**
diff --git a/src/main/java/org/hbp/mip/repositories/ModelRepository.java b/src/main/java/eu/hbp/mip/repositories/ModelRepository.java
similarity index 79%
rename from src/main/java/org/hbp/mip/repositories/ModelRepository.java
rename to src/main/java/eu/hbp/mip/repositories/ModelRepository.java
index 9da1df5bd11936471fde140ce86b60689c5a499c..de44afc6cff7b1abf2239cd2b6fd78e31ef59d18 100644
--- a/src/main/java/org/hbp/mip/repositories/ModelRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/ModelRepository.java
@@ -1,7 +1,7 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.Model;
-import org.hbp.mip.model.User;
+import eu.hbp.mip.model.Model;
+import eu.hbp.mip.model.User;
import org.springframework.data.repository.CrudRepository;
/**
diff --git a/src/main/java/org/hbp/mip/repositories/QueryRepository.java b/src/main/java/eu/hbp/mip/repositories/QueryRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/QueryRepository.java
rename to src/main/java/eu/hbp/mip/repositories/QueryRepository.java
index 44dc9527b480447e28205322e87e7a962f09f285..f0b95d39c4c3a480fe2bec20ce75e46361889e71 100644
--- a/src/main/java/org/hbp/mip/repositories/QueryRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/QueryRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.Query;
+import eu.hbp.mip.model.Query;
import org.springframework.data.repository.CrudRepository;
/**
diff --git a/src/main/java/org/hbp/mip/repositories/TagRepository.java b/src/main/java/eu/hbp/mip/repositories/TagRepository.java
similarity index 73%
rename from src/main/java/org/hbp/mip/repositories/TagRepository.java
rename to src/main/java/eu/hbp/mip/repositories/TagRepository.java
index 155d65d17170b6171170a3b41ae12f981cf9fbf0..4edb4090e0336ac034daf245d5ca3bb084a6f5ae 100644
--- a/src/main/java/org/hbp/mip/repositories/TagRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/TagRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.Tag;
+import eu.hbp.mip.model.Tag;
import org.springframework.data.repository.CrudRepository;
/**
diff --git a/src/main/java/org/hbp/mip/repositories/UserRepository.java b/src/main/java/eu/hbp/mip/repositories/UserRepository.java
similarity index 73%
rename from src/main/java/org/hbp/mip/repositories/UserRepository.java
rename to src/main/java/eu/hbp/mip/repositories/UserRepository.java
index 04338433fe84ada90f446232715c71d63ba904f4..3a0db7ee31cf9c56cdd68397d641f4a71e8c37a2 100644
--- a/src/main/java/org/hbp/mip/repositories/UserRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/UserRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.User;
+import eu.hbp.mip.model.User;
import org.springframework.data.repository.CrudRepository;
/**
diff --git a/src/main/java/org/hbp/mip/repositories/ValueRepository.java b/src/main/java/eu/hbp/mip/repositories/ValueRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/ValueRepository.java
rename to src/main/java/eu/hbp/mip/repositories/ValueRepository.java
index c3b088462874f72489c507576aa9fb9ce5d221fc..b41574d6082542ec1539f8e14203e61eb27e0614 100644
--- a/src/main/java/org/hbp/mip/repositories/ValueRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/ValueRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.Value;
+import eu.hbp.mip.model.Value;
import org.springframework.data.repository.CrudRepository;
/**
diff --git a/src/main/java/org/hbp/mip/repositories/VariableRepository.java b/src/main/java/eu/hbp/mip/repositories/VariableRepository.java
similarity index 72%
rename from src/main/java/org/hbp/mip/repositories/VariableRepository.java
rename to src/main/java/eu/hbp/mip/repositories/VariableRepository.java
index ac241ca7a16f06b75e7c2135724675bcafecefaa..3a4e7e2f582d0be33569093ef38c73f4dd28e906 100644
--- a/src/main/java/org/hbp/mip/repositories/VariableRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/VariableRepository.java
@@ -1,6 +1,6 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.Variable;
+import eu.hbp.mip.model.Variable;
import org.springframework.data.repository.CrudRepository;
/**
diff --git a/src/main/java/org/hbp/mip/repositories/VoteRepository.java b/src/main/java/eu/hbp/mip/repositories/VoteRepository.java
similarity index 64%
rename from src/main/java/org/hbp/mip/repositories/VoteRepository.java
rename to src/main/java/eu/hbp/mip/repositories/VoteRepository.java
index 78d760b9cb998b65a444d3472bbf3326a3052979..30499e5511878169d4f76180afaacef74bdf52f6 100644
--- a/src/main/java/org/hbp/mip/repositories/VoteRepository.java
+++ b/src/main/java/eu/hbp/mip/repositories/VoteRepository.java
@@ -1,8 +1,8 @@
-package org.hbp.mip.repositories;
+package eu.hbp.mip.repositories;
-import org.hbp.mip.model.App;
-import org.hbp.mip.model.User;
-import org.hbp.mip.model.Vote;
+import eu.hbp.mip.model.App;
+import eu.hbp.mip.model.User;
+import eu.hbp.mip.model.Vote;
import org.springframework.data.repository.CrudRepository;
/**
diff --git a/src/main/java/org/hbp/mip/utils/CORSFilter.java b/src/main/java/eu/hbp/mip/utils/CORSFilter.java
similarity index 97%
rename from src/main/java/org/hbp/mip/utils/CORSFilter.java
rename to src/main/java/eu/hbp/mip/utils/CORSFilter.java
index 9feb2895dd7af50acfcb61e0e35810e3a71d2ebe..ef3b35353afdf70877318e706bc9f753f3687635 100644
--- a/src/main/java/org/hbp/mip/utils/CORSFilter.java
+++ b/src/main/java/eu/hbp/mip/utils/CORSFilter.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.utils;
+package eu.hbp.mip.utils;
import javax.servlet.*;
import javax.servlet.http.HttpServletResponse;
diff --git a/src/main/java/org/hbp/mip/utils/CSVUtil.java b/src/main/java/eu/hbp/mip/utils/CSVUtil.java
similarity index 97%
rename from src/main/java/org/hbp/mip/utils/CSVUtil.java
rename to src/main/java/eu/hbp/mip/utils/CSVUtil.java
index a91d390ce42533abaef1f65f00aab7ca9e57a394..ce56b7935ed20426fe414ac50a2fd48625a5ea56 100644
--- a/src/main/java/org/hbp/mip/utils/CSVUtil.java
+++ b/src/main/java/eu/hbp/mip/utils/CSVUtil.java
@@ -1,10 +1,10 @@
-package org.hbp.mip.utils;
+package eu.hbp.mip.utils;
+import eu.hbp.mip.repositories.VariableRepository;
import org.apache.log4j.Logger;
-import org.hbp.mip.model.Dataset;
-import org.hbp.mip.model.Query;
-import org.hbp.mip.model.Variable;
-import org.hbp.mip.repositories.VariableRepository;
+import eu.hbp.mip.model.Dataset;
+import eu.hbp.mip.model.Query;
+import eu.hbp.mip.model.Variable;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.BufferedReader;
diff --git a/src/main/java/org/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java b/src/main/java/eu/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java
similarity index 96%
rename from src/main/java/org/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java
rename to src/main/java/eu/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java
index 437052aa882be5f901a312cd269b58578c2b4d0b..45870c7778280ff60c8ccca2908105ee677a6f7a 100644
--- a/src/main/java/org/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java
+++ b/src/main/java/eu/hbp/mip/utils/CustomLoginUrlAuthenticationEntryPoint.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.utils;
+package eu.hbp.mip.utils;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
diff --git a/src/main/java/org/hbp/mip/utils/HTTPUtil.java b/src/main/java/eu/hbp/mip/utils/HTTPUtil.java
similarity index 98%
rename from src/main/java/org/hbp/mip/utils/HTTPUtil.java
rename to src/main/java/eu/hbp/mip/utils/HTTPUtil.java
index 0a524bb99d7fa8403af05fb94fdfec0c1e9d9a25..c641826e8e2e8bddb7e544cc60fcebdd8fd1c600 100644
--- a/src/main/java/org/hbp/mip/utils/HTTPUtil.java
+++ b/src/main/java/eu/hbp/mip/utils/HTTPUtil.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.utils;
+package eu.hbp.mip.utils;
import java.io.BufferedReader;
import java.io.DataOutputStream;
diff --git a/src/main/java/org/hbp/mip/utils/JSONUtil.java b/src/main/java/eu/hbp/mip/utils/JSONUtil.java
similarity index 96%
rename from src/main/java/org/hbp/mip/utils/JSONUtil.java
rename to src/main/java/eu/hbp/mip/utils/JSONUtil.java
index 938cfbb70a26974495782707d151089fad9b4d01..82e466be041011e1bdf240071be2921f98723dd5 100644
--- a/src/main/java/org/hbp/mip/utils/JSONUtil.java
+++ b/src/main/java/eu/hbp/mip/utils/JSONUtil.java
@@ -1,4 +1,4 @@
-package org.hbp.mip.utils;
+package eu.hbp.mip.utils;
import com.google.gson.JsonParseException;
import com.google.gson.JsonParser;
diff --git a/src/test/java/eu/hbp/mip/MIPApplicationTests.java b/src/test/java/eu/hbp/mip/MIPApplicationTests.java
new file mode 100644
index 0000000000000000000000000000000000000000..be4ef7d964d76633806dcabe2cbe5f9ba32d9158
--- /dev/null
+++ b/src/test/java/eu/hbp/mip/MIPApplicationTests.java
@@ -0,0 +1,23 @@
+package eu.hbp.mip;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.GenericXmlContextLoader;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(loader = GenericXmlContextLoader.class)
+public class MIPApplicationTests {
+
+ @Test
+ public void testHello()
+ {
+ /*
+ * NO UNIT TEST NEEDED FOR THIS COMPONENT
+ */
+
+ Assert.assertNotNull("test");
+ }
+}
diff --git a/src/test/java/org/hbp/mip/MIPApplicationTests.java b/src/test/java/org/hbp/mip/MIPApplicationTests.java
deleted file mode 100644
index 3beac4281a34611ace1b20b0fcc9c4822afe96d3..0000000000000000000000000000000000000000
--- a/src/test/java/org/hbp/mip/MIPApplicationTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2012-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.hbp.mip;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.GenericXmlContextLoader;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(loader = GenericXmlContextLoader.class)
-public class MIPApplicationTests {
-
- @Test
- public void testHello()
- {
- Assert.assertNotNull("test");
- }
-}
diff --git a/tests/test-build.sh b/tests/test-build.sh
index 39b78db4ea337b0a21e4212254df5917b733fb6d..89b65881e37e95fc3f2ec4507b22474a5659fc79 100755
--- a/tests/test-build.sh
+++ b/tests/test-build.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-if [ ! -f ./target/backend-services-DOCKER_BUILD.jar ]; then
+if [ ! -f ./target/portal-backend-DOCKER_BUILD.jar ]; then
exit 1
fi