From 7f634ee50a204fce30f8458d117b1243d0a0f809 Mon Sep 17 00:00:00 2001 From: Anatoliy Bazko Date: Thu, 30 May 2019 17:25:45 +0300 Subject: [PATCH] Clean up theia-endpoint-runtime directory structure Signed-off-by: Anatoliy Bazko --- che-theia-init-sources.yml | 2 +- dockerfiles/theia-endpoint-runtime/.gitignore | 2 -- dockerfiles/theia-endpoint-runtime/Dockerfile | 8 ++++---- dockerfiles/theia-endpoint-runtime/build.sh | 8 ++++++++ extensions/eclipse-che-theia-plugin-remote/.gitignore | 3 +++ .../eclipse-che-theia-plugin-remote}/package.json | 0 .../src/node/dummy-trace-logger.ts | 0 .../src/node/hosted-plugin-remote.ts | 0 .../src/node/plugin-discovery.ts | 0 .../src/node/plugin-remote-backend-module.ts | 0 .../src/node/plugin-remote-init.ts | 0 .../src/node/plugin-remote-mapping.ts | 0 .../src/node/plugin-remote.ts | 0 .../src/node/remote-metadata-processor.ts | 0 .../src/node/server-plugin-proxy-runner.ts | 0 .../src/node/terminal-container-aware.ts | 0 .../src/node/websocket.ts | 0 .../eclipse-che-theia-plugin-remote}/tsconfig.json | 0 .../eclipse-che-theia-plugin-remote}/tsfmt.json | 0 .../eclipse-che-theia-plugin-remote}/tslint.json | 0 20 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 extensions/eclipse-che-theia-plugin-remote/.gitignore rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/package.json (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/src/node/dummy-trace-logger.ts (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/src/node/hosted-plugin-remote.ts (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/src/node/plugin-discovery.ts (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/src/node/plugin-remote-backend-module.ts (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/src/node/plugin-remote-init.ts (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/src/node/plugin-remote-mapping.ts (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/src/node/plugin-remote.ts (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/src/node/remote-metadata-processor.ts (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/src/node/server-plugin-proxy-runner.ts (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/src/node/terminal-container-aware.ts (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/src/node/websocket.ts (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/tsconfig.json (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/tsfmt.json (100%) rename {dockerfiles/theia-endpoint-runtime => extensions/eclipse-che-theia-plugin-remote}/tslint.json (100%) diff --git a/che-theia-init-sources.yml b/che-theia-init-sources.yml index 3530905cc1..989c818d6c 100644 --- 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 index 86213de7c1..9d991d7549 100644 --- 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 index 6b29376b78..27baf53073 100644 --- 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 index 6c3377db97..a71f7a76a5 100755 --- 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 new file mode 100644 index 0000000000..38b6034c9b --- /dev/null +++ b/extensions/eclipse-che-theia-plugin-remote/.gitignore @@ -0,0 +1,3 @@ +node_modules +lib +.idea diff --git a/dockerfiles/theia-endpoint-runtime/package.json b/extensions/eclipse-che-theia-plugin-remote/package.json similarity index 100% rename from dockerfiles/theia-endpoint-runtime/package.json rename to extensions/eclipse-che-theia-plugin-remote/package.json diff --git a/dockerfiles/theia-endpoint-runtime/src/node/dummy-trace-logger.ts b/extensions/eclipse-che-theia-plugin-remote/src/node/dummy-trace-logger.ts similarity index 100% rename from dockerfiles/theia-endpoint-runtime/src/node/dummy-trace-logger.ts rename to extensions/eclipse-che-theia-plugin-remote/src/node/dummy-trace-logger.ts diff --git a/dockerfiles/theia-endpoint-runtime/src/node/hosted-plugin-remote.ts b/extensions/eclipse-che-theia-plugin-remote/src/node/hosted-plugin-remote.ts similarity index 100% rename from dockerfiles/theia-endpoint-runtime/src/node/hosted-plugin-remote.ts rename to extensions/eclipse-che-theia-plugin-remote/src/node/hosted-plugin-remote.ts diff --git a/dockerfiles/theia-endpoint-runtime/src/node/plugin-discovery.ts b/extensions/eclipse-che-theia-plugin-remote/src/node/plugin-discovery.ts similarity index 100% rename from dockerfiles/theia-endpoint-runtime/src/node/plugin-discovery.ts rename to extensions/eclipse-che-theia-plugin-remote/src/node/plugin-discovery.ts diff --git a/dockerfiles/theia-endpoint-runtime/src/node/plugin-remote-backend-module.ts b/extensions/eclipse-che-theia-plugin-remote/src/node/plugin-remote-backend-module.ts similarity index 100% rename from dockerfiles/theia-endpoint-runtime/src/node/plugin-remote-backend-module.ts rename to extensions/eclipse-che-theia-plugin-remote/src/node/plugin-remote-backend-module.ts diff --git a/dockerfiles/theia-endpoint-runtime/src/node/plugin-remote-init.ts b/extensions/eclipse-che-theia-plugin-remote/src/node/plugin-remote-init.ts similarity index 100% rename from dockerfiles/theia-endpoint-runtime/src/node/plugin-remote-init.ts rename to extensions/eclipse-che-theia-plugin-remote/src/node/plugin-remote-init.ts diff --git a/dockerfiles/theia-endpoint-runtime/src/node/plugin-remote-mapping.ts b/extensions/eclipse-che-theia-plugin-remote/src/node/plugin-remote-mapping.ts similarity index 100% rename from dockerfiles/theia-endpoint-runtime/src/node/plugin-remote-mapping.ts rename to extensions/eclipse-che-theia-plugin-remote/src/node/plugin-remote-mapping.ts diff --git a/dockerfiles/theia-endpoint-runtime/src/node/plugin-remote.ts b/extensions/eclipse-che-theia-plugin-remote/src/node/plugin-remote.ts similarity index 100% rename from dockerfiles/theia-endpoint-runtime/src/node/plugin-remote.ts rename to extensions/eclipse-che-theia-plugin-remote/src/node/plugin-remote.ts diff --git a/dockerfiles/theia-endpoint-runtime/src/node/remote-metadata-processor.ts b/extensions/eclipse-che-theia-plugin-remote/src/node/remote-metadata-processor.ts similarity index 100% rename from dockerfiles/theia-endpoint-runtime/src/node/remote-metadata-processor.ts rename to extensions/eclipse-che-theia-plugin-remote/src/node/remote-metadata-processor.ts diff --git a/dockerfiles/theia-endpoint-runtime/src/node/server-plugin-proxy-runner.ts b/extensions/eclipse-che-theia-plugin-remote/src/node/server-plugin-proxy-runner.ts similarity index 100% rename from dockerfiles/theia-endpoint-runtime/src/node/server-plugin-proxy-runner.ts rename to extensions/eclipse-che-theia-plugin-remote/src/node/server-plugin-proxy-runner.ts diff --git a/dockerfiles/theia-endpoint-runtime/src/node/terminal-container-aware.ts b/extensions/eclipse-che-theia-plugin-remote/src/node/terminal-container-aware.ts similarity index 100% rename from dockerfiles/theia-endpoint-runtime/src/node/terminal-container-aware.ts rename to extensions/eclipse-che-theia-plugin-remote/src/node/terminal-container-aware.ts diff --git a/dockerfiles/theia-endpoint-runtime/src/node/websocket.ts b/extensions/eclipse-che-theia-plugin-remote/src/node/websocket.ts similarity index 100% rename from dockerfiles/theia-endpoint-runtime/src/node/websocket.ts rename to extensions/eclipse-che-theia-plugin-remote/src/node/websocket.ts diff --git a/dockerfiles/theia-endpoint-runtime/tsconfig.json b/extensions/eclipse-che-theia-plugin-remote/tsconfig.json similarity index 100% rename from dockerfiles/theia-endpoint-runtime/tsconfig.json rename to extensions/eclipse-che-theia-plugin-remote/tsconfig.json diff --git a/dockerfiles/theia-endpoint-runtime/tsfmt.json b/extensions/eclipse-che-theia-plugin-remote/tsfmt.json similarity index 100% rename from dockerfiles/theia-endpoint-runtime/tsfmt.json rename to extensions/eclipse-che-theia-plugin-remote/tsfmt.json diff --git a/dockerfiles/theia-endpoint-runtime/tslint.json b/extensions/eclipse-che-theia-plugin-remote/tslint.json similarity index 100% rename from dockerfiles/theia-endpoint-runtime/tslint.json rename to extensions/eclipse-che-theia-plugin-remote/tslint.json