CHE-4596: move che-plugin-machine-ext-client to IDE core (#4861)

eclipse-che · Apr 21, 2017 · 6403d21 · 6403d21
1 parent e9fb350
commit 6403d21
Show file tree

Hide file tree

Showing 333 changed files with 1,074 additions and 16,969 deletions.
diff --git a/ide/che-core-ide-app/pom.xml b/ide/che-core-ide-app/pom.xml
@@ -89,6 +89,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-project-templates-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.core</groupId>
+            <artifactId>che-core-api-ssh-shared</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-user-shared</artifactId>
@@ -121,6 +125,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-ide-ui</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.lib</groupId>
+            <artifactId>che-terminal-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.google.gwt</groupId>
             <artifactId>gwt-dev</artifactId>
@@ -310,6 +318,32 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-terminal</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.eclipse.che.lib</groupId>
+                                    <artifactId>che-terminal-client</artifactId>
+                                    <version>${che.lib.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.outputDirectory}/org/eclipse/che/public/term</outputDirectory>
+                                    <excludes>org/**,META-INF/**</excludes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/CoreLocalizationConstant.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/CoreLocalizationConstant.java
@@ -1063,4 +1063,134 @@ public interface CoreLocalizationConstant extends Messages {
     @Key("connection.closed.dialog.title")
     String connectionClosedDialogTitle();
 
+    @Key("macro.current.project.path.description")
+    String macroCurrentProjectPathDescription();
+
+    @Key("macro.current.project.relpath.description")
+    String macroCurrentProjectRelpathDescription();
+
+    @Key("macro.machine.dev.hostname.description")
+    String macroMachineDevHostnameDescription();
+
+    @Key("failed.to.connect.the.terminal")
+    String failedToConnectTheTerminal();
+
+    @Key("connection.failed.with.terminal")
+    String connectionFailedWithTerminal();
+
+    @Key("terminal.error.connection")
+    String terminalErrorConnection();
+
+    @Key("terminal.can.not.load.script")
+    String terminalCanNotLoadScript();
+
+    @Key("terminal.restart.trying")
+    String terminalTryRestarting();
+
+    @Key("terminal.error.start")
+    String terminalErrorStart();
+
+    @Key("view.processes.title")
+    String viewProcessesTitle();
+
+    @Key("view.processes.tooltip")
+    String viewProcessesTooltip();
+
+    @Key("messages.machine.not.found")
+    String machineNotFound(String machineId);
+
+    @Key("ssh.connect.info")
+    String sshConnectInfo(String machineName, String machineHost, String machinePort, String workspaceName, String userName, String sshKeyDetails);
+
+    @Key("ssh.connect.ssh.key.available")
+    String sshConnectInfoPrivateKey(String privateKey);
+
+    @Key("ssh.connect.ssh.key.not.available")
+    String sshConnectInfoNoPrivateKey();
+
+    @Key("failed.to.execute.command")
+    String failedToExecuteCommand();
+
+    /* OutputsContainerView */
+    @Key("view.outputsConsole.stopProcessConfirmation")
+    String outputsConsoleViewStopProcessConfirmation(String processName);
+
+    @Key("view.processes.terminal.node.title")
+    String viewProcessesTerminalNodeTitle(String terminalIndex);
+
+    @Key("failed.to.get.processes")
+    String failedToGetProcesses(String machineId);
+
+    @Key("control.devMachine.category")
+    String devMachineCategory();
+
+    @Key("control.runCommand.empty.params")
+    String runCommandEmptyParamsMessage();
+
+    @Key("control.runCommand.empty.name")
+    String runCommandEmptyNameMessage();
+
+    @Key("control.terminal.new")
+    String newTerminal();
+
+    @Key("control.terminal.create.description")
+    String newTerminalDescription();
+
+    @Key("control.connect.ssh")
+    String connectViaSSH();
+
+    @Key("action.showConsoleTree.title")
+    String actionShowConsoleTreeTitle();
+
+    @Key("control.rerun.title")
+    String reRunControlTitle();
+
+    @Key("control.rerun.description")
+    String reRunControlDescription();
+
+    @Key("control.stop.title")
+    String stopControlTitle();
+
+    @Key("control.stop.description")
+    String stopControlDescription();
+
+    @Key("control.close.title")
+    String closeControlTitle();
+
+    @Key("control.close.description")
+    String closeControlDescription();
+
+    @Key("consoles.reRunButton.tooltip")
+    String consolesReRunButtonTooltip();
+
+    @Key("consoles.stopButton.tooltip")
+    String consolesStopButtonTooltip();
+
+    @Key("consoles.clearOutputsButton.tooltip")
+    String consolesClearOutputsButtonTooltip();
+
+    @Key("consoles.wrapTextButton.tooltip")
+    String consolesWrapTextButtonTooltip();
+
+    @Key("consoles.autoScrollButton.tooltip")
+    String consolesAutoScrollButtonTooltip();
+
+    @Key("view.processes.command.title")
+    String viewProcessesCommandTitle();
+
+    @Key("view.stop.process.tooltip")
+    String viewStropProcessTooltip();
+
+    @Key("view.new.terminal.tooltip")
+    String viewNewTerminalTooltip();
+
+    @Key("view.machine.running.tooltip")
+    String viewMachineRunningTooltip();
+
+    @Key("view.close.processOutput.tooltip")
+    String viewCloseProcessOutputTooltip();
+
+    @Key("failed.to.find.machine")
+    String failedToFindMachine(String machineId);
+
 }
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/Resources.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/Resources.java
@@ -16,6 +16,7 @@
 
 import org.eclipse.che.ide.api.parts.PartStackUIResources;
 import org.eclipse.che.ide.command.CommandResources;
+import org.eclipse.che.ide.machine.MachineResources;
 import org.eclipse.che.ide.menu.MenuResources;
 import org.eclipse.che.ide.notification.NotificationResources;
 import org.eclipse.che.ide.projecttype.wizard.ProjectWizardResources;
@@ -48,6 +49,7 @@ public interface Resources extends Tree.Resources,
                                    CategoriesList.Resources,
                                    ButtonLoaderResources,
                                    ProjectWizardResources,
+                                   MachineResources,
                                    CommandResources {
 
     @Source({"Core.css", "org/eclipse/che/ide/ui/constants.css", "org/eclipse/che/ide/api/ui/style.css"})

diff --git a/...hine/client/actions/RunCommandAction.java → ...pse/che/ide/actions/RunCommandAction.java b/...hine/client/actions/RunCommandAction.java → ...pse/che/ide/actions/RunCommandAction.java
@@ -8,16 +8,16 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.extension.machine.client.actions;
+package org.eclipse.che.ide.actions;
 
 import com.google.inject.Inject;
 
+import org.eclipse.che.ide.CoreLocalizationConstant;
 import org.eclipse.che.ide.api.action.Action;
 import org.eclipse.che.ide.api.action.ActionEvent;
 import org.eclipse.che.ide.api.app.AppContext;
 import org.eclipse.che.ide.api.command.CommandExecutor;
 import org.eclipse.che.ide.api.command.CommandManager;
-import org.eclipse.che.ide.extension.machine.client.MachineLocalizationConstant;
 import org.eclipse.che.ide.util.loging.Log;
 
 
@@ -30,14 +30,14 @@ public class RunCommandAction extends Action {
 
     public static final String NAME_PARAM_ID = "name";
 
-    private final CommandManager              commandManager;
-    private final CommandExecutor             commandExecutor;
-    private final AppContext                  appContext;
-    private final MachineLocalizationConstant localizationConstant;
+    private final CommandManager           commandManager;
+    private final CommandExecutor          commandExecutor;
+    private final AppContext               appContext;
+    private final CoreLocalizationConstant localizationConstant;
 
     @Inject
     public RunCommandAction(CommandManager commandManager,
-                            MachineLocalizationConstant localizationConstant,
+                            CoreLocalizationConstant localizationConstant,
                             CommandExecutor commandExecutor,
                             AppContext appContext) {
         this.commandManager = commandManager;

diff --git a/...client/actions/ShowConsoleTreeAction.java → ...he/ide/actions/ShowConsoleTreeAction.java b/...client/actions/ShowConsoleTreeAction.java → ...he/ide/actions/ShowConsoleTreeAction.java
@@ -8,18 +8,19 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.extension.machine.client.actions;
+package org.eclipse.che.ide.actions;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import com.google.web.bindery.event.shared.EventBus;
+
+import org.eclipse.che.ide.CoreLocalizationConstant;
 import org.eclipse.che.ide.api.action.ActionEvent;
 import org.eclipse.che.ide.api.action.ToggleAction;
 import org.eclipse.che.ide.api.event.ActivePartChangedEvent;
 import org.eclipse.che.ide.api.event.ActivePartChangedHandler;
 import org.eclipse.che.ide.api.parts.PartPresenter;
-import org.eclipse.che.ide.extension.machine.client.MachineLocalizationConstant;
-import org.eclipse.che.ide.extension.machine.client.processes.panel.ProcessesPanelPresenter;
+import org.eclipse.che.ide.processes.panel.ProcessesPanelPresenter;
 
 /**
  * Action to show / hide console tree.
@@ -36,7 +37,7 @@ public class ShowConsoleTreeAction extends ToggleAction implements ActivePartCha
     @Inject
     public ShowConsoleTreeAction(final EventBus eventBus,
                                  final ProcessesPanelPresenter processesPanelPresenter,
-                                 final MachineLocalizationConstant machineLocalizationConstant) {
+                                 final CoreLocalizationConstant machineLocalizationConstant) {
         super(machineLocalizationConstant.actionShowConsoleTreeTitle());
 
         this.processesPanelPresenter = processesPanelPresenter;

diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/command/CommandApiModule.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/command/CommandApiModule.java
@@ -19,6 +19,7 @@
 import com.google.inject.name.Named;
 
 import org.eclipse.che.ide.Resources;
+import org.eclipse.che.ide.api.command.CommandExecutor;
 import org.eclipse.che.ide.api.command.CommandGoal;
 import org.eclipse.che.ide.api.command.CommandGoalRegistry;
 import org.eclipse.che.ide.api.command.CommandManager;
@@ -27,6 +28,7 @@
 import org.eclipse.che.ide.api.component.Component;
 import org.eclipse.che.ide.api.component.WsAgentComponent;
 import org.eclipse.che.ide.api.filetypes.FileType;
+import org.eclipse.che.ide.command.type.custom.CustomCommandType;
 import org.eclipse.che.ide.command.editor.CommandEditorView;
 import org.eclipse.che.ide.command.editor.CommandEditorViewImpl;
 import org.eclipse.che.ide.command.editor.page.goal.GoalPageView;
@@ -37,6 +39,7 @@
 import org.eclipse.che.ide.command.editor.page.project.ProjectsPageViewImpl;
 import org.eclipse.che.ide.command.editor.page.text.PageWithTextEditorView;
 import org.eclipse.che.ide.command.editor.page.text.PageWithTextEditorViewImpl;
+import org.eclipse.che.ide.command.execute.CommandExecutorImpl;
 import org.eclipse.che.ide.command.execute.ExecuteCommandActionFactory;
 import org.eclipse.che.ide.command.execute.ExecuteCommandActionManager;
 import org.eclipse.che.ide.command.execute.GoalPopUpGroupFactory;
@@ -132,6 +135,9 @@ protected void configure() {
 
         install(new GinFactoryModuleBuilder().build(ToolbarButtonsFactory.class));
         install(new GinFactoryModuleBuilder().build(MenuItemsFactory.class));
+
+        bind(CommandExecutor.class).to(CommandExecutorImpl.class).in(Singleton.class);
+        GinMultibinder.newSetBinder(binder(), CommandType.class).addBinding().to(CustomCommandType.class);
     }
 
     @Provides

diff --git a/...e/client/command/CommandExecutorImpl.java → .../command/execute/CommandExecutorImpl.java b/...e/client/command/CommandExecutorImpl.java → .../command/execute/CommandExecutorImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.extension.machine.client.command;
+package org.eclipse.che.ide.command.execute;
 
 import com.google.inject.Inject;
 
@@ -21,9 +21,9 @@
 import org.eclipse.che.ide.api.macro.MacroProcessor;
 import org.eclipse.che.ide.api.selection.Selection;
 import org.eclipse.che.ide.api.selection.SelectionAgent;
-import org.eclipse.che.ide.extension.machine.client.outputspanel.console.CommandConsoleFactory;
-import org.eclipse.che.ide.extension.machine.client.outputspanel.console.CommandOutputConsole;
-import org.eclipse.che.ide.extension.machine.client.processes.panel.ProcessesPanelPresenter;
+import org.eclipse.che.ide.console.CommandConsoleFactory;
+import org.eclipse.che.ide.console.CommandOutputConsole;
+import org.eclipse.che.ide.processes.panel.ProcessesPanelPresenter;
 import org.eclipse.che.ide.machine.chooser.MachineChooser;
 
 import java.util.Map;

diff --git a/...ent/command/custom/CustomCommandType.java → ...ommand/type/custom/CustomCommandType.java b/...ent/command/custom/CustomCommandType.java → ...ommand/type/custom/CustomCommandType.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.extension.machine.client.command.custom;
+package org.eclipse.che.ide.command.type.custom;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -17,7 +17,7 @@
 import org.eclipse.che.ide.api.command.CommandType;
 import org.eclipse.che.ide.api.icon.Icon;
 import org.eclipse.che.ide.api.icon.IconRegistry;
-import org.eclipse.che.ide.extension.machine.client.MachineResources;
+import org.eclipse.che.ide.machine.MachineResources;
 
 import java.util.LinkedList;
 import java.util.List;

diff --git a/...t/command/custom/CustomPagePresenter.java → ...mand/type/custom/CustomPagePresenter.java b/...t/command/custom/CustomPagePresenter.java → ...mand/type/custom/CustomPagePresenter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.extension.machine.client.command.custom;
+package org.eclipse.che.ide.command.type.custom;
 
 import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.google.inject.Inject;

diff --git a/...client/command/custom/CustomPageView.java → ...e/command/type/custom/CustomPageView.java b/...client/command/custom/CustomPageView.java → ...e/command/type/custom/CustomPageView.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.extension.machine.client.command.custom;
+package org.eclipse.che.ide.command.type.custom;
 
 import com.google.inject.ImplementedBy;
 

diff --git a/...nt/command/custom/CustomPageViewImpl.java → ...mmand/type/custom/CustomPageViewImpl.java b/...nt/command/custom/CustomPageViewImpl.java → ...mmand/type/custom/CustomPageViewImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.extension.machine.client.command.custom;
+package org.eclipse.che.ide.command.type.custom;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.KeyUpEvent;

diff --git a/.../command/custom/CustomPageViewImpl.ui.xml → ...and/type/custom/CustomPageViewImpl.ui.xml b/.../command/custom/CustomPageViewImpl.ui.xml → ...and/type/custom/CustomPageViewImpl.ui.xml
diff --git a/...spanel/console/CommandConsoleFactory.java → ...he/ide/console/CommandConsoleFactory.java b/...spanel/console/CommandConsoleFactory.java → ...he/ide/console/CommandConsoleFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.extension.machine.client.outputspanel.console;
+package org.eclipse.che.ide.console;
 
 import com.google.inject.name.Named;
 

diff --git a/...tspanel/console/CommandOutputConsole.java → ...che/ide/console/CommandOutputConsole.java b/...tspanel/console/CommandOutputConsole.java → ...che/ide/console/CommandOutputConsole.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Codenvy, S.A. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.che.ide.extension.machine.client.outputspanel.console;
+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;