diff --git a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineProcess.java b/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineProcess.java deleted file mode 100644 index 87cfeab5dc..0000000000 --- a/core/che-core-api-model/src/main/java/org/eclipse/che/api/core/model/machine/MachineProcess.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.api.core.model.machine; - -import org.eclipse.che.api.core.model.workspace.config.Command; - -/** - * Describe process running in a machine - * - * @author andrew00x - */ -public interface MachineProcess extends Command { - /** - * Returns pid of the process. - * To be able to control from the clients pid should be valid even if process isn't started yet. - * - * @return pid of the process - */ - int getPid(); - - /** - * Checks is process is running or not. - * - * @return {@code true} if process running and {@code false} otherwise - */ - boolean isAlive(); - - /** Returns websocket chanel for execution logs of command */ - String getOutputChannel(); -} diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/CommandOutputConsole.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/CommandOutputConsole.java index f4fdf31794..d1a47381ce 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/CommandOutputConsole.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/CommandOutputConsole.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.che.ide.console; -import org.eclipse.che.api.machine.shared.dto.MachineProcessDto; import org.eclipse.che.api.machine.shared.dto.execagent.ProcessSubscribeResponseDto; import org.eclipse.che.api.machine.shared.dto.execagent.event.ProcessDiedEventDto; import org.eclipse.che.api.machine.shared.dto.execagent.event.ProcessStartedEventDto; @@ -43,12 +42,6 @@ public interface CommandOutputConsole extends OutputConsole { @Deprecated void listenToOutput(String wsChannel); - /** - * Attaches to the process launched by the command. - */ - @Deprecated - void attachToProcess(MachineProcessDto process); - /** * Get an output console related operations that should be performed when * an standard error message received diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/CommandOutputConsolePresenter.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/CommandOutputConsolePresenter.java index e7c998b5d1..c4e32e3075 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/CommandOutputConsolePresenter.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/console/CommandOutputConsolePresenter.java @@ -15,7 +15,6 @@ import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.google.web.bindery.event.shared.EventBus; -import org.eclipse.che.api.machine.shared.dto.MachineProcessDto; import org.eclipse.che.api.machine.shared.dto.execagent.ProcessSubscribeResponseDto; import org.eclipse.che.api.machine.shared.dto.execagent.event.ProcessDiedEventDto; import org.eclipse.che.api.machine.shared.dto.execagent.event.ProcessStartedEventDto; @@ -140,10 +139,6 @@ public class CommandOutputConsolePresenter implements CommandOutputConsole, Outp public void listenToOutput(String wsChannel) { } - @Override - public void attachToProcess(MachineProcessDto process) { - } - @Override public Consumer getStdErrConsumer() { return event -> { diff --git a/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineProcessDto.java b/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineProcessDto.java deleted file mode 100644 index 6cf85ffdd2..0000000000 --- a/wsmaster/che-core-api-machine-shared/src/main/java/org/eclipse/che/api/machine/shared/dto/MachineProcessDto.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Codenvy, S.A. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Codenvy, S.A. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.api.machine.shared.dto; - -import org.eclipse.che.api.core.rest.shared.dto.Hyperlinks; -import org.eclipse.che.api.core.rest.shared.dto.Link; -import org.eclipse.che.api.core.model.workspace.config.Command; -import org.eclipse.che.api.core.model.machine.MachineProcess; -import org.eclipse.che.dto.shared.DTO; - -import java.util.List; -import java.util.Map; - -/** - * Describes process created from {@link Command} in machine - * - * @author andrew00x - */ -@DTO -public interface MachineProcessDto extends MachineProcess, Hyperlinks { - void setPid(int pid); - - MachineProcessDto withPid(int pid); - - void setCommandLine(String commandLine); - - MachineProcessDto withCommandLine(String commandLine); - - void setAlive(boolean isAlive); - - MachineProcessDto withAlive(boolean isAlive); - - void setName(String commandName); - - MachineProcessDto withName(String commandName); - - void setType(String type); - - MachineProcessDto withType(String type); - - void setOutputChannel(String outputChannel); - - MachineProcessDto withOutputChannel(String outputChannel); - - @Override - MachineProcessDto withLinks(List links); - - void setAttributes(Map attributes); - - MachineProcessDto withAttributes(Map attributes); -}