diff --git a/docker-compose.yml b/docker-compose.yml
index 9ecf51f497fcce447b05ae021e1331413f3bb2ba..1246e91bd87aa161d1388b92081abc44dbf83e1b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,29 @@
version: "3.6"
+volumes:
+ fda-metadata-db-data:
+
services:
+ fda-metadata-db:
+ restart: always
+ container_name: fda-metadata-db
+ hostname: fda-metadata-db
+ image: postgres:13-alpine
+ volumes:
+ - fda-metadata-db-data:/var/lib/postgresql/data
+ network_mode: bridge
+ ports:
+ - 5432:5432
+ environment:
+ POSTGRES_USER: postgres
+ POSTGRES_PASSWORD: postgres
+ POSTGRES_DB: fda
+
+
+
fda-discovery-server:
+ restart: always
container_name: fda-discovery-server
hostname: fda-discovery-server
build: ./fda-discovery-server
@@ -14,6 +35,7 @@ services:
- 9090:9090
fda-gateway-service:
+ restart: always
container_name: fda-gateway-service
hostname: fda-gateway-service
build: ./fda-gateway-service
@@ -39,6 +61,7 @@ services:
driver: json-file
fda-database-managing-service:
+ restart: always
container_name: fda-database-managing-service
hostname: fda-database-managing-service
build:
@@ -59,6 +82,7 @@ services:
driver: json-file
fda-container-managing-service:
+ restart: always
container_name: fda-container-managing-service
hostname: fda-container-managing-service
build: ./fda-container-managing-service
@@ -78,6 +102,7 @@ services:
driver: json-file
fda-query-service:
+ restart: always
container_name: fda-query-service
hostname: fda-query-service
build: ./fda-query-service
@@ -99,6 +124,7 @@ services:
driver: json-file
fda-table-service:
+ restart: always
container_name: fda-table-service
hostname: fda-table-service
build: ./fda-table-service
@@ -119,6 +145,7 @@ services:
- fda-discovery-server
fda-analyse-service:
+ restart: always
container_name: fda-analyse-service
hostname: fda-analyse-service
build: ./fda-analyse-service
@@ -143,6 +170,7 @@ services:
driver: json-file
fda-ui:
+ restart: always
container_name: fda-ui
hostname: fda-ui
build: ./fda-ui
diff --git a/fda-container-managing-service/Dockerfile b/fda-container-managing-service/Dockerfile
index 5ae7a10b820e2e37ad853dd1981681c1a84a74e2..ce3b0295f3d7633c4dab9f4acb63cba67fb5e114 100644
--- a/fda-container-managing-service/Dockerfile
+++ b/fda-container-managing-service/Dockerfile
@@ -6,7 +6,7 @@ COPY ./pom.xml ./
RUN mvn -fn -B dependency:go-offline > /dev/null
-COPY src/main/java/api ./api
+COPY api/src/main/java/api ./api
COPY src/main/java/rest ./rest-service
COPY src/main/java/services ./services
diff --git a/fda-container-managing-service/api/pom.xml b/fda-container-managing-service/api/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2e4ef53ef0b53f89b727fa0e79b44379249694e1
--- /dev/null
+++ b/fda-container-managing-service/api/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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>
+ <parent>
+ <groupId>at.tuwien</groupId>
+ <artifactId>fda-container-managing-service</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>api</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <properties>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ </properties>
+
+</project>
\ No newline at end of file
diff --git a/fda-container-managing-service/src/main/java/api/dto/container/ContainerActionTypeDto.java b/fda-container-managing-service/api/src/main/java/api/dto/container/ContainerActionTypeDto.java
similarity index 100%
rename from fda-container-managing-service/src/main/java/api/dto/container/ContainerActionTypeDto.java
rename to fda-container-managing-service/api/src/main/java/api/dto/container/ContainerActionTypeDto.java
diff --git a/fda-container-managing-service/src/main/java/api/dto/container/ContainerChangeDto.java b/fda-container-managing-service/api/src/main/java/api/dto/container/ContainerChangeDto.java
similarity index 100%
rename from fda-container-managing-service/src/main/java/api/dto/container/ContainerChangeDto.java
rename to fda-container-managing-service/api/src/main/java/api/dto/container/ContainerChangeDto.java
diff --git a/fda-container-managing-service/src/main/java/api/dto/container/ContainerDto.java b/fda-container-managing-service/api/src/main/java/api/dto/container/ContainerDto.java
similarity index 100%
rename from fda-container-managing-service/src/main/java/api/dto/container/ContainerDto.java
rename to fda-container-managing-service/api/src/main/java/api/dto/container/ContainerDto.java
diff --git a/fda-container-managing-service/src/main/java/api/dto/container/DatabaseContainerBriefDto.java b/fda-container-managing-service/api/src/main/java/api/dto/container/DatabaseContainerBriefDto.java
similarity index 100%
rename from fda-container-managing-service/src/main/java/api/dto/container/DatabaseContainerBriefDto.java
rename to fda-container-managing-service/api/src/main/java/api/dto/container/DatabaseContainerBriefDto.java
diff --git a/fda-container-managing-service/src/main/java/api/dto/container/DatabaseContainerDto.java b/fda-container-managing-service/api/src/main/java/api/dto/container/DatabaseContainerDto.java
similarity index 100%
rename from fda-container-managing-service/src/main/java/api/dto/container/DatabaseContainerDto.java
rename to fda-container-managing-service/api/src/main/java/api/dto/container/DatabaseContainerDto.java
diff --git a/fda-container-managing-service/src/main/java/api/dto/database/CreateDatabaseConnectionDataDto.java b/fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseConnectionDataDto.java
similarity index 100%
rename from fda-container-managing-service/src/main/java/api/dto/database/CreateDatabaseConnectionDataDto.java
rename to fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseConnectionDataDto.java
diff --git a/fda-container-managing-service/src/main/java/api/dto/database/CreateDatabaseContainerDto.java b/fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseContainerDto.java
similarity index 100%
rename from fda-container-managing-service/src/main/java/api/dto/database/CreateDatabaseContainerDto.java
rename to fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseContainerDto.java
diff --git a/fda-container-managing-service/src/main/java/api/dto/database/CreateDatabaseResponseDto.java b/fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseResponseDto.java
similarity index 100%
rename from fda-container-managing-service/src/main/java/api/dto/database/CreateDatabaseResponseDto.java
rename to fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseResponseDto.java
diff --git a/fda-container-managing-service/src/main/java/api/pom.xml b/fda-container-managing-service/api/src/main/java/api/pom.xml
similarity index 100%
rename from fda-container-managing-service/src/main/java/api/pom.xml
rename to fda-container-managing-service/api/src/main/java/api/pom.xml
diff --git a/fda-container-managing-service/pom.xml b/fda-container-managing-service/pom.xml
index 275e193ba2e54683c42d2f87161ced366697f5b0..cf8696a72c81d3938d43caedcad8bb0b04d60b0b 100644
--- a/fda-container-managing-service/pom.xml
+++ b/fda-container-managing-service/pom.xml
@@ -38,6 +38,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
diff --git a/fda-container-managing-service/rest-service/pom.xml b/fda-container-managing-service/rest-service/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7445a95ba0b695c636e719c4bb6be12334661631
--- /dev/null
+++ b/fda-container-managing-service/rest-service/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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>
+ <parent>
+ <groupId>at.tuwien</groupId>
+ <artifactId>fda-container-managing-service</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>rest-service</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <properties>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ </properties>
+
+</project>
\ No newline at end of file
diff --git a/fda-container-managing-service/src/main/java/rest/FdaContainerManagingApplication.java b/fda-container-managing-service/rest-service/src/main/java/FdaContainerManagingApplication.java
similarity index 87%
rename from fda-container-managing-service/src/main/java/rest/FdaContainerManagingApplication.java
rename to fda-container-managing-service/rest-service/src/main/java/FdaContainerManagingApplication.java
index 6d82cb034e81d395ae732ad42d889de9b37af879..77eed7e691efd242268fa2b6528b9b8cd923fb29 100644
--- a/fda-container-managing-service/src/main/java/rest/FdaContainerManagingApplication.java
+++ b/fda-container-managing-service/rest-service/src/main/java/FdaContainerManagingApplication.java
@@ -1,12 +1,10 @@
-package rest;
-
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
@SpringBootApplication
-@ComponentScan(basePackages = "services.entities")
+@ComponentScan(basePackages = "entities")
@EnableSwagger2
public class FdaContainerManagingApplication {
diff --git a/fda-container-managing-service/src/main/java/rest/config/SwaggerConfig.java b/fda-container-managing-service/rest-service/src/main/java/config/SwaggerConfig.java
similarity index 98%
rename from fda-container-managing-service/src/main/java/rest/config/SwaggerConfig.java
rename to fda-container-managing-service/rest-service/src/main/java/config/SwaggerConfig.java
index 97d74e81e41144f00defb6307d37932fa9f519bf..d39a7add5c72cd5dd02da9d71d96042e0404b70b 100644
--- a/fda-container-managing-service/src/main/java/rest/config/SwaggerConfig.java
+++ b/fda-container-managing-service/rest-service/src/main/java/config/SwaggerConfig.java
@@ -1,4 +1,4 @@
-package rest.config;
+package config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/fda-container-managing-service/src/main/java/rest/endpoints/DatabaseContainerController.java b/fda-container-managing-service/rest-service/src/main/java/endpoints/DatabaseContainerController.java
similarity index 99%
rename from fda-container-managing-service/src/main/java/rest/endpoints/DatabaseContainerController.java
rename to fda-container-managing-service/rest-service/src/main/java/endpoints/DatabaseContainerController.java
index bcc81395296a39bf76642951a106a9ff8329717f..a4015dc1a511168bbfad87f8b649fe7b2a3b04d5 100644
--- a/fda-container-managing-service/src/main/java/rest/endpoints/DatabaseContainerController.java
+++ b/fda-container-managing-service/rest-service/src/main/java/endpoints/DatabaseContainerController.java
@@ -1,4 +1,4 @@
-package rest.endpoints;
+package endpoints;
import api.dto.container.ContainerActionTypeDto;
import api.dto.container.DatabaseContainerBriefDto;
diff --git a/fda-container-managing-service/src/main/resources/CreateDB.sql b/fda-container-managing-service/rest-service/src/main/resources/CreateDB.sql
similarity index 100%
rename from fda-container-managing-service/src/main/resources/CreateDB.sql
rename to fda-container-managing-service/rest-service/src/main/resources/CreateDB.sql
diff --git a/fda-container-managing-service/src/main/resources/Dockerfile b/fda-container-managing-service/rest-service/src/main/resources/Dockerfile
similarity index 100%
rename from fda-container-managing-service/src/main/resources/Dockerfile
rename to fda-container-managing-service/rest-service/src/main/resources/Dockerfile
diff --git a/fda-container-managing-service/src/main/resources/MDB/Dockerfile b/fda-container-managing-service/rest-service/src/main/resources/MDB/Dockerfile
similarity index 100%
rename from fda-container-managing-service/src/main/resources/MDB/Dockerfile
rename to fda-container-managing-service/rest-service/src/main/resources/MDB/Dockerfile
diff --git a/fda-container-managing-service/src/main/resources/MDB/createMDB.sql b/fda-container-managing-service/rest-service/src/main/resources/MDB/createMDB.sql
similarity index 100%
rename from fda-container-managing-service/src/main/resources/MDB/createMDB.sql
rename to fda-container-managing-service/rest-service/src/main/resources/MDB/createMDB.sql
diff --git a/fda-container-managing-service/rest-service/src/main/resources/application-dev.yml b/fda-container-managing-service/rest-service/src/main/resources/application-dev.yml
new file mode 100644
index 0000000000000000000000000000000000000000..569c76fd01d10493b92bff2a7bbe8b84c93fb6ad
--- /dev/null
+++ b/fda-container-managing-service/rest-service/src/main/resources/application-dev.yml
@@ -0,0 +1,19 @@
+spring:
+ datasource:
+ url: jdbc:postgresql://localhost:5432/fda
+ driver-class-name: org.postgresql.Driver
+ username: postgres
+ password: postgres
+ jpa:
+ show-sql: true
+ properties:
+ hibernate:
+ ddl-auto: update
+ dialect: org.hibernate.dialect.PostgreSQLDialect
+ hibernate.ddl-auto: none
+ hibernate.show-sql: true
+ application:
+ name: fda-container-managing
+server.port: 9091
+eureka:
+ client.serviceUrl.defaultZone: http://localhost:9090/eureka/
\ No newline at end of file
diff --git a/fda-container-managing-service/rest-service/src/main/resources/application-docker.yml b/fda-container-managing-service/rest-service/src/main/resources/application-docker.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8e0e48bc580e75b97a6323bf2b1cc1aea0261a1f
--- /dev/null
+++ b/fda-container-managing-service/rest-service/src/main/resources/application-docker.yml
@@ -0,0 +1,28 @@
+spring:
+ main.banner-mode: off
+ datasource:
+ url: jdbc:postgresql://fda-metadata-db:5432/fda
+ driver-class-name: org.postgresql.Driver
+ username: postgres
+ password: postgres
+ jpa:
+ show-sql: true
+ properties:
+ hibernate:
+ ddl-auto: update
+ dialect: org.hibernate.dialect.PostgreSQLDialect
+ hibernate.ddl-auto: none
+ hibernate.show-sql: true
+ application:
+ name: fda-container-managing
+ cloud:
+ loadbalancer.ribbon.enabled: false
+server.port: 9091
+logging:
+ pattern.console: %d %highlight(%-5level) %msg%n
+ level:
+ root: warn
+ at.: info
+eureka:
+ instance.hostname: fda-discovery-server
+ client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:9090/eureka/
\ No newline at end of file
diff --git a/fda-container-managing-service/src/main/resources/config.properties b/fda-container-managing-service/rest-service/src/main/resources/config.properties
similarity index 100%
rename from fda-container-managing-service/src/main/resources/config.properties
rename to fda-container-managing-service/rest-service/src/main/resources/config.properties
diff --git a/fda-container-managing-service/src/main/java/services/pom.xml b/fda-container-managing-service/services/pom.xml
similarity index 59%
rename from fda-container-managing-service/src/main/java/services/pom.xml
rename to fda-container-managing-service/services/pom.xml
index 52461b84a5cbc51f7d0e8850b98ba571c5d8d336..1f85e383c462bcdeb38e87948891c4a6dc89819b 100644
--- a/fda-container-managing-service/src/main/java/services/pom.xml
+++ b/fda-container-managing-service/services/pom.xml
@@ -2,36 +2,27 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
+ <dependencies>
+ <dependency>
+ <groupId>at.tuwien</groupId>
+ <artifactId>api</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
<parent>
- <artifactId>fda-container-managing-service</artifactId>
<groupId>at.tuwien</groupId>
+ <artifactId>fda-container-managing-service</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>services</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
<properties>
- <mapstruct.version>1.4.2.Final</mapstruct.version>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
</properties>
- <dependencies>
- <dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.github.docker-java</groupId>
- <artifactId>docker-java</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.mapstruct</groupId>
- <artifactId>mapstruct</artifactId>
- <version>${mapstruct.version}</version>
- </dependency>
- </dependencies>
-
</project>
\ No newline at end of file
diff --git a/fda-container-managing-service/src/main/java/services/config/ContainerSpringConfig.java b/fda-container-managing-service/services/src/main/java/config/ContainerSpringConfig.java
similarity index 96%
rename from fda-container-managing-service/src/main/java/services/config/ContainerSpringConfig.java
rename to fda-container-managing-service/services/src/main/java/config/ContainerSpringConfig.java
index eb43d9e58d806ccb97ead55c1816f27b07538c31..1cf6d327be7ef368abda988fbac18c13d0bae522 100644
--- a/fda-container-managing-service/src/main/java/services/config/ContainerSpringConfig.java
+++ b/fda-container-managing-service/services/src/main/java/config/ContainerSpringConfig.java
@@ -1,4 +1,4 @@
-package services.config;
+package config;
import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.core.DefaultDockerClientConfig;
diff --git a/fda-container-managing-service/src/main/java/services/entities/DatabaseContainer.java b/fda-container-managing-service/services/src/main/java/entities/DatabaseContainer.java
similarity index 78%
rename from fda-container-managing-service/src/main/java/services/entities/DatabaseContainer.java
rename to fda-container-managing-service/services/src/main/java/entities/DatabaseContainer.java
index ad7976464a4043b8270680847f6fff4186b0722c..6ff76e5aa988c04f937e1fdf1a03912816782ffb 100644
--- a/fda-container-managing-service/src/main/java/services/entities/DatabaseContainer.java
+++ b/fda-container-managing-service/services/src/main/java/entities/DatabaseContainer.java
@@ -1,11 +1,9 @@
-package services.entities;
+package entities;
import lombok.Getter;
-import lombok.NoArgsConstructor;
import lombok.Setter;
-@NoArgsConstructor
@Getter
@Setter
public class DatabaseContainer {
diff --git a/fda-container-managing-service/src/main/java/services/mapper/DatabaseContainerMapper.java b/fda-container-managing-service/services/src/main/java/mapper/DatabaseContainerMapper.java
similarity index 95%
rename from fda-container-managing-service/src/main/java/services/mapper/DatabaseContainerMapper.java
rename to fda-container-managing-service/services/src/main/java/mapper/DatabaseContainerMapper.java
index 789ba46087da475d6cbcbdbc70484abd32f6994e..ed4e1427ef55cbd2d5abc48e69853e60ee7bf1e4 100644
--- a/fda-container-managing-service/src/main/java/services/mapper/DatabaseContainerMapper.java
+++ b/fda-container-managing-service/services/src/main/java/mapper/DatabaseContainerMapper.java
@@ -1,13 +1,13 @@
-package services.mapper;
+package mapper;
import api.dto.container.DatabaseContainerBriefDto;
import api.dto.container.DatabaseContainerDto;
import com.github.dockerjava.api.command.InspectContainerResponse;
import com.github.dockerjava.api.model.Container;
+import entities.DatabaseContainer;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
-import services.entities.DatabaseContainer;
@Mapper(componentModel = "spring")
public interface DatabaseContainerMapper {
diff --git a/fda-container-managing-service/src/main/java/services/repositories/MetadataRepository.java b/fda-container-managing-service/services/src/main/java/repositories/MetadataRepository.java
similarity index 89%
rename from fda-container-managing-service/src/main/java/services/repositories/MetadataRepository.java
rename to fda-container-managing-service/services/src/main/java/repositories/MetadataRepository.java
index ef1e4f4a5a65dec8affd75e60d87dc8983cde255..888e9bef681232278953a0483b0b6de3f48e07d7 100644
--- a/fda-container-managing-service/src/main/java/services/repositories/MetadataRepository.java
+++ b/fda-container-managing-service/services/src/main/java/repositories/MetadataRepository.java
@@ -1,4 +1,4 @@
-package services.repositories;
+package repositories;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/fda-container-managing-service/src/main/java/services/service/ContainerService.java b/fda-container-managing-service/services/src/main/java/service/ContainerService.java
similarity index 93%
rename from fda-container-managing-service/src/main/java/services/service/ContainerService.java
rename to fda-container-managing-service/services/src/main/java/service/ContainerService.java
index eecd43150eb9ecad1be73f16c7463da29b7a0e6e..1fb0087dda1ba3c3f16e71f52e6e36cbd080712f 100644
--- a/fda-container-managing-service/src/main/java/services/service/ContainerService.java
+++ b/fda-container-managing-service/services/src/main/java/service/ContainerService.java
@@ -1,15 +1,14 @@
-package services.service;
+package service;
import api.dto.database.CreateDatabaseContainerDto;
-import services.entities.DatabaseContainer;
-import services.mapper.DatabaseContainerMapper;
import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.CreateContainerResponse;
import com.github.dockerjava.api.command.InspectContainerResponse;
import com.github.dockerjava.api.model.Container;
import com.github.dockerjava.api.model.HostConfig;
import com.github.dockerjava.api.model.PortBinding;
import com.github.dockerjava.api.model.RestartPolicy;
+import entities.DatabaseContainer;
+import mapper.DatabaseContainerMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.SocketUtils;
diff --git a/fda-container-managing-service/src/main/java/rest/pom.xml b/fda-container-managing-service/src/main/java/rest/pom.xml
deleted file mode 100644
index bed68cf8cc38a7692f17986431d916b1e692b5e4..0000000000000000000000000000000000000000
--- a/fda-container-managing-service/src/main/java/rest/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>fda-container-managing-service</artifactId>
- <groupId>at.tuwien</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>rest-service</artifactId>
- <dependencies>
- <dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>services</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>2.9.2</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>2.9.2</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <finalName>${project.parent.artifactId}-${project.version}</finalName>
- <mainClass>at.tuwien.FdaContainerManagingApplication</mainClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/fda-container-managing-service/src/main/resources/application-docker.properties b/fda-container-managing-service/src/main/resources/application-docker.properties
deleted file mode 100644
index ec0eae45fcf3b67e3a32a508bf5d244f35d7f86e..0000000000000000000000000000000000000000
--- a/fda-container-managing-service/src/main/resources/application-docker.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-server.port=9091
-spring.application.name=fda-container-managing
-spring.main.banner-mode=off
-spring.cloud.loadbalancer.ribbon.enabled=false
-logging.level.root=warn
-logging.level.at.=info
-logging.pattern.console=%d %highlight(%-5level): %msg%n
-eureka.instance.hostname=fda-discovery-server
-eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:9090/eureka/
-fda.db.images=postgres,redis
\ No newline at end of file
diff --git a/fda-container-managing-service/src/main/resources/application.properties b/fda-container-managing-service/src/main/resources/application.properties
deleted file mode 100644
index 86ed6a608af7368a188f22bc0d23edf2a8faed95..0000000000000000000000000000000000000000
--- a/fda-container-managing-service/src/main/resources/application.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-spring.application.name=fda-container-managing
-server.port=9091
-eureka.client.serviceUrl.defaultZone=http://localhost:9090/eureka/
-fda.db.images=postgres,redis
\ No newline at end of file