From c04314da1a6ecf5ca2100e10dafa7cbeab0bffe4 Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Tue, 19 Sep 2017 17:51:01 +0300 Subject: [PATCH] Fix launching commands --- .../eclipse/che/ide/jsonrpc/WsMasterJsonRpcInitializer.java | 4 ++-- .../che/ide/workspace/events/ServerStatusEventHandler.java | 6 +++--- .../org/eclipse/che/api/workspace/shared/Constants.java | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/jsonrpc/WsMasterJsonRpcInitializer.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/jsonrpc/WsMasterJsonRpcInitializer.java index eb0ad381c6..328def9f2d 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/jsonrpc/WsMasterJsonRpcInitializer.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/jsonrpc/WsMasterJsonRpcInitializer.java @@ -17,7 +17,7 @@ import static org.eclipse.che.api.workspace.shared.Constants.INSTALLER_LOG_METHO import static org.eclipse.che.api.workspace.shared.Constants.LINK_REL_ENVIRONMENT_STATUS_CHANNEL; import static org.eclipse.che.api.workspace.shared.Constants.MACHINE_LOG_METHOD; import static org.eclipse.che.api.workspace.shared.Constants.MACHINE_STATUS_CHANGED_METHOD; -import static org.eclipse.che.api.workspace.shared.Constants.SERVER_EXEC_AGENT_WEBSOCKET_REFERENCE; +import static org.eclipse.che.api.workspace.shared.Constants.SERVER_EXEC_AGENT_HTTP_REFERENCE; import static org.eclipse.che.api.workspace.shared.Constants.SERVER_STATUS_CHANGED_METHOD; import static org.eclipse.che.api.workspace.shared.Constants.SERVER_TERMINAL_REFERENCE; import static org.eclipse.che.api.workspace.shared.Constants.SERVER_WS_AGENT_HTTP_REFERENCE; @@ -203,7 +203,7 @@ public class WsMasterJsonRpcInitializer { eventBus.fireEvent(new WsAgentServerRunningEvent(machine.getName())); } else if (SERVER_TERMINAL_REFERENCE.equals(server.getName())) { eventBus.fireEvent(new TerminalAgentServerRunningEvent(machine.getName())); - } else if (SERVER_EXEC_AGENT_WEBSOCKET_REFERENCE.equals(server.getName())) { + } else if (SERVER_EXEC_AGENT_HTTP_REFERENCE.equals(server.getName())) { eventBus.fireEvent(new ExecAgentServerRunningEvent(machine.getName())); } } diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/events/ServerStatusEventHandler.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/events/ServerStatusEventHandler.java index e37ed5227d..5f255d6af9 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/events/ServerStatusEventHandler.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/events/ServerStatusEventHandler.java @@ -12,7 +12,7 @@ package org.eclipse.che.ide.workspace.events; import static org.eclipse.che.api.core.model.workspace.runtime.ServerStatus.RUNNING; import static org.eclipse.che.api.core.model.workspace.runtime.ServerStatus.STOPPED; -import static org.eclipse.che.api.workspace.shared.Constants.SERVER_EXEC_AGENT_WEBSOCKET_REFERENCE; +import static org.eclipse.che.api.workspace.shared.Constants.SERVER_EXEC_AGENT_HTTP_REFERENCE; import static org.eclipse.che.api.workspace.shared.Constants.SERVER_STATUS_CHANGED_METHOD; import static org.eclipse.che.api.workspace.shared.Constants.SERVER_TERMINAL_REFERENCE; import static org.eclipse.che.api.workspace.shared.Constants.SERVER_WS_AGENT_HTTP_REFERENCE; @@ -87,7 +87,7 @@ class ServerStatusEventHandler { eventBus.fireEvent(new WsAgentServerRunningEvent(event.getMachineName())); } else if (SERVER_TERMINAL_REFERENCE.equals(event.getServerName())) { eventBus.fireEvent(new TerminalAgentServerRunningEvent(event.getMachineName())); - } else if (SERVER_EXEC_AGENT_WEBSOCKET_REFERENCE.equals(event.getServerName())) { + } else if (SERVER_EXEC_AGENT_HTTP_REFERENCE.equals(event.getServerName())) { eventBus.fireEvent(new ExecAgentServerRunningEvent(event.getMachineName())); } } else if (event.getStatus() == STOPPED) { @@ -99,7 +99,7 @@ class ServerStatusEventHandler { eventBus.fireEvent(new WsAgentServerStoppedEvent(event.getMachineName())); } else if (SERVER_TERMINAL_REFERENCE.equals(event.getServerName())) { eventBus.fireEvent(new TerminalAgentServerStoppedEvent(event.getMachineName())); - } else if (SERVER_EXEC_AGENT_WEBSOCKET_REFERENCE.equals(event.getServerName())) { + } else if (SERVER_EXEC_AGENT_HTTP_REFERENCE.equals(event.getServerName())) { eventBus.fireEvent(new ExecAgentServerStoppedEvent(event.getMachineName())); } } diff --git a/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java index b0e6999f1c..73911f5390 100644 --- a/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java +++ b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java @@ -64,6 +64,7 @@ public final class Constants { public static final String SERVER_WS_AGENT_WEBSOCKET_REFERENCE = "wsagent/ws"; public static final String SERVER_TERMINAL_REFERENCE = "terminal"; public static final String SERVER_SSH_REFERENCE = "ssh"; + public static final String SERVER_EXEC_AGENT_HTTP_REFERENCE = "exec-agent/http"; public static final String SERVER_EXEC_AGENT_WEBSOCKET_REFERENCE = "exec-agent/ws"; public static final String WS_AGENT_PORT = "4401/tcp";