From 00dff4794b0197326618ca711b68b0a326c631ed Mon Sep 17 00:00:00 2001 From: Frederick Michielssen Date: Mon, 23 Jul 2018 09:25:23 +0200 Subject: [PATCH] Removed intermediate folder --- containerproxy/.classpath => .classpath | 0 .gitignore | 1 + containerproxy/.project => .project | 0 .../org.eclipse.core.resources.prefs | 0 .../org.eclipse.jdt.core.prefs | 0 .../org.eclipse.m2e.core.prefs | 0 containerproxy/LICENSE => LICENSE | 0 .../LICENSE_HEADER => LICENSE_HEADER | 0 application.yml | 37 +++++++++++++++++++ containerproxy/.gitignore | 2 - containerproxy/pom.xml => pom.xml | 0 .../ContainerProxyApplication.java | 0 .../ContainerProxyException.java | 0 .../containerproxy/api/BaseController.java | 0 .../containerproxy/api/ProxyController.java | 0 .../containerproxy/api/SwaggerConfig.java | 0 .../auth/AuthenticationBackendFactory.java | 0 .../auth/IAuthenticationBackend.java | 0 .../auth/UserLogoutHandler.java | 0 .../impl/KeycloakAuthenticationBackend.java | 0 .../auth/impl/LDAPAuthenticationBackend.java | 0 .../auth/impl/NoAuthenticationBackend.java | 0 .../impl/OpenIDAuthenticationBackend.java | 0 .../impl/SimpleAuthenticationBackend.java | 0 .../backend/AbstractContainerBackend.java | 0 .../backend/ContainerBackendFactory.java | 0 .../backend/IContainerBackend.java | 0 .../backend/docker/AbstractDockerBackend.java | 0 .../backend/docker/DockerEngineBackend.java | 0 .../backend/docker/DockerSwarmBackend.java | 0 .../backend/kubernetes/KubernetesBackend.java | 0 .../strategy/IProxyLogoutStrategy.java | 0 .../strategy/IProxyTargetMappingStrategy.java | 0 .../backend/strategy/IProxyTestStrategy.java | 0 .../impl/DefaultProxyLogoutStrategy.java | 0 .../impl/DefaultProxyTestStrategy.java | 0 .../impl/DefaultTargetMappingStrategy.java | 0 .../model/runtime/Container.java | 0 .../containerproxy/model/runtime/Proxy.java | 0 .../model/runtime/ProxyStatus.java | 0 .../model/runtime/RuntimeSetting.java | 0 .../model/spec/ContainerSpec.java | 0 .../model/spec/ProxyAccessControl.java | 0 .../containerproxy/model/spec/ProxySpec.java | 0 .../model/spec/RuntimeSettingSpec.java | 0 .../security/ICustomSecurityConfig.java | 0 .../security/WebSecurityConfig.java | 0 .../containerproxy/service/EventService.java | 0 .../service/HeartbeatService.java | 0 .../containerproxy/service/LogService.java | 0 .../containerproxy/service/ProxyService.java | 0 .../containerproxy/service/UserService.java | 0 .../spec/IProxySpecMergeStrategy.java | 0 .../spec/IProxySpecProvider.java | 0 .../spec/ProxySpecException.java | 0 .../spec/impl/DefaultSpecMergeStrategy.java | 0 .../spec/impl/DefaultSpecProvider.java | 0 .../spec/setting/IRuntimeSettingType.java | 0 .../spec/setting/SettingSpecMapper.java | 0 .../spec/setting/SettingTypeRegistry.java | 0 .../setting/type/AbstractSettingType.java | 0 .../spec/setting/type/IntSettingType.java | 0 .../spec/setting/type/StringSettingType.java | 0 .../containerproxy/stat/IStatCollector.java | 0 .../stat/StatCollectorRegistry.java | 0 .../stat/impl/InfluxDBCollector.java | 0 .../stat/impl/MonetDBCollector.java | 0 .../containerproxy/ui/ErrorController.java | 0 .../containerproxy/ui/LoginController.java | 0 .../ui/SwaggerUIController.java | 0 .../ui/TemplateResolverConfig.java | 0 .../util/DelegatingStreamSinkConduit.java | 0 .../util/DelegatingStreamSourceConduit.java | 0 .../containerproxy/util/PortAllocator.java | 0 .../util/ProxyMappingManager.java | 0 .../containerproxy/util/Retrying.java | 0 .../main/resources/static/css/error.css | 0 .../main/resources/static/css/login.css | 0 .../main/resources/templates/error.html | 0 .../main/resources/templates/login.html | 0 .../test/auth/LDAPAuthenticationTest.java | 0 .../test/auth/SimpleAuthenticationTest.java | 0 .../test/proxy/TestProxyService.java | 0 .../resources/application-test-ldap-auth.yml | 0 .../application-test-simple-auth.yml | 0 .../test/resources/application-test.yml | 0 86 files changed, 38 insertions(+), 2 deletions(-) rename containerproxy/.classpath => .classpath (100%) create mode 100644 .gitignore rename containerproxy/.project => .project (100%) rename {containerproxy/.settings => .settings}/org.eclipse.core.resources.prefs (100%) rename {containerproxy/.settings => .settings}/org.eclipse.jdt.core.prefs (100%) rename {containerproxy/.settings => .settings}/org.eclipse.m2e.core.prefs (100%) rename containerproxy/LICENSE => LICENSE (100%) rename containerproxy/LICENSE_HEADER => LICENSE_HEADER (100%) create mode 100644 application.yml delete mode 100644 containerproxy/.gitignore rename containerproxy/pom.xml => pom.xml (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/ContainerProxyApplication.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/ContainerProxyException.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/api/BaseController.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/api/ProxyController.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/api/SwaggerConfig.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/auth/AuthenticationBackendFactory.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/auth/IAuthenticationBackend.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/auth/UserLogoutHandler.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/auth/impl/KeycloakAuthenticationBackend.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/auth/impl/LDAPAuthenticationBackend.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/auth/impl/NoAuthenticationBackend.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/auth/impl/OpenIDAuthenticationBackend.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/auth/impl/SimpleAuthenticationBackend.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/backend/AbstractContainerBackend.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/backend/ContainerBackendFactory.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/backend/IContainerBackend.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/backend/docker/AbstractDockerBackend.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/backend/docker/DockerSwarmBackend.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyLogoutStrategy.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyTargetMappingStrategy.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyTestStrategy.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultProxyLogoutStrategy.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultProxyTestStrategy.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultTargetMappingStrategy.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/model/runtime/Container.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/model/runtime/Proxy.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/model/runtime/ProxyStatus.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/model/runtime/RuntimeSetting.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/model/spec/ContainerSpec.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/model/spec/ProxyAccessControl.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/model/spec/ProxySpec.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/model/spec/RuntimeSettingSpec.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/security/ICustomSecurityConfig.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/security/WebSecurityConfig.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/service/EventService.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/service/HeartbeatService.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/service/LogService.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/service/ProxyService.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/service/UserService.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/spec/IProxySpecMergeStrategy.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/spec/IProxySpecProvider.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/spec/ProxySpecException.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/spec/impl/DefaultSpecMergeStrategy.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/spec/impl/DefaultSpecProvider.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/spec/setting/IRuntimeSettingType.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/spec/setting/SettingSpecMapper.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/spec/setting/SettingTypeRegistry.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/spec/setting/type/AbstractSettingType.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/spec/setting/type/IntSettingType.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/spec/setting/type/StringSettingType.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/stat/IStatCollector.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/stat/StatCollectorRegistry.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/stat/impl/InfluxDBCollector.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/stat/impl/MonetDBCollector.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/ui/ErrorController.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/ui/LoginController.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/ui/SwaggerUIController.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/ui/TemplateResolverConfig.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/util/DelegatingStreamSinkConduit.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/util/DelegatingStreamSourceConduit.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/util/PortAllocator.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/util/ProxyMappingManager.java (100%) rename {containerproxy/src => src}/main/java/eu/openanalytics/containerproxy/util/Retrying.java (100%) rename {containerproxy/src => src}/main/resources/static/css/error.css (100%) rename {containerproxy/src => src}/main/resources/static/css/login.css (100%) rename {containerproxy/src => src}/main/resources/templates/error.html (100%) rename {containerproxy/src => src}/main/resources/templates/login.html (100%) rename {containerproxy/src => src}/test/java/eu/openanalytics/containerproxy/test/auth/LDAPAuthenticationTest.java (100%) rename {containerproxy/src => src}/test/java/eu/openanalytics/containerproxy/test/auth/SimpleAuthenticationTest.java (100%) rename {containerproxy/src => src}/test/java/eu/openanalytics/containerproxy/test/proxy/TestProxyService.java (100%) rename {containerproxy/src => src}/test/resources/application-test-ldap-auth.yml (100%) rename {containerproxy/src => src}/test/resources/application-test-simple-auth.yml (100%) rename {containerproxy/src => src}/test/resources/application-test.yml (100%) diff --git a/containerproxy/.classpath b/.classpath similarity index 100% rename from containerproxy/.classpath rename to .classpath diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/containerproxy/.project b/.project similarity index 100% rename from containerproxy/.project rename to .project diff --git a/containerproxy/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from containerproxy/.settings/org.eclipse.core.resources.prefs rename to .settings/org.eclipse.core.resources.prefs diff --git a/containerproxy/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from containerproxy/.settings/org.eclipse.jdt.core.prefs rename to .settings/org.eclipse.jdt.core.prefs diff --git a/containerproxy/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs similarity index 100% rename from containerproxy/.settings/org.eclipse.m2e.core.prefs rename to .settings/org.eclipse.m2e.core.prefs diff --git a/containerproxy/LICENSE b/LICENSE similarity index 100% rename from containerproxy/LICENSE rename to LICENSE diff --git a/containerproxy/LICENSE_HEADER b/LICENSE_HEADER similarity index 100% rename from containerproxy/LICENSE_HEADER rename to LICENSE_HEADER diff --git a/application.yml b/application.yml new file mode 100644 index 00000000..a6383180 --- /dev/null +++ b/application.yml @@ -0,0 +1,37 @@ +proxy: + + authentication: simple + users: + - name: demo + password: demo + ldap: + url: ldap://ldap.forumsys.com:389/dc=example,dc=com + user-dn-pattern: uid={0} + group-search-filter: (uniqueMember={0}) + manager-dn: cn=read-only-admin,dc=example,dc=com + manager-password: password + keycloak: + realm: demo + auth-server-url: http://localhost:8081/auth + resource: shinyproxy + credentials-secret: 38328702-062c-4e7d-86bf-50f184dad34c + + docker: + url: http://localhost:2375 + + #usage-stats-url: http://localhost:8086/write?db=shinyproxy_usagestats + + specs: + - id: r-3.4.4 + container-specs: + - image: "registry.openanalytics.eu/private/rconsoleproxy" + port-mapping: + default: 8080 + - id: 01_hello + container-specs: + - image: "openanalytics/shinyproxy-demo" + cmd: ["R", "-e", "shinyproxy::run_01_hello()"] + port-mapping: + default: 3838 + runtime-setting-specs: + - name: container.memory diff --git a/containerproxy/.gitignore b/containerproxy/.gitignore deleted file mode 100644 index fd14332e..00000000 --- a/containerproxy/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target/ -/application.yml diff --git a/containerproxy/pom.xml b/pom.xml similarity index 100% rename from containerproxy/pom.xml rename to pom.xml diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/ContainerProxyApplication.java b/src/main/java/eu/openanalytics/containerproxy/ContainerProxyApplication.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/ContainerProxyApplication.java rename to src/main/java/eu/openanalytics/containerproxy/ContainerProxyApplication.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/ContainerProxyException.java b/src/main/java/eu/openanalytics/containerproxy/ContainerProxyException.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/ContainerProxyException.java rename to src/main/java/eu/openanalytics/containerproxy/ContainerProxyException.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/api/BaseController.java b/src/main/java/eu/openanalytics/containerproxy/api/BaseController.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/api/BaseController.java rename to src/main/java/eu/openanalytics/containerproxy/api/BaseController.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/api/ProxyController.java b/src/main/java/eu/openanalytics/containerproxy/api/ProxyController.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/api/ProxyController.java rename to src/main/java/eu/openanalytics/containerproxy/api/ProxyController.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/api/SwaggerConfig.java b/src/main/java/eu/openanalytics/containerproxy/api/SwaggerConfig.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/api/SwaggerConfig.java rename to src/main/java/eu/openanalytics/containerproxy/api/SwaggerConfig.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/AuthenticationBackendFactory.java b/src/main/java/eu/openanalytics/containerproxy/auth/AuthenticationBackendFactory.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/AuthenticationBackendFactory.java rename to src/main/java/eu/openanalytics/containerproxy/auth/AuthenticationBackendFactory.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/IAuthenticationBackend.java b/src/main/java/eu/openanalytics/containerproxy/auth/IAuthenticationBackend.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/IAuthenticationBackend.java rename to src/main/java/eu/openanalytics/containerproxy/auth/IAuthenticationBackend.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/UserLogoutHandler.java b/src/main/java/eu/openanalytics/containerproxy/auth/UserLogoutHandler.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/UserLogoutHandler.java rename to src/main/java/eu/openanalytics/containerproxy/auth/UserLogoutHandler.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/impl/KeycloakAuthenticationBackend.java b/src/main/java/eu/openanalytics/containerproxy/auth/impl/KeycloakAuthenticationBackend.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/impl/KeycloakAuthenticationBackend.java rename to src/main/java/eu/openanalytics/containerproxy/auth/impl/KeycloakAuthenticationBackend.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/impl/LDAPAuthenticationBackend.java b/src/main/java/eu/openanalytics/containerproxy/auth/impl/LDAPAuthenticationBackend.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/impl/LDAPAuthenticationBackend.java rename to src/main/java/eu/openanalytics/containerproxy/auth/impl/LDAPAuthenticationBackend.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/impl/NoAuthenticationBackend.java b/src/main/java/eu/openanalytics/containerproxy/auth/impl/NoAuthenticationBackend.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/impl/NoAuthenticationBackend.java rename to src/main/java/eu/openanalytics/containerproxy/auth/impl/NoAuthenticationBackend.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/impl/OpenIDAuthenticationBackend.java b/src/main/java/eu/openanalytics/containerproxy/auth/impl/OpenIDAuthenticationBackend.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/impl/OpenIDAuthenticationBackend.java rename to src/main/java/eu/openanalytics/containerproxy/auth/impl/OpenIDAuthenticationBackend.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/impl/SimpleAuthenticationBackend.java b/src/main/java/eu/openanalytics/containerproxy/auth/impl/SimpleAuthenticationBackend.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/auth/impl/SimpleAuthenticationBackend.java rename to src/main/java/eu/openanalytics/containerproxy/auth/impl/SimpleAuthenticationBackend.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/AbstractContainerBackend.java b/src/main/java/eu/openanalytics/containerproxy/backend/AbstractContainerBackend.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/AbstractContainerBackend.java rename to src/main/java/eu/openanalytics/containerproxy/backend/AbstractContainerBackend.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/ContainerBackendFactory.java b/src/main/java/eu/openanalytics/containerproxy/backend/ContainerBackendFactory.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/ContainerBackendFactory.java rename to src/main/java/eu/openanalytics/containerproxy/backend/ContainerBackendFactory.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/IContainerBackend.java b/src/main/java/eu/openanalytics/containerproxy/backend/IContainerBackend.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/IContainerBackend.java rename to src/main/java/eu/openanalytics/containerproxy/backend/IContainerBackend.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/docker/AbstractDockerBackend.java b/src/main/java/eu/openanalytics/containerproxy/backend/docker/AbstractDockerBackend.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/docker/AbstractDockerBackend.java rename to src/main/java/eu/openanalytics/containerproxy/backend/docker/AbstractDockerBackend.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java b/src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java rename to src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerSwarmBackend.java b/src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerSwarmBackend.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerSwarmBackend.java rename to src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerSwarmBackend.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java b/src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java rename to src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyLogoutStrategy.java b/src/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyLogoutStrategy.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyLogoutStrategy.java rename to src/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyLogoutStrategy.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyTargetMappingStrategy.java b/src/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyTargetMappingStrategy.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyTargetMappingStrategy.java rename to src/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyTargetMappingStrategy.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyTestStrategy.java b/src/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyTestStrategy.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyTestStrategy.java rename to src/main/java/eu/openanalytics/containerproxy/backend/strategy/IProxyTestStrategy.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultProxyLogoutStrategy.java b/src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultProxyLogoutStrategy.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultProxyLogoutStrategy.java rename to src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultProxyLogoutStrategy.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultProxyTestStrategy.java b/src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultProxyTestStrategy.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultProxyTestStrategy.java rename to src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultProxyTestStrategy.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultTargetMappingStrategy.java b/src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultTargetMappingStrategy.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultTargetMappingStrategy.java rename to src/main/java/eu/openanalytics/containerproxy/backend/strategy/impl/DefaultTargetMappingStrategy.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/model/runtime/Container.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/Container.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/model/runtime/Container.java rename to src/main/java/eu/openanalytics/containerproxy/model/runtime/Container.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/model/runtime/Proxy.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/Proxy.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/model/runtime/Proxy.java rename to src/main/java/eu/openanalytics/containerproxy/model/runtime/Proxy.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/model/runtime/ProxyStatus.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/ProxyStatus.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/model/runtime/ProxyStatus.java rename to src/main/java/eu/openanalytics/containerproxy/model/runtime/ProxyStatus.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/model/runtime/RuntimeSetting.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/RuntimeSetting.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/model/runtime/RuntimeSetting.java rename to src/main/java/eu/openanalytics/containerproxy/model/runtime/RuntimeSetting.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/model/spec/ContainerSpec.java b/src/main/java/eu/openanalytics/containerproxy/model/spec/ContainerSpec.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/model/spec/ContainerSpec.java rename to src/main/java/eu/openanalytics/containerproxy/model/spec/ContainerSpec.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/model/spec/ProxyAccessControl.java b/src/main/java/eu/openanalytics/containerproxy/model/spec/ProxyAccessControl.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/model/spec/ProxyAccessControl.java rename to src/main/java/eu/openanalytics/containerproxy/model/spec/ProxyAccessControl.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/model/spec/ProxySpec.java b/src/main/java/eu/openanalytics/containerproxy/model/spec/ProxySpec.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/model/spec/ProxySpec.java rename to src/main/java/eu/openanalytics/containerproxy/model/spec/ProxySpec.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/model/spec/RuntimeSettingSpec.java b/src/main/java/eu/openanalytics/containerproxy/model/spec/RuntimeSettingSpec.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/model/spec/RuntimeSettingSpec.java rename to src/main/java/eu/openanalytics/containerproxy/model/spec/RuntimeSettingSpec.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/security/ICustomSecurityConfig.java b/src/main/java/eu/openanalytics/containerproxy/security/ICustomSecurityConfig.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/security/ICustomSecurityConfig.java rename to src/main/java/eu/openanalytics/containerproxy/security/ICustomSecurityConfig.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/security/WebSecurityConfig.java b/src/main/java/eu/openanalytics/containerproxy/security/WebSecurityConfig.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/security/WebSecurityConfig.java rename to src/main/java/eu/openanalytics/containerproxy/security/WebSecurityConfig.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/service/EventService.java b/src/main/java/eu/openanalytics/containerproxy/service/EventService.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/service/EventService.java rename to src/main/java/eu/openanalytics/containerproxy/service/EventService.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/service/HeartbeatService.java b/src/main/java/eu/openanalytics/containerproxy/service/HeartbeatService.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/service/HeartbeatService.java rename to src/main/java/eu/openanalytics/containerproxy/service/HeartbeatService.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/service/LogService.java b/src/main/java/eu/openanalytics/containerproxy/service/LogService.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/service/LogService.java rename to src/main/java/eu/openanalytics/containerproxy/service/LogService.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/service/ProxyService.java b/src/main/java/eu/openanalytics/containerproxy/service/ProxyService.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/service/ProxyService.java rename to src/main/java/eu/openanalytics/containerproxy/service/ProxyService.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/service/UserService.java b/src/main/java/eu/openanalytics/containerproxy/service/UserService.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/service/UserService.java rename to src/main/java/eu/openanalytics/containerproxy/service/UserService.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/IProxySpecMergeStrategy.java b/src/main/java/eu/openanalytics/containerproxy/spec/IProxySpecMergeStrategy.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/IProxySpecMergeStrategy.java rename to src/main/java/eu/openanalytics/containerproxy/spec/IProxySpecMergeStrategy.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/IProxySpecProvider.java b/src/main/java/eu/openanalytics/containerproxy/spec/IProxySpecProvider.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/IProxySpecProvider.java rename to src/main/java/eu/openanalytics/containerproxy/spec/IProxySpecProvider.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/ProxySpecException.java b/src/main/java/eu/openanalytics/containerproxy/spec/ProxySpecException.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/ProxySpecException.java rename to src/main/java/eu/openanalytics/containerproxy/spec/ProxySpecException.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/impl/DefaultSpecMergeStrategy.java b/src/main/java/eu/openanalytics/containerproxy/spec/impl/DefaultSpecMergeStrategy.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/impl/DefaultSpecMergeStrategy.java rename to src/main/java/eu/openanalytics/containerproxy/spec/impl/DefaultSpecMergeStrategy.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/impl/DefaultSpecProvider.java b/src/main/java/eu/openanalytics/containerproxy/spec/impl/DefaultSpecProvider.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/impl/DefaultSpecProvider.java rename to src/main/java/eu/openanalytics/containerproxy/spec/impl/DefaultSpecProvider.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/setting/IRuntimeSettingType.java b/src/main/java/eu/openanalytics/containerproxy/spec/setting/IRuntimeSettingType.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/setting/IRuntimeSettingType.java rename to src/main/java/eu/openanalytics/containerproxy/spec/setting/IRuntimeSettingType.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/setting/SettingSpecMapper.java b/src/main/java/eu/openanalytics/containerproxy/spec/setting/SettingSpecMapper.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/setting/SettingSpecMapper.java rename to src/main/java/eu/openanalytics/containerproxy/spec/setting/SettingSpecMapper.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/setting/SettingTypeRegistry.java b/src/main/java/eu/openanalytics/containerproxy/spec/setting/SettingTypeRegistry.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/setting/SettingTypeRegistry.java rename to src/main/java/eu/openanalytics/containerproxy/spec/setting/SettingTypeRegistry.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/setting/type/AbstractSettingType.java b/src/main/java/eu/openanalytics/containerproxy/spec/setting/type/AbstractSettingType.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/setting/type/AbstractSettingType.java rename to src/main/java/eu/openanalytics/containerproxy/spec/setting/type/AbstractSettingType.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/setting/type/IntSettingType.java b/src/main/java/eu/openanalytics/containerproxy/spec/setting/type/IntSettingType.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/setting/type/IntSettingType.java rename to src/main/java/eu/openanalytics/containerproxy/spec/setting/type/IntSettingType.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/setting/type/StringSettingType.java b/src/main/java/eu/openanalytics/containerproxy/spec/setting/type/StringSettingType.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/spec/setting/type/StringSettingType.java rename to src/main/java/eu/openanalytics/containerproxy/spec/setting/type/StringSettingType.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/stat/IStatCollector.java b/src/main/java/eu/openanalytics/containerproxy/stat/IStatCollector.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/stat/IStatCollector.java rename to src/main/java/eu/openanalytics/containerproxy/stat/IStatCollector.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/stat/StatCollectorRegistry.java b/src/main/java/eu/openanalytics/containerproxy/stat/StatCollectorRegistry.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/stat/StatCollectorRegistry.java rename to src/main/java/eu/openanalytics/containerproxy/stat/StatCollectorRegistry.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/stat/impl/InfluxDBCollector.java b/src/main/java/eu/openanalytics/containerproxy/stat/impl/InfluxDBCollector.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/stat/impl/InfluxDBCollector.java rename to src/main/java/eu/openanalytics/containerproxy/stat/impl/InfluxDBCollector.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/stat/impl/MonetDBCollector.java b/src/main/java/eu/openanalytics/containerproxy/stat/impl/MonetDBCollector.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/stat/impl/MonetDBCollector.java rename to src/main/java/eu/openanalytics/containerproxy/stat/impl/MonetDBCollector.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/ui/ErrorController.java b/src/main/java/eu/openanalytics/containerproxy/ui/ErrorController.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/ui/ErrorController.java rename to src/main/java/eu/openanalytics/containerproxy/ui/ErrorController.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/ui/LoginController.java b/src/main/java/eu/openanalytics/containerproxy/ui/LoginController.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/ui/LoginController.java rename to src/main/java/eu/openanalytics/containerproxy/ui/LoginController.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/ui/SwaggerUIController.java b/src/main/java/eu/openanalytics/containerproxy/ui/SwaggerUIController.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/ui/SwaggerUIController.java rename to src/main/java/eu/openanalytics/containerproxy/ui/SwaggerUIController.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/ui/TemplateResolverConfig.java b/src/main/java/eu/openanalytics/containerproxy/ui/TemplateResolverConfig.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/ui/TemplateResolverConfig.java rename to src/main/java/eu/openanalytics/containerproxy/ui/TemplateResolverConfig.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/util/DelegatingStreamSinkConduit.java b/src/main/java/eu/openanalytics/containerproxy/util/DelegatingStreamSinkConduit.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/util/DelegatingStreamSinkConduit.java rename to src/main/java/eu/openanalytics/containerproxy/util/DelegatingStreamSinkConduit.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/util/DelegatingStreamSourceConduit.java b/src/main/java/eu/openanalytics/containerproxy/util/DelegatingStreamSourceConduit.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/util/DelegatingStreamSourceConduit.java rename to src/main/java/eu/openanalytics/containerproxy/util/DelegatingStreamSourceConduit.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/util/PortAllocator.java b/src/main/java/eu/openanalytics/containerproxy/util/PortAllocator.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/util/PortAllocator.java rename to src/main/java/eu/openanalytics/containerproxy/util/PortAllocator.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/util/ProxyMappingManager.java b/src/main/java/eu/openanalytics/containerproxy/util/ProxyMappingManager.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/util/ProxyMappingManager.java rename to src/main/java/eu/openanalytics/containerproxy/util/ProxyMappingManager.java diff --git a/containerproxy/src/main/java/eu/openanalytics/containerproxy/util/Retrying.java b/src/main/java/eu/openanalytics/containerproxy/util/Retrying.java similarity index 100% rename from containerproxy/src/main/java/eu/openanalytics/containerproxy/util/Retrying.java rename to src/main/java/eu/openanalytics/containerproxy/util/Retrying.java diff --git a/containerproxy/src/main/resources/static/css/error.css b/src/main/resources/static/css/error.css similarity index 100% rename from containerproxy/src/main/resources/static/css/error.css rename to src/main/resources/static/css/error.css diff --git a/containerproxy/src/main/resources/static/css/login.css b/src/main/resources/static/css/login.css similarity index 100% rename from containerproxy/src/main/resources/static/css/login.css rename to src/main/resources/static/css/login.css diff --git a/containerproxy/src/main/resources/templates/error.html b/src/main/resources/templates/error.html similarity index 100% rename from containerproxy/src/main/resources/templates/error.html rename to src/main/resources/templates/error.html diff --git a/containerproxy/src/main/resources/templates/login.html b/src/main/resources/templates/login.html similarity index 100% rename from containerproxy/src/main/resources/templates/login.html rename to src/main/resources/templates/login.html diff --git a/containerproxy/src/test/java/eu/openanalytics/containerproxy/test/auth/LDAPAuthenticationTest.java b/src/test/java/eu/openanalytics/containerproxy/test/auth/LDAPAuthenticationTest.java similarity index 100% rename from containerproxy/src/test/java/eu/openanalytics/containerproxy/test/auth/LDAPAuthenticationTest.java rename to src/test/java/eu/openanalytics/containerproxy/test/auth/LDAPAuthenticationTest.java diff --git a/containerproxy/src/test/java/eu/openanalytics/containerproxy/test/auth/SimpleAuthenticationTest.java b/src/test/java/eu/openanalytics/containerproxy/test/auth/SimpleAuthenticationTest.java similarity index 100% rename from containerproxy/src/test/java/eu/openanalytics/containerproxy/test/auth/SimpleAuthenticationTest.java rename to src/test/java/eu/openanalytics/containerproxy/test/auth/SimpleAuthenticationTest.java diff --git a/containerproxy/src/test/java/eu/openanalytics/containerproxy/test/proxy/TestProxyService.java b/src/test/java/eu/openanalytics/containerproxy/test/proxy/TestProxyService.java similarity index 100% rename from containerproxy/src/test/java/eu/openanalytics/containerproxy/test/proxy/TestProxyService.java rename to src/test/java/eu/openanalytics/containerproxy/test/proxy/TestProxyService.java diff --git a/containerproxy/src/test/resources/application-test-ldap-auth.yml b/src/test/resources/application-test-ldap-auth.yml similarity index 100% rename from containerproxy/src/test/resources/application-test-ldap-auth.yml rename to src/test/resources/application-test-ldap-auth.yml diff --git a/containerproxy/src/test/resources/application-test-simple-auth.yml b/src/test/resources/application-test-simple-auth.yml similarity index 100% rename from containerproxy/src/test/resources/application-test-simple-auth.yml rename to src/test/resources/application-test-simple-auth.yml diff --git a/containerproxy/src/test/resources/application-test.yml b/src/test/resources/application-test.yml similarity index 100% rename from containerproxy/src/test/resources/application-test.yml rename to src/test/resources/application-test.yml