Clean up theia-endpoint-runtime directory structure

Signed-off-by: Anatoliy Bazko <abazko@redhat.com>
eclipse-che · May 30, 2019 · 7f634ee · 7f634ee
1 parent ad1e6aa
commit 7f634ee
Show file tree

Hide file tree

Showing 20 changed files with 16 additions and 7 deletions.
diff --git a/che-theia-init-sources.yml b/che-theia-init-sources.yml
@@ -1,7 +1,7 @@
 sources:
 - source: https://github.com/eclipse/che-theia
   extensions:
-    - dockerfiles/theia-endpoint-runtime
+    - extensions/eclipse-che-theia-plugin-remote
     - extensions/eclipse-che-theia-plugin
     - extensions/eclipse-che-theia-plugin-ext
     - extensions/eclipse-che-theia-terminal

diff --git a/dockerfiles/theia-endpoint-runtime/.gitignore b/dockerfiles/theia-endpoint-runtime/.gitignore
@@ -1,8 +1,6 @@
 theia-plugin-ext
 docker-build
-node_modules
 .browser_modules
-lib
 *.log
 *-app/*
 !*-app/package.json

diff --git a/dockerfiles/theia-endpoint-runtime/Dockerfile b/dockerfiles/theia-endpoint-runtime/Dockerfile
@@ -36,16 +36,16 @@ ADD https://${GITHUB_TOKEN}:x-oauth-basic@api.github.com/repos/theia-ide/theia/g
 ADD https://${GITHUB_TOKEN}:x-oauth-basic@api.github.com/repos/eclipse/che-theia/git/refs/head /tmp/branch_info.json
 
 # Grab dependencies
-COPY /package.json /home/workspace/packages/theia-remote/
+COPY /docker-build/theia-plugin-remote/package.json /home/workspace/packages/theia-remote/
 RUN cd /home/workspace/packages/theia-remote/ && yarn install --ignore-scripts
 
 # Compile
 COPY /docker-build/configs /home/workspace/configs
-COPY *.json /home/workspace/packages/theia-remote/
-COPY /src /home/workspace/packages/theia-remote/src
+COPY /docker-build/theia-plugin-remote/*.json /home/workspace/packages/theia-remote/
+COPY /docker-build/theia-plugin-remote/src /home/workspace/packages/theia-remote/src
 COPY /docker-build/theia-plugin-ext /home/workspace/packages/theia-plugin-ext
 COPY /docker-build/theia-plugin /home/workspace/packages/theia-plugin
-COPY /tsconfig.json /home/workspace/packages/theia-plugin/tsconfig.json
+COPY /docker-build/theia-plugin-remote/tsconfig.json /home/workspace/packages/theia-plugin/tsconfig.json
 
 COPY /etc/package.json /home/workspace
 RUN cd /home/workspace/ && yarn install

diff --git a/dockerfiles/theia-endpoint-runtime/build.sh b/dockerfiles/theia-endpoint-runtime/build.sh
@@ -35,6 +35,14 @@ cp -r "${base_dir}/../../extensions/eclipse-che-theia-plugin-ext/webpack.config.
 echo "Copying ${base_dir}/../../configs --> ${LOCAL_ASSEMBLY_DIR}/configs"
 cp -r "${base_dir}/../../configs/." "${LOCAL_ASSEMBLY_DIR}/configs"
 
+echo "Copying ${base_dir}/../../extensions/eclipse-che-theia-plugin-remote --> ${LOCAL_ASSEMBLY_DIR}/theia-plugin-remote"
+mkdir ${LOCAL_ASSEMBLY_DIR}/theia-plugin-remote
+cp -r "${base_dir}/../../extensions/eclipse-che-theia-plugin-remote/src/." "${LOCAL_ASSEMBLY_DIR}/theia-plugin-remote/src/"
+cp -r "${base_dir}/../../extensions/eclipse-che-theia-plugin-remote/package.json" "${LOCAL_ASSEMBLY_DIR}/theia-plugin-remote"
+cp -r "${base_dir}/../../extensions/eclipse-che-theia-plugin-remote/tsconfig.json" "${LOCAL_ASSEMBLY_DIR}/theia-plugin-remote"
+cp -r "${base_dir}/../../extensions/eclipse-che-theia-plugin-remote/tsfmt.json" "${LOCAL_ASSEMBLY_DIR}/theia-plugin-remote"
+cp -r "${base_dir}/../../extensions/eclipse-che-theia-plugin-remote/tslint.json" "${LOCAL_ASSEMBLY_DIR}/theia-plugin-remote"
+
 
 init --name:theia-endpoint-runtime "$@"
 build
diff --git a/extensions/eclipse-che-theia-plugin-remote/.gitignore b/extensions/eclipse-che-theia-plugin-remote/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+lib
+.idea
diff --git a/...files/theia-endpoint-runtime/package.json → ...ipse-che-theia-plugin-remote/package.json b/...files/theia-endpoint-runtime/package.json → ...ipse-che-theia-plugin-remote/package.json
diff --git a/...nt-runtime/src/node/dummy-trace-logger.ts → ...gin-remote/src/node/dummy-trace-logger.ts b/...nt-runtime/src/node/dummy-trace-logger.ts → ...gin-remote/src/node/dummy-trace-logger.ts
diff --git a/...-runtime/src/node/hosted-plugin-remote.ts → ...n-remote/src/node/hosted-plugin-remote.ts b/...-runtime/src/node/hosted-plugin-remote.ts → ...n-remote/src/node/hosted-plugin-remote.ts
diff --git a/...oint-runtime/src/node/plugin-discovery.ts → ...lugin-remote/src/node/plugin-discovery.ts b/...oint-runtime/src/node/plugin-discovery.ts → ...lugin-remote/src/node/plugin-discovery.ts
diff --git a/.../src/node/plugin-remote-backend-module.ts → .../src/node/plugin-remote-backend-module.ts b/.../src/node/plugin-remote-backend-module.ts → .../src/node/plugin-remote-backend-module.ts
diff --git a/...nt-runtime/src/node/plugin-remote-init.ts → ...gin-remote/src/node/plugin-remote-init.ts b/...nt-runtime/src/node/plugin-remote-init.ts → ...gin-remote/src/node/plugin-remote-init.ts
diff --git a/...runtime/src/node/plugin-remote-mapping.ts → ...-remote/src/node/plugin-remote-mapping.ts b/...runtime/src/node/plugin-remote-mapping.ts → ...-remote/src/node/plugin-remote-mapping.ts
diff --git a/...ndpoint-runtime/src/node/plugin-remote.ts → ...a-plugin-remote/src/node/plugin-remote.ts b/...ndpoint-runtime/src/node/plugin-remote.ts → ...a-plugin-remote/src/node/plugin-remote.ts
diff --git a/...ime/src/node/remote-metadata-processor.ts → ...ote/src/node/remote-metadata-processor.ts b/...ime/src/node/remote-metadata-processor.ts → ...ote/src/node/remote-metadata-processor.ts
diff --git a/...me/src/node/server-plugin-proxy-runner.ts → ...te/src/node/server-plugin-proxy-runner.ts b/...me/src/node/server-plugin-proxy-runner.ts → ...te/src/node/server-plugin-proxy-runner.ts
diff --git a/...time/src/node/terminal-container-aware.ts → ...mote/src/node/terminal-container-aware.ts b/...time/src/node/terminal-container-aware.ts → ...mote/src/node/terminal-container-aware.ts
diff --git a/...ia-endpoint-runtime/src/node/websocket.ts → ...theia-plugin-remote/src/node/websocket.ts b/...ia-endpoint-runtime/src/node/websocket.ts → ...theia-plugin-remote/src/node/websocket.ts
diff --git a/...iles/theia-endpoint-runtime/tsconfig.json → ...pse-che-theia-plugin-remote/tsconfig.json b/...iles/theia-endpoint-runtime/tsconfig.json → ...pse-che-theia-plugin-remote/tsconfig.json
diff --git a/...erfiles/theia-endpoint-runtime/tsfmt.json → ...clipse-che-theia-plugin-remote/tsfmt.json b/...erfiles/theia-endpoint-runtime/tsfmt.json → ...clipse-che-theia-plugin-remote/tsfmt.json
diff --git a/...rfiles/theia-endpoint-runtime/tslint.json → ...lipse-che-theia-plugin-remote/tslint.json b/...rfiles/theia-endpoint-runtime/tslint.json → ...lipse-che-theia-plugin-remote/tslint.json