Merge branch 'master' of sissource.ethz.ch:sis/openbis

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",

microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/Config.java → microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/Config.java

-package ch.ethz.sis.microservices.download.api.configuration;
+package ch.ethz.sis.microservices.api.configuration;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

microservice-server/src/main/java/ch/ethz/sis/microservices/download/api/configuration/ServiceConfig.java → microservice-server/src/main/java/ch/ethz/sis/microservices/api/configuration/ServiceConfig.java

-package ch.ethz.sis.microservices.download.api.configuration;
+package ch.ethz.sis.microservices.api.configuration;
 
 import java.util.HashMap;
 

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/JSONObjectMapper.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/JSONObjectMapper.java

-package ch.ethz.sis.microservices.download.server.json;
+package ch.ethz.sis.microservices.server.json;
 
 import java.io.FileInputStream;
 

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/json/jackson/JacksonObjectMapper.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/json/jackson/JacksonObjectMapper.java

-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
 {

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactory.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactory.java

-package ch.ethz.sis.microservices.download.server.logging;
+package ch.ethz.sis.microservices.server.logging;
 
 public interface LogFactory {
     <T> Logger getLogger(Class<T> clazz);

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogFactoryFactory.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogFactoryFactory.java

-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 {

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/LogManager.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/LogManager.java

-package ch.ethz.sis.microservices.download.server.logging;
+package ch.ethz.sis.microservices.server.logging;
 
 public class LogManager {
     private static LogFactory factory;

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/Logger.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/Logger.java

-package ch.ethz.sis.microservices.download.server.logging;
+package ch.ethz.sis.microservices.server.logging;
 
 
 public interface Logger {

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4J2LogFactory.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4J2LogFactory.java

-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
 {

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/logging/log4j/Log4JLogger.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/logging/log4j/Log4JLogger.java

-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;

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/Service.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/Service.java

-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
 {

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/AbstractFileServiceHandler.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/AbstractFileServiceHandler.java

-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;

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/DownloadHandler.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/DownloadHandler.java

-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
 {

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/services/store/FileInfoHandler.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/services/store/FileInfoHandler.java

-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
 {

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/HttpClient.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/HttpClient.java

-package ch.ethz.sis.microservices.download.server.startup;
+package ch.ethz.sis.microservices.server.startup;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/Main.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/Main.java

-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
         {

microservice-server/src/main/java/ch/ethz/sis/microservices/download/server/startup/ServerLauncher.java → microservice-server/src/main/java/ch/ethz/sis/microservices/server/startup/ServerLauncher.java

-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
 {