You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marvin.apache.org by lu...@apache.org on 2019/05/29 05:10:03 UTC
[incubator-marvin] 01/01: Reverting module rename introduced on
#MARVIN-1
This is an automated email from the ASF dual-hosted git repository.
lucasbm88 pushed a commit to branch bug/MARVIN-48
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git
commit 28ff22558c90bc1dda610d552c78d338843521af
Author: Lucas Bonatto Miguel <lu...@qume.io>
AuthorDate: Wed May 29 02:09:36 2019 -0300
Reverting module rename introduced on #MARVIN-1
---
.../.github/ISSUE_TEMPLATE/bug_report.md | 0
.../.github/ISSUE_TEMPLATE/custom.md | 0
.../.github/ISSUE_TEMPLATE/feature_request.md | 0
{engine-server => engine-executor}/.gitignore | 0
{engine-server => engine-executor}/CODE_OF_CONDUCT.md | 0
{engine-server => engine-executor}/Makefile | 0
{engine-server => engine-executor}/NOTICE | 0
{engine-server => engine-executor}/PULL_REQUEST_TEMPLATE.md | 0
{engine-server => engine-executor}/README.md | 0
{engine-server => engine-executor}/build.sbt | 2 +-
{engine-server => engine-executor}/build/Dockerfile | 0
.../build/docker-python/Dockerfile | 2 +-
.../build/docker-r/Dockerfile | 4 +++-
.../build/marvin-engine-server-assembly.jar | Bin
{engine-server => engine-executor}/build/python-toolbox.tgz | Bin
{engine-server => engine-executor}/project/assembly.sbt | 0
{engine-server => engine-executor}/project/build.properties | 0
{engine-server => engine-executor}/project/plugins.sbt | 0
{engine-server => engine-executor}/project/scalapb.sbt | 0
{engine-server => engine-executor}/sonatype.sbt | 0
.../src/main/protobuf/actions.proto | 0
.../src/main}/resources/EngineActionSchema.json | 0
.../src/main}/resources/EngineMetadataSchema.json | 0
.../src/main/resources/application.conf | 0
.../src/main/resources/docs/favicon-16x16.png | Bin
.../src/main/resources/docs/favicon-32x32.png | Bin
.../src/main/resources/docs/index.html | 0
.../src/main/resources/docs/oauth2-redirect.html | 0
.../src/main/resources/docs/swagger-ui-bundle.js | 0
.../src/main/resources/docs/swagger-ui-bundle.js.map | 0
.../src/main/resources/docs/swagger-ui-standalone-preset.js | 0
.../main/resources/docs/swagger-ui-standalone-preset.js.map | 0
.../src/main/resources/docs/swagger-ui.css | 0
.../src/main/resources/docs/swagger-ui.css.map | 0
.../src/main/resources/docs/swagger-ui.js | 0
.../src/main/resources/docs/swagger-ui.js.map | 0
.../src/main/resources/log4j.properties | 0
.../scala/org/marvin/artifact/manager/ArtifactFSSaver.scala | 0
.../org/marvin/artifact/manager/ArtifactHdfsSaver.scala | 0
.../scala/org/marvin/artifact/manager/ArtifactS3Saver.scala | 0
.../scala/org/marvin/artifact/manager/ArtifactSaver.scala | 0
.../org/marvin/exception/MarvinEExecutorException.scala | 0
.../main/scala/org/marvin/executor/EngineExecutorApp.scala | 0
.../scala/org/marvin/executor/actions/BatchAction.scala | 0
.../scala/org/marvin/executor/actions/OnlineAction.scala | 0
.../scala/org/marvin/executor/actions/PipelineAction.scala | 0
.../src/main/scala/org/marvin/executor/api/GenericAPI.scala | 0
.../scala/org/marvin/executor/api/GenericAPIHandlers.scala | 0
.../marvin/executor/manager/ExecutorClusterListener.scala | 0
.../scala/org/marvin/executor/manager/ExecutorManager.scala | 0
.../org/marvin/executor/proxies/BatchActionProxy.scala | 0
.../scala/org/marvin/executor/proxies/EngineProxy.scala | 0
.../org/marvin/executor/proxies/OnlineActionProxy.scala | 0
.../org/marvin/executor/statemachine/PredictorFSM.scala | 0
.../src/main/scala/org/marvin/model/BatchExecution.scala | 0
.../src/main/scala/org/marvin/model/Metadata.scala | 0
.../main/scala/org/marvin/util/ConfigurationContext.scala | 0
.../src/main/scala/org/marvin/util/JsonUtil.scala | 0
.../src/main/scala/org/marvin/util/LocalCache.scala | 0
.../src/main/scala/org/marvin/util/ProtocolUtil.scala | 0
.../src/test}/resources/EngineActionSchema.json | 0
.../src/test}/resources/EngineMetadataSchema.json | 0
.../src/test/resources/application.conf | 0
.../src/test/resources/engine_home/docs.yaml | 0
.../src/test/resources/engine_home/engine.metadata | 0
.../src/test/resources/engine_home/engine.params | 0
.../src/test/resources/engine_home/predictor-message.schema | 0
.../src/test/resources/metadataToValidate.json | 0
.../src/test/resources/metadataToValidateWithError.json | 0
.../src/test/resources/metadataToValidateWithRefError.json | 0
.../src/test/resources/test-invalid.json | 0
.../src/test/resources/test.json | 0
.../org/marvin/artifact/manager/ArtifactS3SaverTest.scala | 0
.../org/marvin/artifact/manager/ArtifactSaverTest.scala | 0
.../scala/org/marvin/executor/EngineExecutorAppTest.scala | 0
.../scala/org/marvin/executor/actions/BatchActionTest.scala | 0
.../org/marvin/executor/actions/OnlineActionTest.scala | 0
.../test/scala/org/marvin/executor/api/GenericAPITest.scala | 0
.../org/marvin/executor/manager/ExecutorManagerTest.scala | 0
.../org/marvin/executor/proxies/BatchActionProxyTest.scala | 0
.../org/marvin/executor/proxies/OnlineActionProxyTest.scala | 0
.../org/marvin/executor/statemachine/PredictorFSMTest.scala | 0
.../src/test/scala/org/marvin/fixtures/MetadataMock.scala | 0
.../src/test/scala/org/marvin/util/JsonUtilTest.scala | 0
.../src/test/scala/org/marvin/util/LocalCacheTest.scala | 0
.../src/test/scala/org/marvin/util/ProtocolUtilTest.scala | 0
86 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/engine-server/.github/ISSUE_TEMPLATE/bug_report.md b/engine-executor/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from engine-server/.github/ISSUE_TEMPLATE/bug_report.md
rename to engine-executor/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/engine-server/.github/ISSUE_TEMPLATE/custom.md b/engine-executor/.github/ISSUE_TEMPLATE/custom.md
similarity index 100%
rename from engine-server/.github/ISSUE_TEMPLATE/custom.md
rename to engine-executor/.github/ISSUE_TEMPLATE/custom.md
diff --git a/engine-server/.github/ISSUE_TEMPLATE/feature_request.md b/engine-executor/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from engine-server/.github/ISSUE_TEMPLATE/feature_request.md
rename to engine-executor/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/engine-server/.gitignore b/engine-executor/.gitignore
similarity index 100%
rename from engine-server/.gitignore
rename to engine-executor/.gitignore
diff --git a/engine-server/CODE_OF_CONDUCT.md b/engine-executor/CODE_OF_CONDUCT.md
similarity index 100%
rename from engine-server/CODE_OF_CONDUCT.md
rename to engine-executor/CODE_OF_CONDUCT.md
diff --git a/engine-server/Makefile b/engine-executor/Makefile
similarity index 100%
rename from engine-server/Makefile
rename to engine-executor/Makefile
diff --git a/engine-server/NOTICE b/engine-executor/NOTICE
similarity index 100%
rename from engine-server/NOTICE
rename to engine-executor/NOTICE
diff --git a/engine-server/PULL_REQUEST_TEMPLATE.md b/engine-executor/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from engine-server/PULL_REQUEST_TEMPLATE.md
rename to engine-executor/PULL_REQUEST_TEMPLATE.md
diff --git a/engine-server/README.md b/engine-executor/README.md
similarity index 100%
rename from engine-server/README.md
rename to engine-executor/README.md
diff --git a/engine-server/build.sbt b/engine-executor/build.sbt
similarity index 98%
rename from engine-server/build.sbt
rename to engine-executor/build.sbt
index c4a065c..4ca3eab 100644
--- a/engine-server/build.sbt
+++ b/engine-executor/build.sbt
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-name := "marvin-engine-server"
+name := "marvin-engine-executor"
version := "0.0.5"
diff --git a/engine-server/build/Dockerfile b/engine-executor/build/Dockerfile
similarity index 100%
rename from engine-server/build/Dockerfile
rename to engine-executor/build/Dockerfile
diff --git a/engine-server/build/docker-python/Dockerfile b/engine-executor/build/docker-python/Dockerfile
similarity index 96%
rename from engine-server/build/docker-python/Dockerfile
rename to engine-executor/build/docker-python/Dockerfile
index bd06aef..695be4c 100644
--- a/engine-server/build/docker-python/Dockerfile
+++ b/engine-executor/build/docker-python/Dockerfile
@@ -44,7 +44,7 @@ RUN apt-get update -y && \
ADD python-toolbox.tgz $MARVIN_ENGINE_HOME
# adds the freshly built engine server jar
-ADD marvin-engine-server-assembly.jar $MARVIN_DATA_PATH
+ADD marvin-engine-executor-assembly.jar $MARVIN_DATA_PATH
##############################################################
# Starts the jupyter http server
diff --git a/engine-server/build/docker-r/Dockerfile b/engine-executor/build/docker-r/Dockerfile
similarity index 92%
rename from engine-server/build/docker-r/Dockerfile
rename to engine-executor/build/docker-r/Dockerfile
index dc48dcb..f732aec 100644
--- a/engine-server/build/docker-r/Dockerfile
+++ b/engine-executor/build/docker-r/Dockerfile
@@ -44,11 +44,13 @@ RUN apt install -y r-base && \
# Copy and Install the marvin engine inside virtualenv
##############################################################
+### TODO - Uncomment this block once we have the common lib for R tested and we can run engines in R
+
# adds the package containing the user-generated engine
#ADD generated-engine $MARVIN_ENGINE_HOME
# adds the freshly built engine server jar
-#ADD marvin-engine-server-assembly.jar $MARVIN_DATA_PATH
+#ADD marvin-engine-executor-assembly.jar $MARVIN_DATA_PATH
##############################################################
# Starts the jupyter http server
diff --git a/engine-server/build/marvin-engine-server-assembly.jar b/engine-executor/build/marvin-engine-server-assembly.jar
similarity index 100%
rename from engine-server/build/marvin-engine-server-assembly.jar
rename to engine-executor/build/marvin-engine-server-assembly.jar
diff --git a/engine-server/build/python-toolbox.tgz b/engine-executor/build/python-toolbox.tgz
similarity index 100%
rename from engine-server/build/python-toolbox.tgz
rename to engine-executor/build/python-toolbox.tgz
diff --git a/engine-server/project/assembly.sbt b/engine-executor/project/assembly.sbt
similarity index 100%
rename from engine-server/project/assembly.sbt
rename to engine-executor/project/assembly.sbt
diff --git a/engine-server/project/build.properties b/engine-executor/project/build.properties
similarity index 100%
rename from engine-server/project/build.properties
rename to engine-executor/project/build.properties
diff --git a/engine-server/project/plugins.sbt b/engine-executor/project/plugins.sbt
similarity index 100%
rename from engine-server/project/plugins.sbt
rename to engine-executor/project/plugins.sbt
diff --git a/engine-server/project/scalapb.sbt b/engine-executor/project/scalapb.sbt
similarity index 100%
rename from engine-server/project/scalapb.sbt
rename to engine-executor/project/scalapb.sbt
diff --git a/engine-server/sonatype.sbt b/engine-executor/sonatype.sbt
similarity index 100%
rename from engine-server/sonatype.sbt
rename to engine-executor/sonatype.sbt
diff --git a/engine-server/src/main/protobuf/actions.proto b/engine-executor/src/main/protobuf/actions.proto
similarity index 100%
rename from engine-server/src/main/protobuf/actions.proto
rename to engine-executor/src/main/protobuf/actions.proto
diff --git a/engine-server/src/test/resources/EngineActionSchema.json b/engine-executor/src/main/resources/EngineActionSchema.json
similarity index 100%
rename from engine-server/src/test/resources/EngineActionSchema.json
rename to engine-executor/src/main/resources/EngineActionSchema.json
diff --git a/engine-server/src/test/resources/EngineMetadataSchema.json b/engine-executor/src/main/resources/EngineMetadataSchema.json
similarity index 100%
rename from engine-server/src/test/resources/EngineMetadataSchema.json
rename to engine-executor/src/main/resources/EngineMetadataSchema.json
diff --git a/engine-server/src/main/resources/application.conf b/engine-executor/src/main/resources/application.conf
similarity index 100%
rename from engine-server/src/main/resources/application.conf
rename to engine-executor/src/main/resources/application.conf
diff --git a/engine-server/src/main/resources/docs/favicon-16x16.png b/engine-executor/src/main/resources/docs/favicon-16x16.png
similarity index 100%
rename from engine-server/src/main/resources/docs/favicon-16x16.png
rename to engine-executor/src/main/resources/docs/favicon-16x16.png
diff --git a/engine-server/src/main/resources/docs/favicon-32x32.png b/engine-executor/src/main/resources/docs/favicon-32x32.png
similarity index 100%
rename from engine-server/src/main/resources/docs/favicon-32x32.png
rename to engine-executor/src/main/resources/docs/favicon-32x32.png
diff --git a/engine-server/src/main/resources/docs/index.html b/engine-executor/src/main/resources/docs/index.html
similarity index 100%
rename from engine-server/src/main/resources/docs/index.html
rename to engine-executor/src/main/resources/docs/index.html
diff --git a/engine-server/src/main/resources/docs/oauth2-redirect.html b/engine-executor/src/main/resources/docs/oauth2-redirect.html
similarity index 100%
rename from engine-server/src/main/resources/docs/oauth2-redirect.html
rename to engine-executor/src/main/resources/docs/oauth2-redirect.html
diff --git a/engine-server/src/main/resources/docs/swagger-ui-bundle.js b/engine-executor/src/main/resources/docs/swagger-ui-bundle.js
similarity index 100%
rename from engine-server/src/main/resources/docs/swagger-ui-bundle.js
rename to engine-executor/src/main/resources/docs/swagger-ui-bundle.js
diff --git a/engine-server/src/main/resources/docs/swagger-ui-bundle.js.map b/engine-executor/src/main/resources/docs/swagger-ui-bundle.js.map
similarity index 100%
rename from engine-server/src/main/resources/docs/swagger-ui-bundle.js.map
rename to engine-executor/src/main/resources/docs/swagger-ui-bundle.js.map
diff --git a/engine-server/src/main/resources/docs/swagger-ui-standalone-preset.js b/engine-executor/src/main/resources/docs/swagger-ui-standalone-preset.js
similarity index 100%
rename from engine-server/src/main/resources/docs/swagger-ui-standalone-preset.js
rename to engine-executor/src/main/resources/docs/swagger-ui-standalone-preset.js
diff --git a/engine-server/src/main/resources/docs/swagger-ui-standalone-preset.js.map b/engine-executor/src/main/resources/docs/swagger-ui-standalone-preset.js.map
similarity index 100%
rename from engine-server/src/main/resources/docs/swagger-ui-standalone-preset.js.map
rename to engine-executor/src/main/resources/docs/swagger-ui-standalone-preset.js.map
diff --git a/engine-server/src/main/resources/docs/swagger-ui.css b/engine-executor/src/main/resources/docs/swagger-ui.css
similarity index 100%
rename from engine-server/src/main/resources/docs/swagger-ui.css
rename to engine-executor/src/main/resources/docs/swagger-ui.css
diff --git a/engine-server/src/main/resources/docs/swagger-ui.css.map b/engine-executor/src/main/resources/docs/swagger-ui.css.map
similarity index 100%
rename from engine-server/src/main/resources/docs/swagger-ui.css.map
rename to engine-executor/src/main/resources/docs/swagger-ui.css.map
diff --git a/engine-server/src/main/resources/docs/swagger-ui.js b/engine-executor/src/main/resources/docs/swagger-ui.js
similarity index 100%
rename from engine-server/src/main/resources/docs/swagger-ui.js
rename to engine-executor/src/main/resources/docs/swagger-ui.js
diff --git a/engine-server/src/main/resources/docs/swagger-ui.js.map b/engine-executor/src/main/resources/docs/swagger-ui.js.map
similarity index 100%
rename from engine-server/src/main/resources/docs/swagger-ui.js.map
rename to engine-executor/src/main/resources/docs/swagger-ui.js.map
diff --git a/engine-server/src/main/resources/log4j.properties b/engine-executor/src/main/resources/log4j.properties
similarity index 100%
rename from engine-server/src/main/resources/log4j.properties
rename to engine-executor/src/main/resources/log4j.properties
diff --git a/engine-server/src/main/scala/org/marvin/artifact/manager/ArtifactFSSaver.scala b/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactFSSaver.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/artifact/manager/ArtifactFSSaver.scala
rename to engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactFSSaver.scala
diff --git a/engine-server/src/main/scala/org/marvin/artifact/manager/ArtifactHdfsSaver.scala b/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactHdfsSaver.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/artifact/manager/ArtifactHdfsSaver.scala
rename to engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactHdfsSaver.scala
diff --git a/engine-server/src/main/scala/org/marvin/artifact/manager/ArtifactS3Saver.scala b/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactS3Saver.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/artifact/manager/ArtifactS3Saver.scala
rename to engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactS3Saver.scala
diff --git a/engine-server/src/main/scala/org/marvin/artifact/manager/ArtifactSaver.scala b/engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactSaver.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/artifact/manager/ArtifactSaver.scala
rename to engine-executor/src/main/scala/org/marvin/artifact/manager/ArtifactSaver.scala
diff --git a/engine-server/src/main/scala/org/marvin/exception/MarvinEExecutorException.scala b/engine-executor/src/main/scala/org/marvin/exception/MarvinEExecutorException.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/exception/MarvinEExecutorException.scala
rename to engine-executor/src/main/scala/org/marvin/exception/MarvinEExecutorException.scala
diff --git a/engine-server/src/main/scala/org/marvin/executor/EngineExecutorApp.scala b/engine-executor/src/main/scala/org/marvin/executor/EngineExecutorApp.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/executor/EngineExecutorApp.scala
rename to engine-executor/src/main/scala/org/marvin/executor/EngineExecutorApp.scala
diff --git a/engine-server/src/main/scala/org/marvin/executor/actions/BatchAction.scala b/engine-executor/src/main/scala/org/marvin/executor/actions/BatchAction.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/executor/actions/BatchAction.scala
rename to engine-executor/src/main/scala/org/marvin/executor/actions/BatchAction.scala
diff --git a/engine-server/src/main/scala/org/marvin/executor/actions/OnlineAction.scala b/engine-executor/src/main/scala/org/marvin/executor/actions/OnlineAction.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/executor/actions/OnlineAction.scala
rename to engine-executor/src/main/scala/org/marvin/executor/actions/OnlineAction.scala
diff --git a/engine-server/src/main/scala/org/marvin/executor/actions/PipelineAction.scala b/engine-executor/src/main/scala/org/marvin/executor/actions/PipelineAction.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/executor/actions/PipelineAction.scala
rename to engine-executor/src/main/scala/org/marvin/executor/actions/PipelineAction.scala
diff --git a/engine-server/src/main/scala/org/marvin/executor/api/GenericAPI.scala b/engine-executor/src/main/scala/org/marvin/executor/api/GenericAPI.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/executor/api/GenericAPI.scala
rename to engine-executor/src/main/scala/org/marvin/executor/api/GenericAPI.scala
diff --git a/engine-server/src/main/scala/org/marvin/executor/api/GenericAPIHandlers.scala b/engine-executor/src/main/scala/org/marvin/executor/api/GenericAPIHandlers.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/executor/api/GenericAPIHandlers.scala
rename to engine-executor/src/main/scala/org/marvin/executor/api/GenericAPIHandlers.scala
diff --git a/engine-server/src/main/scala/org/marvin/executor/manager/ExecutorClusterListener.scala b/engine-executor/src/main/scala/org/marvin/executor/manager/ExecutorClusterListener.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/executor/manager/ExecutorClusterListener.scala
rename to engine-executor/src/main/scala/org/marvin/executor/manager/ExecutorClusterListener.scala
diff --git a/engine-server/src/main/scala/org/marvin/executor/manager/ExecutorManager.scala b/engine-executor/src/main/scala/org/marvin/executor/manager/ExecutorManager.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/executor/manager/ExecutorManager.scala
rename to engine-executor/src/main/scala/org/marvin/executor/manager/ExecutorManager.scala
diff --git a/engine-server/src/main/scala/org/marvin/executor/proxies/BatchActionProxy.scala b/engine-executor/src/main/scala/org/marvin/executor/proxies/BatchActionProxy.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/executor/proxies/BatchActionProxy.scala
rename to engine-executor/src/main/scala/org/marvin/executor/proxies/BatchActionProxy.scala
diff --git a/engine-server/src/main/scala/org/marvin/executor/proxies/EngineProxy.scala b/engine-executor/src/main/scala/org/marvin/executor/proxies/EngineProxy.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/executor/proxies/EngineProxy.scala
rename to engine-executor/src/main/scala/org/marvin/executor/proxies/EngineProxy.scala
diff --git a/engine-server/src/main/scala/org/marvin/executor/proxies/OnlineActionProxy.scala b/engine-executor/src/main/scala/org/marvin/executor/proxies/OnlineActionProxy.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/executor/proxies/OnlineActionProxy.scala
rename to engine-executor/src/main/scala/org/marvin/executor/proxies/OnlineActionProxy.scala
diff --git a/engine-server/src/main/scala/org/marvin/executor/statemachine/PredictorFSM.scala b/engine-executor/src/main/scala/org/marvin/executor/statemachine/PredictorFSM.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/executor/statemachine/PredictorFSM.scala
rename to engine-executor/src/main/scala/org/marvin/executor/statemachine/PredictorFSM.scala
diff --git a/engine-server/src/main/scala/org/marvin/model/BatchExecution.scala b/engine-executor/src/main/scala/org/marvin/model/BatchExecution.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/model/BatchExecution.scala
rename to engine-executor/src/main/scala/org/marvin/model/BatchExecution.scala
diff --git a/engine-server/src/main/scala/org/marvin/model/Metadata.scala b/engine-executor/src/main/scala/org/marvin/model/Metadata.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/model/Metadata.scala
rename to engine-executor/src/main/scala/org/marvin/model/Metadata.scala
diff --git a/engine-server/src/main/scala/org/marvin/util/ConfigurationContext.scala b/engine-executor/src/main/scala/org/marvin/util/ConfigurationContext.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/util/ConfigurationContext.scala
rename to engine-executor/src/main/scala/org/marvin/util/ConfigurationContext.scala
diff --git a/engine-server/src/main/scala/org/marvin/util/JsonUtil.scala b/engine-executor/src/main/scala/org/marvin/util/JsonUtil.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/util/JsonUtil.scala
rename to engine-executor/src/main/scala/org/marvin/util/JsonUtil.scala
diff --git a/engine-server/src/main/scala/org/marvin/util/LocalCache.scala b/engine-executor/src/main/scala/org/marvin/util/LocalCache.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/util/LocalCache.scala
rename to engine-executor/src/main/scala/org/marvin/util/LocalCache.scala
diff --git a/engine-server/src/main/scala/org/marvin/util/ProtocolUtil.scala b/engine-executor/src/main/scala/org/marvin/util/ProtocolUtil.scala
similarity index 100%
rename from engine-server/src/main/scala/org/marvin/util/ProtocolUtil.scala
rename to engine-executor/src/main/scala/org/marvin/util/ProtocolUtil.scala
diff --git a/engine-server/src/main/resources/EngineActionSchema.json b/engine-executor/src/test/resources/EngineActionSchema.json
similarity index 100%
rename from engine-server/src/main/resources/EngineActionSchema.json
rename to engine-executor/src/test/resources/EngineActionSchema.json
diff --git a/engine-server/src/main/resources/EngineMetadataSchema.json b/engine-executor/src/test/resources/EngineMetadataSchema.json
similarity index 100%
rename from engine-server/src/main/resources/EngineMetadataSchema.json
rename to engine-executor/src/test/resources/EngineMetadataSchema.json
diff --git a/engine-server/src/test/resources/application.conf b/engine-executor/src/test/resources/application.conf
similarity index 100%
rename from engine-server/src/test/resources/application.conf
rename to engine-executor/src/test/resources/application.conf
diff --git a/engine-server/src/test/resources/engine_home/docs.yaml b/engine-executor/src/test/resources/engine_home/docs.yaml
similarity index 100%
rename from engine-server/src/test/resources/engine_home/docs.yaml
rename to engine-executor/src/test/resources/engine_home/docs.yaml
diff --git a/engine-server/src/test/resources/engine_home/engine.metadata b/engine-executor/src/test/resources/engine_home/engine.metadata
similarity index 100%
rename from engine-server/src/test/resources/engine_home/engine.metadata
rename to engine-executor/src/test/resources/engine_home/engine.metadata
diff --git a/engine-server/src/test/resources/engine_home/engine.params b/engine-executor/src/test/resources/engine_home/engine.params
similarity index 100%
rename from engine-server/src/test/resources/engine_home/engine.params
rename to engine-executor/src/test/resources/engine_home/engine.params
diff --git a/engine-server/src/test/resources/engine_home/predictor-message.schema b/engine-executor/src/test/resources/engine_home/predictor-message.schema
similarity index 100%
rename from engine-server/src/test/resources/engine_home/predictor-message.schema
rename to engine-executor/src/test/resources/engine_home/predictor-message.schema
diff --git a/engine-server/src/test/resources/metadataToValidate.json b/engine-executor/src/test/resources/metadataToValidate.json
similarity index 100%
rename from engine-server/src/test/resources/metadataToValidate.json
rename to engine-executor/src/test/resources/metadataToValidate.json
diff --git a/engine-server/src/test/resources/metadataToValidateWithError.json b/engine-executor/src/test/resources/metadataToValidateWithError.json
similarity index 100%
rename from engine-server/src/test/resources/metadataToValidateWithError.json
rename to engine-executor/src/test/resources/metadataToValidateWithError.json
diff --git a/engine-server/src/test/resources/metadataToValidateWithRefError.json b/engine-executor/src/test/resources/metadataToValidateWithRefError.json
similarity index 100%
rename from engine-server/src/test/resources/metadataToValidateWithRefError.json
rename to engine-executor/src/test/resources/metadataToValidateWithRefError.json
diff --git a/engine-server/src/test/resources/test-invalid.json b/engine-executor/src/test/resources/test-invalid.json
similarity index 100%
rename from engine-server/src/test/resources/test-invalid.json
rename to engine-executor/src/test/resources/test-invalid.json
diff --git a/engine-server/src/test/resources/test.json b/engine-executor/src/test/resources/test.json
similarity index 100%
rename from engine-server/src/test/resources/test.json
rename to engine-executor/src/test/resources/test.json
diff --git a/engine-server/src/test/scala/org/marvin/artifact/manager/ArtifactS3SaverTest.scala b/engine-executor/src/test/scala/org/marvin/artifact/manager/ArtifactS3SaverTest.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/artifact/manager/ArtifactS3SaverTest.scala
rename to engine-executor/src/test/scala/org/marvin/artifact/manager/ArtifactS3SaverTest.scala
diff --git a/engine-server/src/test/scala/org/marvin/artifact/manager/ArtifactSaverTest.scala b/engine-executor/src/test/scala/org/marvin/artifact/manager/ArtifactSaverTest.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/artifact/manager/ArtifactSaverTest.scala
rename to engine-executor/src/test/scala/org/marvin/artifact/manager/ArtifactSaverTest.scala
diff --git a/engine-server/src/test/scala/org/marvin/executor/EngineExecutorAppTest.scala b/engine-executor/src/test/scala/org/marvin/executor/EngineExecutorAppTest.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/executor/EngineExecutorAppTest.scala
rename to engine-executor/src/test/scala/org/marvin/executor/EngineExecutorAppTest.scala
diff --git a/engine-server/src/test/scala/org/marvin/executor/actions/BatchActionTest.scala b/engine-executor/src/test/scala/org/marvin/executor/actions/BatchActionTest.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/executor/actions/BatchActionTest.scala
rename to engine-executor/src/test/scala/org/marvin/executor/actions/BatchActionTest.scala
diff --git a/engine-server/src/test/scala/org/marvin/executor/actions/OnlineActionTest.scala b/engine-executor/src/test/scala/org/marvin/executor/actions/OnlineActionTest.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/executor/actions/OnlineActionTest.scala
rename to engine-executor/src/test/scala/org/marvin/executor/actions/OnlineActionTest.scala
diff --git a/engine-server/src/test/scala/org/marvin/executor/api/GenericAPITest.scala b/engine-executor/src/test/scala/org/marvin/executor/api/GenericAPITest.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/executor/api/GenericAPITest.scala
rename to engine-executor/src/test/scala/org/marvin/executor/api/GenericAPITest.scala
diff --git a/engine-server/src/test/scala/org/marvin/executor/manager/ExecutorManagerTest.scala b/engine-executor/src/test/scala/org/marvin/executor/manager/ExecutorManagerTest.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/executor/manager/ExecutorManagerTest.scala
rename to engine-executor/src/test/scala/org/marvin/executor/manager/ExecutorManagerTest.scala
diff --git a/engine-server/src/test/scala/org/marvin/executor/proxies/BatchActionProxyTest.scala b/engine-executor/src/test/scala/org/marvin/executor/proxies/BatchActionProxyTest.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/executor/proxies/BatchActionProxyTest.scala
rename to engine-executor/src/test/scala/org/marvin/executor/proxies/BatchActionProxyTest.scala
diff --git a/engine-server/src/test/scala/org/marvin/executor/proxies/OnlineActionProxyTest.scala b/engine-executor/src/test/scala/org/marvin/executor/proxies/OnlineActionProxyTest.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/executor/proxies/OnlineActionProxyTest.scala
rename to engine-executor/src/test/scala/org/marvin/executor/proxies/OnlineActionProxyTest.scala
diff --git a/engine-server/src/test/scala/org/marvin/executor/statemachine/PredictorFSMTest.scala b/engine-executor/src/test/scala/org/marvin/executor/statemachine/PredictorFSMTest.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/executor/statemachine/PredictorFSMTest.scala
rename to engine-executor/src/test/scala/org/marvin/executor/statemachine/PredictorFSMTest.scala
diff --git a/engine-server/src/test/scala/org/marvin/fixtures/MetadataMock.scala b/engine-executor/src/test/scala/org/marvin/fixtures/MetadataMock.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/fixtures/MetadataMock.scala
rename to engine-executor/src/test/scala/org/marvin/fixtures/MetadataMock.scala
diff --git a/engine-server/src/test/scala/org/marvin/util/JsonUtilTest.scala b/engine-executor/src/test/scala/org/marvin/util/JsonUtilTest.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/util/JsonUtilTest.scala
rename to engine-executor/src/test/scala/org/marvin/util/JsonUtilTest.scala
diff --git a/engine-server/src/test/scala/org/marvin/util/LocalCacheTest.scala b/engine-executor/src/test/scala/org/marvin/util/LocalCacheTest.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/util/LocalCacheTest.scala
rename to engine-executor/src/test/scala/org/marvin/util/LocalCacheTest.scala
diff --git a/engine-server/src/test/scala/org/marvin/util/ProtocolUtilTest.scala b/engine-executor/src/test/scala/org/marvin/util/ProtocolUtilTest.scala
similarity index 100%
rename from engine-server/src/test/scala/org/marvin/util/ProtocolUtilTest.scala
rename to engine-executor/src/test/scala/org/marvin/util/ProtocolUtilTest.scala