Remove workspace loader from Che Server

2021-02-04 10:16:52 +02:00 · 2021-02-04 10:16:52 +02:00 · e9ce8078a4
parent 2b9feb0c22
commit e9ce8078a4
12 changed files with 4 additions and 154 deletions
--- a/.github/ISSUE_TEMPLATE/release.md
+++ b/.github/ISSUE_TEMPLATE/release.md
@ -16,7 +16,7 @@ In series, the following will be released via [che-release](https://github.com/e

 * che-theia, che-machine-exec, che-devfile registry, 
 * che-plugin-registry (once che-theia and machine-exec are done)
-* che-parent, che-dashboard, che-workspace-loader, and che (server assembly)
+* che-parent, che-dashboard, and che (server assembly)
  * Note that [release to Maven Central is deprecated](https://github.com/eclipse/che/issues/18941)
 * che-operator

@ -26,7 +26,7 @@ Then, these steps will be done, which still [require some manual intervention](h
 * chectl

 - [ ] che-theia, che-machine-exec, che-devfile-registry, che-plugin-registry
- [ ] che-parent, che-dashboard, che-workspace-loader, che
+- [ ] che-parent, che-dashboard, che
 - [ ] che-operator _(depends on all of the above)_
 - [ ] chectl _(depends on che-operator)_
 - [ ] [Che community operator PRs](https://github.com/operator-framework/community-operators/pulls?q=%22Update+eclipse-che+operator%22+is%3Aopen) _(depends on che-operator)_
@ -49,7 +49,6 @@ If this is a .0 release:
 | [che-plugin-registry](https://github.com/eclipse/che-plugin-registry/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-plugin-registry/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che-plugin-registry/actions?query=workflow%3A%22Release+Che+Plugin+Registry%22) | [`eclipse/che-plugin-registry`](https://quay.io/eclipse/che-plugin-registry)|
 | [che-parent](https://github.com/eclipse/che-parent/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-parent/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che/actions?query=workflow%3A%22Release+Che+Server%22) | [che-server](https://search.maven.org/search?q=a:che-server) <sup>[2]</sup> |
 | [che-dashboard](https://github.com/eclipse/che-dashboard/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-dashboard/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che-dashboard/actions?query=workflow%3A%22Release+Che+Dashboard%22) | [`che-dashboard`](https://quay.io/repository/eclipse/che-dashboard?tag=next&tab=tags) |
-| [che-workspace-loader](https://github.com/eclipse/che-workspace-loader/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-workspace-loader/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che-workspace-loader/actions?query=workflow%3A%22Release+Che+Workspace+Loader%22) | [`che-workspace-loader`](https://quay.io/repository/eclipse/che-workspace-loader?tag=next&tab=tags) |
 | [che](https://github.com/eclipse/che/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che/actions?query=workflow%3A%22Release+Che+Server%22) | [che.core](https://search.maven.org/search?q=che.core) <sup>[2]</sup>,<br/> [`eclipse/che-server`](https://quay.io/eclipse/che-server),<br/>[`eclipse/che-endpoint-watcher`](https://quay.io/eclipse/che-endpoint-watcher),<br/> [`eclipse/che-keycloak`](https://quay.io/eclipse/che-keycloak),<br/> [`eclipse/che-postgres`](https://quay.io/eclipse/che-postgres),<br/> [`eclipse/che-server`](https://quay.io/eclipse/che-server),<br/> [`eclipse/che-e2e`](https://quay.io/eclipse/che-e2e) |
 | [che-operator](https://github.com/eclipse/che-operator/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-operator/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che-operator/actions?query=workflow%3A%22Release+Che+Operator%22) | [`eclipse/che-operator`](https://quay.io/eclipse/che-operator)|
 | [chectl](https://github.com/che-incubator/chectl/blob/master/RELEASE.md) | [make-release.sh](https://github.com/che-incubator/chectl/blob/master/make-release.sh) | [Action](https://github.com/che-incubator/chectl/actions) | [chectl releases](https://github.com/che-incubator/chectl/releases)
--- a/.repositories.yaml
+++ b/.repositories.yaml
@ -103,13 +103,6 @@ repositories:
    description: >-
      JS library to interact with a che-server.
    useCheReleaseLifecycle: false
-  - url: https://github.com/eclipse/che-workspace-loader
-    name: workspace-loader
-    description: >-
-      UI to load workspaces within dashboard
-    devfile: https://github.com/eclipse/che-workspace-loader/blob/master/devfile.yaml
-    doc: https://github.com/eclipse/che-workspace-loader/blob/master/CONTRIBUTING.md
-    useCheReleaseLifecycle: true
  - url: https://github.com/che-dockerfiles/che-sidecar-bazel
    name: che-sidecar-bazel
    description: >-
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -30,7 +30,6 @@ Repository | Component | Description | Devfile | Documentation
 [plugin-registry](https://github.com/eclipse/che-plugin-registry) | | The default set of Che plugins (vscode extension + containers) or editors that could be installed on any Che workspaces. |  | 
 [website](https://github.com/eclipse/che-website) | | https://eclipse.org/che website source code. | [devfile](https://github.com/eclipse/che-website/blob/master/devfile.yaml) | 
 [workspace-client](https://github.com/eclipse/che-workspace-client) | | JS library to interact with a che-server. |  | 
-[workspace-loader](https://github.com/eclipse/che-workspace-loader) | | UI to load workspaces within dashboard | [devfile](https://github.com/eclipse/che-workspace-loader/blob/master/devfile.yaml) | [doc](https://github.com/eclipse/che-workspace-loader/blob/master/CONTRIBUTING.md)
 [che-sidecar-bazel](https://github.com/che-dockerfiles/che-sidecar-bazel) | | Eclipse Che Sidecar container for Bazel tooling |  | 
 [che-sidecar-protobuf](https://github.com/che-dockerfiles/che-sidecar-protobuf) | | Eclipse Che Sidecar container for Protobuf tooling |  | 
 [che-sidecar-tekton](https://github.com/che-dockerfiles/che-sidecar-tekton) | | Eclipse Che Sidecar container for Tekton tooling |  | 
--- a/RELEASE.md
+++ b/RELEASE.md
@ -16,7 +16,7 @@ In series, the following will be released via [che-release](https://github.com/e

 * che-theia, che-machine-exec, che-devfile registry, 
 * che-plugin-registry (once che-theia and machine-exec are done)
-* che-parent, che-dashboard, che-workspace-loader
+* che-parent, che-dashboard
 * che (server assembly, with maven artifacts + containers)

 Then manually:
@ -30,7 +30,7 @@ Then by script:
 * chectl

 - [ ] che-theia, che-machine-exec, che-devfile-registry, che-plugin-registry
- [ ] che-parent, che-dashboard, che-workspace-loader
+- [ ] che-parent, che-dashboard
 - [ ] che
 - [ ] che-operator _(depends on all of the above)_
 - [ ] chectl _(depends on all of the above)_
@ -54,7 +54,6 @@ If this is a .0 release:
 | @mkuznyetsov  | [che-devfile-registry](https://github.com/eclipse/che-devfile-registry/blob/master/RELEASE.md) | [cico_release.sh](https://github.com/eclipse/che-release/blob/master/cico_release.sh) | [centos](https://ci.centos.org/job/devtools-che-devfile-registry-release/) | [`eclipse/che-devfile-registry`](https://quay.io/eclipse/che-devfile-registry)| 
 | @mkuznyetsov  | [che-parent](https://github.com/eclipse/che/blob/master/RELEASE.md) | [cico_release.sh](https://github.com/eclipse/che-release/blob/master/cico_release.sh) | [centos](https://ci.centos.org/job/devtools-che-release-che-release) | [che-parent](https://search.maven.org/search?q=a:che-parent) |
 | @mkuznyetsov  | [che-dashboard](https://github.com/eclipse/che-dashboard/blob/master/RELEASE.md) | [cico_release.sh](https://github.com/eclipse/che-release/blob/master/cico_release.sh) | [centos](https://ci.centos.org/job/devtools-che-release-che-release/) | [`che-dashboard`](https://quay.io/repository/eclipse/che-dashboard?tag=next&tab=tags) |
-| @mkuznyetsov  | [che-workspace-loader](https://github.com/eclipse/che-workspace-loader/blob/master/RELEASE.md) | [cico_release.sh](https://github.com/eclipse/che-release/blob/master/cico_release.sh) | [centos](https://ci.centos.org/job/devtools-che-release-che-release) | [`che-workspace-loader`](https://quay.io/repository/eclipse/che-workspace-loader?tag=next&tab=tags) |
 | @mkuznyetsov  | [che](https://github.com/eclipse/che/blob/master/RELEASE.md) | [cico_release.sh](https://github.com/eclipse/che-release/blob/master/cico_release.sh) | [centos](https://ci.centos.org/job/devtools-che-release-che-release) | [che.core](https://search.maven.org/search?q=che.core), [che.server](https://mvnrepository.com/artifact/org.eclipse.che/che-server)<br/> [`eclipse/che-server`](https://quay.io/eclipse/che-server),<br/>[`eclipse/che-endpoint-watcher`](https://quay.io/eclipse/che-endpoint-watcher),<br/> [`eclipse/che-keycloak`](https://quay.io/eclipse/che-keycloak),<br/> [`eclipse/che-postgres`](https://quay.io/eclipse/che-postgres),<br/> [`eclipse/che-server`](https://quay.io/eclipse/che-server),<br/> [`eclipse/che-e2e`](https://quay.io/eclipse/che-e2e) |
 | @tolusha| [che-operator](https://github.com/eclipse/che-operator/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-operator/blob/master/make-release.sh) | ? | [`eclipse/che-operator`](https://quay.io/eclipse/che-operator)| 
 | @tolusha| [chectl](https://github.com/che-incubator/chectl/blob/master/RELEASE.md) | [make-release.sh](https://github.com/che-incubator/chectl/blob/master/make-release.sh) | [travis](https://travis-ci.org/che-incubator/chectl) | [chectl releases](https://github.com/che-incubator/chectl/releases)
--- a/assembly/assembly-main/pom.xml
+++ b/assembly/assembly-main/pom.xml
@ -43,11 +43,6 @@
            <artifactId>assembly-swagger-war</artifactId>
            <type>war</type>
        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che</groupId>
-            <artifactId>assembly-workspace-loader-war</artifactId>
-            <type>war</type>
-        </dependency>
        <dependency>
            <groupId>org.eclipse.che</groupId>
            <artifactId>assembly-wsmaster-war</artifactId>
@ -108,13 +103,6 @@
                                    <overWrite>true</overWrite>
                                    <outputDirectory>${project.build.directory}/dependency/assembly-dashboard-war</outputDirectory>
                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.eclipse.che</groupId>
-                                    <artifactId>assembly-workspace-loader-war</artifactId>
-                                    <type>war</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/dependency/assembly-workspace-loader-war</outputDirectory>
-                                </artifactItem>
                            </artifactItems>
                        </configuration>
                    </execution>
--- a/assembly/assembly-main/src/assembly/assembly.xml
+++ b/assembly/assembly-main/src/assembly/assembly.xml
@ -68,10 +68,6 @@
            <directory>${project.build.directory}/dependency/assembly-dashboard-war</directory>
            <outputDirectory>tomcat/webapps/dashboard</outputDirectory>
        </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/dependency/assembly-workspace-loader-war</directory>
-            <outputDirectory>tomcat/webapps/workspace-loader</outputDirectory>
-        </fileSet>
       <fileSet>
            <directory>${project.basedir}/src/assembly</directory>
            <outputDirectory></outputDirectory>
--- a/assembly/assembly-workspace-loader-war/pom.xml
+++ b/assembly/assembly-workspace-loader-war/pom.xml
@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2018-2018 Red Hat, Inc.
-    This program and the accompanying materials are made
-    available under the terms of the Eclipse Public License 2.0
-    which is available at https://www.eclipse.org/legal/epl-2.0/
-
-    SPDX-License-Identifier: EPL-2.0
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>che-assembly-parent</artifactId>
-        <groupId>org.eclipse.che</groupId>
-        <version>7.27.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>assembly-workspace-loader-war</artifactId>
-    <packaging>war</packaging>
-    <name>Che Assembly :: Workspace Loader war</name>
-    <description>Packages Che Workspace Loader application as a Java web app</description>
-    <inceptionYear>2018</inceptionYear>
-    <dependencies>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>
--- a/assembly/assembly-workspace-loader-war/src/main/java/org/eclipse/che/WSLoaderController.java
+++ b/assembly/assembly-workspace-loader-war/src/main/java/org/eclipse/che/WSLoaderController.java
@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2018-2018 Red Hat, Inc.
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *   Red Hat, Inc. - initial API and implementation
- */
-package org.eclipse.che;
-
-import java.io.IOException;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Defines a controller that is serving the index.html page of a workspace loader.
- *
- * @author Florent Benoit
- */
-public class WSLoaderController extends HttpServlet {
-
-  /** Use the default dispatcher to serve the resource. */
-  @Override
-  protected void doGet(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
-
-    RequestDispatcher dispatcher = request.getRequestDispatcher("/loader/index.html");
-    dispatcher.forward(request, response);
-  }
-}
--- a/assembly/assembly-workspace-loader-war/src/main/webapp/WEB-INF/web.xml
+++ b/assembly/assembly-workspace-loader-war/src/main/webapp/WEB-INF/web.xml
@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2018-2018 Red Hat, Inc.
-    This program and the accompanying materials are made
-    available under the terms of the Eclipse Public License 2.0
-    which is available at https://www.eclipse.org/legal/epl-2.0/
-
-    SPDX-License-Identifier: EPL-2.0
-
-    Contributors:
-      Red Hat, Inc. - initial API and implementation
-
-->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-         version="3.0"
-         metadata-complete="true">
-    <absolute-ordering></absolute-ordering>
-
-    <servlet>
-        <servlet-name>WSLoader</servlet-name>
-        <servlet-class>org.eclipse.che.WSLoaderController</servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>WSLoader</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>default</servlet-name>
-        <url-pattern>/loader/*</url-pattern>
-    </servlet-mapping>
-
-</web-app>
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@ -27,7 +27,6 @@
        <module>assembly-swagger-war</module>
        <module>assembly-wsmaster-war</module>
        <module>assembly-root-war</module>
-        <module>assembly-workspace-loader-war</module>
        <module>assembly-dashboard-war</module>
        <module>assembly-che-tomcat8</module>
        <module>assembly-main</module>
--- a/dockerfiles/che/Dockerfile
+++ b/dockerfiles/che/Dockerfile
@ -10,11 +10,8 @@
 # this is workaround to handle that.
 ARG CHE_DASHBOARD_ORGANIZATION=quay.io/eclipse
 ARG CHE_DASHBOARD_VERSION=next
-ARG CHE_WORKSPACE_LOADER_ORGANIZATION=quay.io/eclipse
-ARG CHE_WORKSPACE_LOADER_VERSION=next

 FROM ${CHE_DASHBOARD_ORGANIZATION}/che-dashboard:${CHE_DASHBOARD_VERSION} as che_dashboard_base
-FROM ${CHE_WORKSPACE_LOADER_ORGANIZATION}/che-workspace-loader:${CHE_WORKSPACE_LOADER_VERSION} as che_workspace_loader_base

 FROM adoptopenjdk/openjdk11:jre-11.0.8_10
 ENV LANG=C.UTF-8
@ -25,6 +22,5 @@ ENTRYPOINT ["/entrypoint.sh"]
 RUN mkdir /logs /data && \
    chmod 0777 /logs /data
 COPY --from=che_dashboard_base /usr/local/apache2/htdocs/dashboard /home/user/eclipse-che/tomcat/webapps/dashboard
-COPY --from=che_workspace_loader_base /usr/local/apache2/htdocs/workspace-loader/ /home/user/eclipse-che/tomcat/webapps/workspace-loader
 ADD eclipse-che /home/user/eclipse-che
 RUN find /home/user -type d -exec chmod 777 {} \;
--- a/pom.xml
+++ b/pom.xml
@ -668,12 +668,6 @@
                <version>${che.version}</version>
                <type>war</type>
            </dependency>
-            <dependency>
-                <groupId>org.eclipse.che</groupId>
-                <artifactId>assembly-workspace-loader-war</artifactId>
-                <version>${che.version}</version>
-                <type>war</type>
-            </dependency>
            <dependency>
                <groupId>org.eclipse.che</groupId>
                <artifactId>assembly-wsmaster-war</artifactId>
@ -1241,12 +1235,6 @@
                <artifactId>che-selenium-test</artifactId>
                <version>${che.version}</version>
            </dependency>
-            <dependency>
-                <groupId>org.eclipse.che.workspace.loader</groupId>
-                <artifactId>che-workspace-loader</artifactId>
-                <version>${che.version}</version>
-                <type>zip</type>
-            </dependency>
            <dependency>
                <groupId>org.eclipse.persistence</groupId>
                <artifactId>javax.persistence</artifactId>