diff --git a/microservice-server/conf/config.json b/microservice-server/conf/config.json
index 44f4444e74b4c2bac44e55f10ee11c2c28a26f4f..07d1a974a84c6faaa91d1079cf2c445bcb87055d 100644
--- a/microservice-server/conf/config.json
+++ b/microservice-server/conf/config.json
@@ -2,7 +2,7 @@
"port" : 8080,
"services" : [
{
- "className" : "ch.ethz.sis.microservices.download.server.services.store.FileInfoHandler",
+ "className" : "ch.ethz.sis.microservices.server.services.store.FileInfoHandler",
"url" : "/file-information",
"parameters" : {
"openbis-url" : "http://localhost:8888/openbis/openbis/rmi-application-server-v3",
@@ -13,7 +13,7 @@
}
},
{
- "className" : "ch.ethz.sis.microservices.download.server.services.store.DownloadHandler",
+ "className" : "ch.ethz.sis.microservices.server.services.store.DownloadHandler",
"url" : "/download",
"parameters" : {
"openbis-url" : "http://localhost:8888/openbis/openbis/rmi-application-server-v3",
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/.DS_Store b/microservice-server/src/main/java/ch/ethz/sis/microservices/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
Binary files /dev/null and b/microservice-server/src/main/java/ch/ethz/sis/microservices/.DS_Store differ
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/Config.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/Config.java
similarity index 72%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/Config.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/Config.java
index 0dbc2068f6c266d2447a75759f34d3b6ae2474c3..a5dc538fdb3793dbd92d564c08ad6d1139866306 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/Config.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/Config.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.api.configuration;
+package ch.ethz.sis.microservices.api.configuration;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/ServiceConfig.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/ServiceConfig.java
similarity index 79%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/ServiceConfig.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/ServiceConfig.java
index cf7545ef5b7d8c5695e759713540128a9594f8f0..bd173c2835c751dc172251c5cd53acf755fdcffa 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/ServiceConfig.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/ServiceConfig.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.api.configuration;
+package ch.ethz.sis.microservices.api.configuration;
import java.util.HashMap;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/server/.DS_Store b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
Binary files /dev/null and b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/.DS_Store differ
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/JSONObjectMapper.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/JSONObjectMapper.java
similarity index 78%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/JSONObjectMapper.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/JSONObjectMapper.java
index 20682273fb35b6c20af158709af45e33a26c2fa3..83eaf3e9cfc209bc08441425b413f1c12bc06bcb 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/JSONObjectMapper.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/JSONObjectMapper.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.json;
+package ch.ethz.sis.microservices.server.json;
import java.io.FileInputStream;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/jackson/JacksonObjectMapper.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/jackson/JacksonObjectMapper.java
similarity index 89%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/jackson/JacksonObjectMapper.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/jackson/JacksonObjectMapper.java
index 8821bac0747eb6906efc3d293bdc00f34ea9188b..3b94a6fbf26f6b7bafdfe06e1e77c77bd1790ffb 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/jackson/JacksonObjectMapper.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/jackson/JacksonObjectMapper.java
@@ -1,11 +1,11 @@
-package ch.ethz.sis.microservices.download.server.json.jackson;
+package ch.ethz.sis.microservices.server.json.jackson;
import java.io.FileInputStream;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import ch.ethz.sis.microservices.download.server.json.JSONObjectMapper;
+import ch.ethz.sis.microservices.server.json.JSONObjectMapper;
public class JacksonObjectMapper implements JSONObjectMapper
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactory.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactory.java
similarity index 55%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactory.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactory.java
index c2ae5ee24a75a41c271589318f9241da7226c09f..b0695fc665686a64a43ba125408d60c4cc2f3d4b 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactory.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactory.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.logging;
+package ch.ethz.sis.microservices.server.logging;
public interface LogFactory {
<T> Logger getLogger(Class<T> clazz);
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactoryFactory.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactoryFactory.java
similarity index 76%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactoryFactory.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactoryFactory.java
index 23d94da82515f78529f6afe33eac5b91c8a601d9..43eae4473b942ed66dbe2c884d250e3edc74b9e3 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactoryFactory.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactoryFactory.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.logging;
+package ch.ethz.sis.microservices.server.logging;
public class LogFactoryFactory {
public LogFactory create(String logFactoryClass) throws Exception {
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogManager.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogManager.java
similarity index 89%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogManager.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogManager.java
index c1ef440056774de5e635f925496a3a289c8256c2..1f96db4a711e0450512bbbe76b98bb2a9cdade6f 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogManager.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogManager.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.logging;
+package ch.ethz.sis.microservices.server.logging;
public class LogManager {
private static LogFactory factory;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/Logger.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/Logger.java
similarity index 82%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/Logger.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/Logger.java
index 3e9c2742a4181728b33893860ac1a663d906baca..93c296a11e88a6e4e7d37997dea222be5d7e3497 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/Logger.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/Logger.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.logging;
+package ch.ethz.sis.microservices.server.logging;
public interface Logger {
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4J2LogFactory.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4J2LogFactory.java
similarity index 54%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4J2LogFactory.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4J2LogFactory.java
index 27cd6b6881f8f8127156313ca79664531a6f9054..5d43e3a32a26a0b509485254e442419f18e905dd 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4J2LogFactory.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4J2LogFactory.java
@@ -1,9 +1,9 @@
-package ch.ethz.sis.microservices.download.server.logging.log4j;
+package ch.ethz.sis.microservices.server.logging.log4j;
import org.apache.logging.log4j.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.LogFactory;
-import ch.ethz.sis.microservices.download.server.logging.Logger;
+import ch.ethz.sis.microservices.server.logging.LogFactory;
+import ch.ethz.sis.microservices.server.logging.Logger;
public class Log4J2LogFactory implements LogFactory
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4JLogger.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4JLogger.java
similarity index 92%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4JLogger.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4JLogger.java
index a605ec7a512362de61bf63422d483003001049a7..39a9eace264006cbd8af6203879baf3b578d1422 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4JLogger.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4JLogger.java
@@ -1,11 +1,11 @@
-package ch.ethz.sis.microservices.download.server.logging.log4j;
+package ch.ethz.sis.microservices.server.logging.log4j;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.spi.AbstractLogger;
import org.apache.logging.log4j.spi.ExtendedLoggerWrapper;
-class Log4JLogger extends ExtendedLoggerWrapper implements ch.ethz.sis.microservices.download.server.logging.Logger
+class Log4JLogger extends ExtendedLoggerWrapper implements ch.ethz.sis.microservices.server.logging.Logger
{
private final String FQCN;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/Service.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/Service.java
similarity index 71%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/Service.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/Service.java
index 0e9f65b8ab904497953450e778fd6f8961302684..c38c32983ef25ec8eb04e017d72548724fe02605 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/Service.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/Service.java
@@ -1,8 +1,8 @@
-package ch.ethz.sis.microservices.download.server.services;
+package ch.ethz.sis.microservices.server.services;
import javax.servlet.http.HttpServlet;
-import ch.ethz.sis.microservices.download.api.configuration.ServiceConfig;
+import ch.ethz.sis.microservices.api.configuration.ServiceConfig;
public abstract class Service extends HttpServlet
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/AbstractFileServiceHandler.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceHandler.java
similarity index 96%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/AbstractFileServiceHandler.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceHandler.java
index 3d86baae82a7b0946474da247c9095285e82eec9..6a7ade53e68a0dcd7282ce93eadf1aa8c0ed72af 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/AbstractFileServiceHandler.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceHandler.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.services.store;
+package ch.ethz.sis.microservices.server.services.store;
import java.io.IOException;
import java.nio.file.Files;
@@ -11,9 +11,9 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import ch.ethz.sis.microservices.download.server.logging.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.Logger;
-import ch.ethz.sis.microservices.download.server.services.Service;
+import ch.ethz.sis.microservices.server.logging.LogManager;
+import ch.ethz.sis.microservices.server.logging.Logger;
+import ch.ethz.sis.microservices.server.services.Service;
import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchResult;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.ContentCopy;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/DownloadHandler.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/DownloadHandler.java
similarity index 83%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/DownloadHandler.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/DownloadHandler.java
index 375970a2b1c90dfe2b6f22f8d888c9c37990324e..3395c0d1e8398ef7b990f2bc9c8816e3833cbc29 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/DownloadHandler.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/DownloadHandler.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.services.store;
+package ch.ethz.sis.microservices.server.services.store;
import java.io.IOException;
import java.nio.file.Files;
@@ -7,8 +7,8 @@ import java.nio.file.Path;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
-import ch.ethz.sis.microservices.download.server.logging.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.Logger;
+import ch.ethz.sis.microservices.server.logging.LogManager;
+import ch.ethz.sis.microservices.server.logging.Logger;
public class DownloadHandler extends AbstractFileServiceHandler
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/FileInfoHandler.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/FileInfoHandler.java
similarity index 83%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/FileInfoHandler.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/FileInfoHandler.java
index e7f267f5ba330b2853798bb47f8d955e3a4066c6..016494ca535ea065e5d3ea3b4c9f74a3844ba927 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/FileInfoHandler.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/FileInfoHandler.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.services.store;
+package ch.ethz.sis.microservices.server.services.store;
import java.io.IOException;
import java.nio.file.Path;
@@ -8,9 +8,9 @@ import java.util.Map;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
-import ch.ethz.sis.microservices.download.server.json.jackson.JacksonObjectMapper;
-import ch.ethz.sis.microservices.download.server.logging.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.Logger;
+import ch.ethz.sis.microservices.server.json.jackson.JacksonObjectMapper;
+import ch.ethz.sis.microservices.server.logging.LogManager;
+import ch.ethz.sis.microservices.server.logging.Logger;
public class FileInfoHandler extends AbstractFileServiceHandler
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/HttpClient.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/HttpClient.java
similarity index 97%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/HttpClient.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/HttpClient.java
index f4a35f881bfa766deb036c80d6c268cd3598d63b..ce95d4f4bb9c07c45eb346bea3d5e58ec7a9b7a1 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/HttpClient.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/HttpClient.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.startup;
+package ch.ethz.sis.microservices.server.startup;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/Main.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/Main.java
similarity index 65%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/Main.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/Main.java
index 544ba43ad40ca287ae4d3d38e42ea3c7358937c7..2fc922e26a4da911279c6a874b0f6093226d8eb7 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/Main.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/Main.java
@@ -1,13 +1,13 @@
-package ch.ethz.sis.microservices.download.server.startup;
+package ch.ethz.sis.microservices.server.startup;
import java.io.File;
import java.io.FileInputStream;
-import ch.ethz.sis.microservices.download.api.configuration.Config;
-import ch.ethz.sis.microservices.download.server.json.jackson.JacksonObjectMapper;
-import ch.ethz.sis.microservices.download.server.logging.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.Logger;
-import ch.ethz.sis.microservices.download.server.logging.log4j.Log4J2LogFactory;
+import ch.ethz.sis.microservices.api.configuration.Config;
+import ch.ethz.sis.microservices.server.json.jackson.JacksonObjectMapper;
+import ch.ethz.sis.microservices.server.logging.LogManager;
+import ch.ethz.sis.microservices.server.logging.Logger;
+import ch.ethz.sis.microservices.server.logging.log4j.Log4J2LogFactory;
public class Main
{
@@ -26,7 +26,7 @@ public class Main
File configFile;
if (args.length < 1)
{
- configFile = new File("config.json");
+ configFile = new File("./conf/config.json");
logger.info("No arguments given, starting with default config file: " + (configFile.getAbsolutePath()));
} else
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/ServerLauncher.java b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/ServerLauncher.java
similarity index 75%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/ServerLauncher.java
rename to microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/ServerLauncher.java
index 6f44aa5a3303cda90b082ed5f33ace45698b065f..e1196a9e23a6b2d6d4bf9034a6e8b47c532dc81e 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/ServerLauncher.java
+++ b/microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/ServerLauncher.java
@@ -1,14 +1,14 @@
-package ch.ethz.sis.microservices.download.server.startup;
+package ch.ethz.sis.microservices.server.startup;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-import ch.ethz.sis.microservices.download.api.configuration.Config;
-import ch.ethz.sis.microservices.download.api.configuration.ServiceConfig;
-import ch.ethz.sis.microservices.download.server.logging.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.Logger;
-import ch.ethz.sis.microservices.download.server.services.Service;
+import ch.ethz.sis.microservices.api.configuration.Config;
+import ch.ethz.sis.microservices.api.configuration.ServiceConfig;
+import ch.ethz.sis.microservices.server.logging.LogManager;
+import ch.ethz.sis.microservices.server.logging.Logger;
+import ch.ethz.sis.microservices.server.services.Service;
public class ServerLauncher
{
diff --git a/microservice-server/src/test/java/ch/ethz/sis/microservices/server/.DS_Store b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
Binary files /dev/null and b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/.DS_Store differ
diff --git a/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/.DS_Store b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
Binary files /dev/null and b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/.DS_Store differ
diff --git a/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/.DS_Store b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ead2009953af184cbc64f6aa27ab9ecfdc3e0470
Binary files /dev/null and b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/.DS_Store differ
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/AbstractFileServiceTest.java b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceTest.java
similarity index 84%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/AbstractFileServiceTest.java
rename to microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceTest.java
index 5f730802d5a35c87c5a3a70b84d7a890dea41777..3652c69da6155d89d700484e7e8451d1cff45832 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/AbstractFileServiceTest.java
+++ b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceTest.java
@@ -1,11 +1,11 @@
-package ch.ethz.sis.microservices.download.server.services.store;
+package ch.ethz.sis.microservices.server.services.store;
import java.util.HashMap;
import java.util.Map;
-import ch.ethz.sis.microservices.download.server.logging.LogManager;
-import ch.ethz.sis.microservices.download.server.logging.log4j.Log4J2LogFactory;
-import ch.ethz.sis.microservices.download.server.startup.HttpClient;
+import ch.ethz.sis.microservices.server.logging.LogManager;
+import ch.ethz.sis.microservices.server.logging.log4j.Log4J2LogFactory;
+import ch.ethz.sis.microservices.server.startup.HttpClient;
import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
import ch.systemsx.cisd.common.spring.HttpInvokerUtils;
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/DownloadHandlerTest.java b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/DownloadHandlerTest.java
similarity index 83%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/DownloadHandlerTest.java
rename to microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/DownloadHandlerTest.java
index 3bdcb393c322751435812b539d3e9529f82ab323..0fd062dafd96a73b6f9a09ceb28a8c4f79892d0b 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/DownloadHandlerTest.java
+++ b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/DownloadHandlerTest.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.services.store;
+package ch.ethz.sis.microservices.server.services.store;
public class DownloadHandlerTest
{
diff --git a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/FileInfoHandlerTest.java b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/FileInfoHandlerTest.java
similarity index 83%
rename from microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/FileInfoHandlerTest.java
rename to microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/FileInfoHandlerTest.java
index 87043e1b7935465dce813379ca0e3a8bbdeffa3b..0c74198e2930172936b659c7449889469a84d40e 100644
--- a/microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/FileInfoHandlerTest.java
+++ b/microservice-server/src/test/java/ch/ethz/sis/microservices/server/services/store/FileInfoHandlerTest.java
@@ -1,4 +1,4 @@
-package ch.ethz.sis.microservices.download.server.services.store;
+package ch.ethz.sis.microservices.server.services.store;
public class FileInfoHandlerTest
{