Merge branches '#3119' and 'master' of github.com:eclipse/che into #3119

Signed-off-by: Evgen Vidolob <[email protected]>

.gitignore

@@ -21,7 +21,7 @@ config/
 
 # Compiled source #
 ###################
-*.com
+!*.com/
 *.class
 *.dll
 *.exe
@@ -48,8 +48,8 @@ config/
 # Logs and databases #
 ######################
 *.log
-*.sql
 *.sqlite
+npm-debug.log.*
 
 # OS generated files #
 ######################

Dockerfile

@@ -34,18 +34,9 @@ RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community" >> /etc/apk/reposit
     apk add --update ca-certificates curl openssl openjdk8 sudo bash && \
     curl -sSL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-${DOCKER_VERSION}" -o /usr/bin/docker && \
     chmod +x /usr/bin/docker && \
-    addgroup -S user -g 1000 && \
-    adduser -S user -h /home/user -s /bin/bash -G root -u 1000 -D && \
-    addgroup -S docker -g 101 && \
-    adduser user docker && \
-    adduser user user && \
-    adduser user users && \
-    addgroup -g 50 -S docker4mac && \
-    adduser user docker4mac && \
     echo "%root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
     rm -rf /tmp/* /var/cache/apk/*
 
 EXPOSE 8000 8080
-USER user
 ADD assembly/assembly-main/target/eclipse-che-*/eclipse-che-* /home/user/che/
 ENTRYPOINT ["/home/user/che/bin/docker.sh"]

assembly/assembly-ide-war/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>5.0.0-M8-SNAPSHOT</version>
+        <version>5.0.0-M9-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-ide-war</artifactId>
     <packaging>war</packaging>
@@ -80,6 +80,26 @@
             <groupId>org.eclipse.che.lib</groupId>
             <artifactId>che-swagger-module</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-java-testing-core-ide</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-java-testing-core-shared</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-java-testing-junit-ide</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-java-testing-junit-shared</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-java-testing-testng-ide</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-cpp-lang-ide</artifactId>
@@ -240,6 +260,10 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-web-ext-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-zend-debugger-ide</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-user</artifactId>

assembly/assembly-ide-war/src/main/resources/org/eclipse/che/ide/IDE.gwt.xml

@@ -46,6 +46,7 @@
     <inherits name='org.eclipse.che.plugin.gdb.Gdb'/>
     <inherits name='org.eclipse.che.plugin.nodejsdbg.NodeJsDebugger'/>
     <inherits name='org.eclipse.che.plugin.jdb.JavaDebugger'/>
+    <inherits name='org.eclipse.che.plugin.zdb.ZendDebugger'/>
     <inherits name='org.eclipse.che.ide.extension.machine.Machine'/>
     <inherits name='org.eclipse.che.plugin.maven.Maven'/>
     <inherits name='org.eclipse.che.ide.ext.gwt.GWT'/>
@@ -84,6 +85,7 @@
     <inherits name="org.eclipse.che.api.languageserver.LanguageServer"/>
 
     <inherits name="org.eclipse.che.plugin.svn.Subversion"/>
+    <inherits name="org.eclipse.che.ide.ext.java.testing.core.TestExtension"/>
 
     <stylesheet src="IDE.css"/>
 
@@ -93,4 +95,5 @@
     <!-- Specify the paths for translatable code                    -->
     <source path='client'/>
     <source path='shared'/>
+
 </module>

assembly/assembly-main/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>5.0.0-M8-SNAPSHOT</version>
+        <version>5.0.0-M9-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-main</artifactId>
     <packaging>pom</packaging>
@@ -37,6 +37,18 @@
             <artifactId>assembly-wsmaster-war</artifactId>
             <type>war</type>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che</groupId>
+            <artifactId>exec-agent</artifactId>
+            <type>tar.gz</type>
+            <classifier>linux_amd64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che</groupId>
+            <artifactId>exec-agent</artifactId>
+            <type>tar.gz</type>
+            <classifier>linux_arm7</classifier>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-ide-stacks</artifactId>
@@ -62,18 +74,6 @@
             <artifactId>che-tomcat8-slf4j-logback</artifactId>
             <type>zip</type>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.lib</groupId>
-            <artifactId>che-websocket-terminal</artifactId>
-            <type>tar.gz</type>
-            <classifier>linux_amd64</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.lib</groupId>
-            <artifactId>che-websocket-terminal</artifactId>
-            <type>tar.gz</type>
-            <classifier>linux_arm7</classifier>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-sdk-tools</artifactId>

assembly/assembly-main/src/assembly/assembly.xml

@@ -70,7 +70,7 @@
             <outputDirectory>lib/linux_amd64/terminal</outputDirectory>
             <outputFileNameMapping>websocket-terminal-linux_amd64.tar.gz</outputFileNameMapping>
             <includes>
-                <include>org.eclipse.che.lib:che-websocket-terminal:tar.gz:linux_amd64</include>
+                <include>org.eclipse.che:exec-agent:tar.gz:linux_amd64</include>
             </includes>
         </dependencySet>
         <dependencySet>
@@ -79,7 +79,7 @@
             <outputDirectory>lib/linux_arm7/terminal</outputDirectory>
             <outputFileNameMapping>websocket-terminal-linux_arm7.tar.gz</outputFileNameMapping>
             <includes>
-                <include>org.eclipse.che.lib:che-websocket-terminal:tar.gz:linux_arm7</include>
+                <include>org.eclipse.che:exec-agent:tar.gz:linux_arm7</include>
             </includes>
         </dependencySet>
         <dependencySet>

assembly/assembly-main/src/assembly/bin/docker.sh

@@ -110,7 +110,7 @@ init() {
 
   if [ "$CHE_IN_VM" = "true" ]; then
     # CHE_DOCKER_MACHINE_HOST_EXTERNAL must be set if you are in a VM. 
-    HOSTNAME=$(get_docker_external_hostname)
+    HOSTNAME=${CHE_DOCKER_MACHINE_HOST_EXTERNAL:-$(get_docker_external_hostname)}
     if has_external_hostname; then
       # Internal property used by Che to set hostname.
       # See: LocalDockerInstanceRuntimeInfo.java#L9
@@ -121,10 +121,6 @@ init() {
     export CHE_WORKSPACE_STORAGE_CREATE_FOLDERS=false
   fi
 
-  # Ensure that the user "user" has permissions for CHE_HOME and CHE_DATA
-  sudo chown -R user:user ${CHE_HOME}
-  sudo chown -R user:user ${CHE_DATA}
-
   # Move files from /lib to /lib-copy.  This puts files onto the host.
   rm -rf ${CHE_DATA}/lib/*
   mkdir -p ${CHE_DATA}/lib  
@@ -147,11 +143,16 @@ init() {
 }
 
 get_che_data_from_host() {
+  DEFAULT_DATA_HOST_PATH=/home/user/che
   CHE_SERVER_CONTAINER_ID=$(get_che_server_container_id)
-  echo $(docker inspect --format='{{(index .Volumes "/data")}}' $CHE_SERVER_CONTAINER_ID)
+  # If `docker inspect` fails $DEFAULT_DATA_HOST_PATH is returned
+  echo $(docker inspect --format='{{(index .Volumes "/data")}}' $CHE_SERVER_CONTAINER_ID 2>/dev/null || echo $DEFAULT_DATA_HOST_PATH)
 }
 
 get_che_server_container_id() {
+  # Returning `hostname` doesn't work when running Che on OpenShift/Kubernetes.
+  # In these cases `hostname` correspond to the pod ID that is different from
+  # the container ID
   hostname
 }
 

assembly/assembly-wsagent-server/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>5.0.0-M8-SNAPSHOT</version>
+        <version>5.0.0-M9-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-wsagent-server</artifactId>
     <packaging>pom</packaging>

assembly/assembly-wsagent-war/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>5.0.0-M8-SNAPSHOT</version>
+        <version>5.0.0-M9-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-wsagent-war</artifactId>
     <packaging>war</packaging>
@@ -102,6 +102,30 @@
             <groupId>org.eclipse.che.lib</groupId>
             <artifactId>che-swagger-module</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-java-testing-classpath-maven-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-java-testing-core-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-java-testing-core-shared</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-java-testing-junit-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-java-testing-junit-shared</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-java-testing-testng-server</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-cpp-lang-server</artifactId>
@@ -200,6 +224,10 @@
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-svn-ext-server</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.plugin</groupId>
+            <artifactId>che-plugin-zend-debugger-server</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.plugin</groupId>
             <artifactId>che-plugin-web-ext-server</artifactId>

assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/CheWebSocketEndpoint.java

@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.che.wsagent.server;
 
+import org.eclipse.che.api.core.websocket.WebSocketMessageReceiver;
 import org.eclipse.che.api.core.websocket.impl.BasicWebSocketEndpoint;
 import org.eclipse.che.api.core.websocket.impl.GuiceInjectorEndpointConfigurator;
-import org.eclipse.che.api.core.websocket.impl.PendingMessagesReSender;
+import org.eclipse.che.api.core.websocket.impl.MessagesReSender;
 import org.eclipse.che.api.core.websocket.impl.WebSocketSessionRegistry;
-import org.eclipse.che.api.core.websocket.impl.WebSocketTransmissionDispatcher;
 
 import javax.inject.Inject;
 import javax.websocket.server.ServerEndpoint;
@@ -31,8 +31,8 @@ public class CheWebSocketEndpoint extends BasicWebSocketEndpoint {
 
     @Inject
     public CheWebSocketEndpoint(WebSocketSessionRegistry registry,
-                                PendingMessagesReSender reSender,
-                                WebSocketTransmissionDispatcher dispatcher) {
-        super(registry, reSender, dispatcher);
+                                MessagesReSender reSender,
+                                WebSocketMessageReceiver receiver) {
+        super(registry, reSender, receiver);
     }
 }

assembly/assembly-wsagent-war/src/main/java/org/eclipse/che/wsagent/server/WsAgentModule.java

@@ -20,28 +20,18 @@
 import org.eclipse.che.UriApiEndpointProvider;
 import org.eclipse.che.UserTokenProvider;
 import org.eclipse.che.api.auth.oauth.OAuthTokenProvider;
-import org.eclipse.che.api.core.jsonrpc.JsonRpcRequestReceiver;
-import org.eclipse.che.api.core.jsonrpc.JsonRpcRequestTransmitter;
-import org.eclipse.che.api.core.jsonrpc.JsonRpcResponseReceiver;
-import org.eclipse.che.api.core.jsonrpc.JsonRpcResponseTransmitter;
-import org.eclipse.che.api.core.jsonrpc.impl.BasicJsonRpcObjectValidator;
-import org.eclipse.che.api.core.jsonrpc.impl.JsonRpcDispatcher;
-import org.eclipse.che.api.core.jsonrpc.impl.JsonRpcObjectValidator;
-import org.eclipse.che.api.core.jsonrpc.impl.WebSocketJsonRpcDispatcher;
-import org.eclipse.che.api.core.jsonrpc.impl.WebSocketJsonRpcRequestDispatcher;
-import org.eclipse.che.api.core.jsonrpc.impl.WebSocketJsonRpcRequestTransmitter;
-import org.eclipse.che.api.core.jsonrpc.impl.WebSocketJsonRpcResponseDispatcher;
-import org.eclipse.che.api.core.jsonrpc.impl.WebSocketJsonRpcResponseTransmitter;
+import org.eclipse.che.api.core.jsonrpc.RequestHandler;
+import org.eclipse.che.api.core.jsonrpc.RequestTransmitter;
+import org.eclipse.che.api.core.jsonrpc.impl.WebSocketToJsonRpcDispatcher;
+import org.eclipse.che.api.core.jsonrpc.impl.WebSocketTransmitter;
 import org.eclipse.che.api.core.notification.WSocketEventBusClient;
 import org.eclipse.che.api.core.rest.ApiInfoService;
 import org.eclipse.che.api.core.rest.CoreRestModule;
 import org.eclipse.che.api.core.util.FileCleaner.FileCleanerModule;
 import org.eclipse.che.api.core.websocket.WebSocketMessageReceiver;
 import org.eclipse.che.api.core.websocket.WebSocketMessageTransmitter;
 import org.eclipse.che.api.core.websocket.impl.BasicWebSocketMessageTransmitter;
-import org.eclipse.che.api.core.websocket.impl.BasicWebSocketTransmissionValidator;
 import org.eclipse.che.api.core.websocket.impl.GuiceInjectorEndpointConfigurator;
-import org.eclipse.che.api.core.websocket.impl.WebSocketTransmissionValidator;
 import org.eclipse.che.api.git.GitConnectionFactory;
 import org.eclipse.che.api.git.GitUserResolver;
 import org.eclipse.che.api.git.LocalGitUserResolver;
@@ -119,31 +109,13 @@ Pair<String, String>[] propagateEventsProvider(@Named("event.bus.url") String ev
     private void configureWebSocket() {
         requestStaticInjection(GuiceInjectorEndpointConfigurator.class);
 
-        bind(WebSocketTransmissionValidator.class).to(BasicWebSocketTransmissionValidator.class);
-
         bind(WebSocketMessageTransmitter.class).to(BasicWebSocketMessageTransmitter.class);
-
-        MapBinder<String, WebSocketMessageReceiver> receivers =
-                MapBinder.newMapBinder(binder(), String.class, WebSocketMessageReceiver.class);
-
-        receivers.addBinding("jsonrpc-2.0").to(WebSocketJsonRpcDispatcher.class);
+        bind(WebSocketMessageReceiver.class).to(WebSocketToJsonRpcDispatcher.class);
     }
 
     private void configureJsonRpc() {
-        bind(JsonRpcObjectValidator.class).to(BasicJsonRpcObjectValidator.class);
-
-        bind(JsonRpcResponseTransmitter.class).to(WebSocketJsonRpcResponseTransmitter.class);
-        bind(JsonRpcRequestTransmitter.class).to(WebSocketJsonRpcRequestTransmitter.class);
-
-        MapBinder<String, JsonRpcDispatcher> dispatchers =
-                MapBinder.newMapBinder(binder(), String.class, JsonRpcDispatcher.class);
-
-        dispatchers.addBinding("request").to(WebSocketJsonRpcRequestDispatcher.class);
-        dispatchers.addBinding("response").to(WebSocketJsonRpcResponseDispatcher.class);
+        bind(RequestTransmitter.class).to(WebSocketTransmitter.class);
 
-        MapBinder<String, JsonRpcRequestReceiver> requestReceivers =
-                MapBinder.newMapBinder(binder(), String.class, JsonRpcRequestReceiver.class);
-        MapBinder<String, JsonRpcResponseReceiver> responseReceivers =
-                MapBinder.newMapBinder(binder(), String.class, JsonRpcResponseReceiver.class);
+        MapBinder.newMapBinder(binder(), String.class, RequestHandler.class);
     }
 }