Refactor Remote tools plugin & create Remote Utils separate plugin
cover Refactor Remote tools plugin & create Remote Utils separate plugin
- some more refactoring for the org.yocto.sdk.remotetools
- create & populate org.yocto.remote.utils
Ioana Grigoropol (12):
Separate remote logic from GUI login in TerminalHandler
implementation
Move remote system type checkings from GUI Dialogs and to RSEHelper Move logic for waiting for RSE initialization to RSEHelper Move filtering of suitable connections to RSEHelper Initial commit for separate remote utilities plugin
Move RSEHelper to a separate plugin
Move RemoteShellExec to separate plugin
Move ShellSession to org.yocto.remote.utils separate plugin Move CommonHelper to org.yocto.remote.utils separate plugin Move TerminalHandler to org.yocto.remote.utils
Remove unused TCFTerminalConnectors
Remove all plugin dependencies to RSE APi from remote tools plugin
plugins/org.yocto.remote.utils/.classpath | 7 +
plugins/org.yocto.remote.utils/.project | 28 +++
.../.settings/org.eclipse.jdt.core.prefs | 7 +
.../org.yocto.remote.utils/META-INF/MANIFEST.MF | 27 +++
plugins/org.yocto.remote.utils/build.properties | 4 +
.../src/org/yocto/remote/utils/Activator.java | 62 +++++++
.../src/org/yocto/remote/utils}/CommonHelper.java | 20 ++-
.../src/org/yocto/remote/utils/Messages.java | 35 ++++
.../src/org/yocto/remote/utils}/RSEHelper.java | 178 +++++++-------------
.../org/yocto/remote/utils}/RemoteShellExec.java | 95 +++++------
.../src/org/yocto/remote/utils}/ShellSession.java | 68 +++-----
.../org/yocto/remote/utils}/TerminalHandler.java | 121 +++++--------
.../org.yocto.sdk.remotetools/META-INF/MANIFEST.MF | 13 +-
.../yocto/sdk/remotetools/actions/BaseModel.java | 4 +-
.../sdk/remotetools/actions/BaseSettingDialog.java | 29 +---
.../sdk/remotetools/actions/DialogHandler.java | 42 +++++
.../sdk/remotetools/actions/LatencytopHandler.java | 2 +-
.../sdk/remotetools/actions/OprofileModel.java | 2 +-
.../yocto/sdk/remotetools/actions/PerfHandler.java | 2 +-
.../sdk/remotetools/actions/SystemtapModel.java | 2 +-
.../actions/SystemtapSettingDialog.java | 2 +-
.../remotetools/views/TCFTerminalConnector.java | 49 ------
.../views/TCFTerminalConnectorImpl.java | 98 -----------
23 files changed, 416 insertions(+), 481 deletions(-)
create mode 100644 plugins/org.yocto.remote.utils/.classpath
create mode 100644 plugins/org.yocto.remote.utils/.project
create mode 100644 plugins/org.yocto.remote.utils/.settings/org.eclipse.jdt.core.prefs
create mode 100644 plugins/org.yocto.remote.utils/META-INF/MANIFEST.MF
create mode 100644 plugins/org.yocto.remote.utils/build.properties
create mode 100644 plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/Activator.java
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools => org.yocto.remote.utils/src/org/yocto/remote/utils}/CommonHelper.java (77%)
create mode 100644 plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/Messages.java
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools => org.yocto.remote.utils/src/org/yocto/remote/utils}/RSEHelper.java (77%)
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/remote => org.yocto.remote.utils/src/org/yocto/remote/utils}/RemoteShellExec.java (69%)
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools => org.yocto.remote.utils/src/org/yocto/remote/utils}/ShellSession.java (95%)
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions => org.yocto.remote.utils/src/org/yocto/remote/utils}/TerminalHandler.java (55%)
create mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/DialogHandler.java
delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnector.java
delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnectorImpl.javaSignature · 1 line
1.7.9.5
PATCH v2 1/7 Move RSEHelper to a separate plugin
- move RSEHelper to newly created separate plugin org.yocto.remote.utils
- clean-up RSEHelper code by removing all unused methods
- moved message strings that are relevant for this plugin to the corresponding class
- modify remotetools plugin to use RSEHelper from org.yocto.remote.utils
--- .../org.yocto.remote.utils/META-INF/MANIFEST.MF | 10 + .../src/org/yocto/remote/utils/Activator.java | 4 +- .../src/org/yocto/remote/utils/Messages.java | 35 ++ .../src/org/yocto/remote/utils/RSEHelper.java | 344 ++++++++++++++++ .../org.yocto.sdk.remotetools/META-INF/MANIFEST.MF | 3 +- .../src/org/yocto/sdk/remotetools/RSEHelper.java | 419 -------------------- .../yocto/sdk/remotetools/actions/BaseModel.java | 2 +- .../sdk/remotetools/actions/BaseSettingDialog.java | 2 +- .../sdk/remotetools/actions/TerminalHandler.java | 2 +- .../sdk/remotetools/remote/RemoteShellExec.java | 2 +- 10 files changed, 398 insertions(+), 425 deletions(-) create mode 100644 plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/Messages.java create mode 100644 plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/RSEHelper.java delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/RSEHelper.java
plugins/org.yocto.remote.utils/META-INF/MANIFEST.MF +10 -0
@@ -8,3 +8,13 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Import-Package: org.eclipse.rse.core, + org.eclipse.rse.core.model, + org.eclipse.rse.core.subsystems, + org.eclipse.rse.services, + org.eclipse.rse.services.files, + org.eclipse.rse.services.shells, + org.eclipse.rse.subsystems.files.core.servicesubsystem, + org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem, + org.eclipse.rse.subsystems.terminals.core +Export-Package: org.yocto.remote.utils
plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/Activator.java +3 -1
@@ -23,7 +23,7 @@ public class Activator extends AbstractUIPlugin { // The shared instance private static Activator plugin; - + /** * The constructor */
@@ -34,6 +34,7 @@ public class Activator extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this;
@@ -43,6 +44,7 @@ public class Activator extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context);
plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/Messages.java new file +35 -0
@@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2013 Intel Corporation. + * 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: + * Intel - initial API and implementation + *******************************************************************************/ +package org.yocto.remote.utils; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + + private static final String BUNDLE_NAME = "org.yocto.remote.utils.messages"; //$NON-NLS-1$ + + public static String ErrorNoSubsystem; + public static String ErrorConnectSubsystem; + + public static String InfoDownload; + public static String InfoUpload; + + public static String RemoteShellExec_1; + public static String RemoteShellExec_2; + + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +}
plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/RSEHelper.java new file +344 -0
344 lines not on this page · raw message
plugins/org.yocto.sdk.remotetools/META-INF/MANIFEST.MF +2 -1
@@ -24,7 +24,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.eclipse.core.resources, org.eclipse.debug.internal.ui, org.eclipse.rse.shells.ui, - org.eclipse.ui.forms.widgets + org.eclipse.ui.forms.widgets, + org.yocto.remote.utils Bundle-Vendor: %Bundle-Vendor Bundle-ClassPath: lib/json-simple-1.1.1.jar, .
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/RSEHelper.java deleted +0 -419
419 lines not on this page · raw message
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseModel.java +1 -1
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.rse.core.model.IHost; -import org.yocto.sdk.remotetools.RSEHelper; +import org.yocto.remote.utils.RSEHelper; import org.yocto.sdk.remotetools.remote.RemoteShellExec; abstract public class BaseModel implements IRunnableWithProgress {
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseSettingDialog.java +1 -1
@@ -21,9 +21,9 @@ package org.yocto.sdk.remotetools.actions; +import org.yocto.remote.utils.RSEHelper; import org.yocto.sdk.remotetools.Messages; import org.yocto.sdk.remotetools.SWTFactory; -import org.yocto.sdk.remotetools.RSEHelper; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.rse.core.model.IHost;
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/TerminalHandler.java +1 -1
@@ -33,8 +33,8 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.Shell; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; +import org.yocto.remote.utils.RSEHelper; import org.yocto.sdk.remotetools.CommonHelper; -import org.yocto.sdk.remotetools.RSEHelper; abstract public class TerminalHandler extends AbstractHandler {
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/remote/RemoteShellExec.java +1 -1
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor; //import org.eclipse.tcf.services.IProcesses; //import org.eclipse.tcf.util.TCFTask; import org.eclipse.rse.core.model.IHost; -import org.yocto.sdk.remotetools.RSEHelper; +import org.yocto.remote.utils.RSEHelper; public class RemoteShellExec {
Signature · 1 line
1.7.9.5
PATCH 1/12 Separate remote logic from GUI login in TerminalHandler implementation
In reply to Ioana Grigoropol- TerminalHandler is used by both Perf and Latencytop handlers for running remote commands and for holding the settings dialog
- in order to separate the common functionality for running remote commands we need to separate the GUI from the utilitary funtions
- create DialogHandler that extends TerminalHandler to hold the GUI settings
- clean-up code in TerminalHandler:
- remove references to settings dialog
- modify execute method and keep only remote control code
- change Perf and Latencytop's parent to DialogHandler
--- .../sdk/remotetools/actions/DialogHandler.java | 41 +++++++++ .../sdk/remotetools/actions/LatencytopHandler.java | 2 +- .../yocto/sdk/remotetools/actions/PerfHandler.java | 2 +- .../sdk/remotetools/actions/TerminalHandler.java | 93 ++++++-------------- 4 files changed, 70 insertions(+), 68 deletions(-) create mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/DialogHandler.java
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/DialogHandler.java new file +41 -0
@@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright (c) 2010 Intel Corporation. + * 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: + * Intel - initial API and implementation + *******************************************************************************/ +package org.yocto.sdk.remotetools.actions; + +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.rse.core.model.IHost; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.handlers.HandlerUtil; + +abstract public class DialogHandler extends TerminalHandler { + + protected BaseSettingDialog setting; + + abstract protected String getDialogTitle(); + + protected void initialize(ExecutionEvent event) throws ExecutionException{ + IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event); + shell = window.getShell(); + setting = new SimpleSettingDialog(shell, getDialogTitle(), getConnnectionName()); + } + + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + initialize(event); + + if(setting.open() == BaseSettingDialog.OK) { + IHost currentHost = setting.getHost(); + execute(currentHost); + } + return null; + } +}
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/LatencytopHandler.java +1 -1
@@ -11,7 +11,7 @@ package org.yocto.sdk.remotetools.actions; -public class LatencytopHandler extends TerminalHandler { +public class LatencytopHandler extends DialogHandler { private static String initCmd="export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin; cd; sudo latencytop\r";
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/PerfHandler.java +1 -1
@@ -11,7 +11,7 @@ package org.yocto.sdk.remotetools.actions; -public class PerfHandler extends TerminalHandler { +public class PerfHandler extends DialogHandler { private static String initCmd="cd; perf\r";
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/TerminalHandler.java +27 -66
129 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v2 2/7 Move RemoteShellExec to separate plugin
In reply to Ioana Grigoropol- RemoteShellExec is a wrapper over a remote executiong of a command in a shell and it belongs to org.yocto.remote.utils plugin
- remove RemoteShellExec from remotetools plugin and add it to org.yocto.remote.utils
- modify org.yocto.sdk.remotetools to use implementation from org.yocto.remote.utils
--- .../org/yocto/remote/utils/RemoteShellExec.java | 140 ++++++++++++++++++ .../yocto/sdk/remotetools/actions/BaseModel.java | 2 +- .../sdk/remotetools/remote/RemoteShellExec.java | 149 -------------------- 3 files changed, 141 insertions(+), 150 deletions(-) create mode 100644 plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/RemoteShellExec.java delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/remote/RemoteShellExec.java
plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/RemoteShellExec.java new file +140 -0
@@ -0,0 +1,140 @@ +/******************************************************************************* + * Copyright (c) 2010 Intel Corporation. + * 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: + * Intel - initial API and implementation + *******************************************************************************/ +package org.yocto.remote.utils; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.rse.core.model.IHost; + +public class RemoteShellExec { + + public static final int + STATE_NULL = 0, + STATE_RUNNING = 1, + STATE_EXITED = 2; + + private final String command; + private final IHost host; + + private InputStream fInStream; + private OutputStream fOutStream; + private InputStream fErrStream; + private Process remoteShellProcess; + + private int exitCode = 0; + private int status = STATE_NULL; + + private final String RETURN_VALUE_TAG = "org.yocto.sdk.remotetools.RVTAG"; + private final String RETURN_VALUE_CMD = ";echo \"" + RETURN_VALUE_TAG + "$?\""; + + public RemoteShellExec(IHost host, String command) { + assert(host != null); + this.host = host; + this.command = command; + } + + public int getStatus() { + return status; + } + + public int getExitCode() { + return exitCode; + } + + private void reset() { + fInStream = null; + fOutStream = null; + fErrStream = null; + + remoteShellProcess = null; + exitCode = 0; + status = STATE_NULL; + } + + public InputStream getInputStream() { + return fInStream; + } + + public OutputStream getOutputStream() { + return fOutStream; + } + + public InputStream getErrStream() { + return fErrStream; + } + + public synchronized void start(String prelaunchCmd, String argument, IProgressMonitor monitor) throws Exception { + if(status == STATE_RUNNING) + return; + + reset(); + argument = (argument == null ? RETURN_VALUE_CMD : argument + RETURN_VALUE_CMD); + remoteShellProcess = RSEHelper.remoteShellExec(this.host, prelaunchCmd, this.command, argument, monitor); + fInStream = remoteShellProcess.getInputStream(); + fOutStream = remoteShellProcess.getOutputStream(); + fErrStream = remoteShellProcess.getErrorStream(); + status = STATE_RUNNING; + } + + public synchronized void terminate() throws Exception { + if(status != STATE_RUNNING || remoteShellProcess != null) + return; + + remoteShellProcess.destroy(); + reset(); + } + + public int waitFor(IProgressMonitor monitor) throws InterruptedException { + while(status == STATE_RUNNING) { + if(monitor != null) { + if(monitor.isCanceled()) { + throw new InterruptedException("User Cancelled"); + } + } + + try { + remoteShellProcess.waitFor(); + }catch(InterruptedException e){ + //get the return value + try { + if(fInStream.available() != 0) { + BufferedReader in = new BufferedReader(new InputStreamReader(fInStream)); + String thisline; + int idx; + while((thisline = in.readLine()) != null) { + if(thisline.indexOf(RETURN_VALUE_CMD) == -1) { + idx = thisline.indexOf(RETURN_VALUE_TAG); + if(idx != -1) { + try { + exitCode=(new Integer(thisline.substring(idx+RETURN_VALUE_TAG.length()))).intValue(); + }catch(NumberFormatException e2) { + } + break; + } + } + } + } + }catch(IOException e1) { + //do nothing + } + }finally { + status=STATE_EXITED; + } + } + return exitCode; + } +} +
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseModel.java +1 -1
@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.rse.core.model.IHost; import org.yocto.remote.utils.RSEHelper; -import org.yocto.sdk.remotetools.remote.RemoteShellExec; +import org.yocto.remote.utils.RemoteShellExec; abstract public class BaseModel implements IRunnableWithProgress { protected IHost host;
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/remote/RemoteShellExec.java deleted +0 -149
149 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 2/12 Move remote system type checkings from GUI Dialogs and to RSEHelper
In reply to Ioana Grigoropol- BaseSettingDialog contains code that checks whether the system type associated with a certain IHost is not null, enable and remote
- these checkings should be done in the RSEHelper for two reasons:
- limit the dependecies to the RSE Api
- isolate remote functionaties from GUI
- created method isHostViable in RSEHelper that performs all the checks need by BaseSettingDialog
- replace system type checkings in BaseSettingDialog with calls to isHostViable(IHost)
--- .../src/org/yocto/sdk/remotetools/RSEHelper.java | 8 ++++++++ .../sdk/remotetools/actions/BaseSettingDialog.java | 9 ++------- 2 files changed, 10 insertions(+), 7 deletions(-)
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/RSEHelper.java +8 -0
@@ -43,6 +43,7 @@ import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.rse.services.shells.IShellService; import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem; import org.eclipse.rse.subsystems.terminals.core.ITerminalServiceSubSystem; +import org.eclipse.rse.core.IRSESystemType; public class RSEHelper {
@@ -395,4 +396,11 @@ public class RSEHelper { } throw new CoreException(status); } + + public static boolean isHostViable(IHost host) { + IRSESystemType sysType = host.getSystemType(); + if (sysType != null && sysType.isEnabled() && !sysType.isLocal()) + return true; + return false; + } }
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseSettingDialog.java +2 -7
@@ -142,12 +142,9 @@ public class BaseSettingDialog extends Dialog { button.setEnabled(false); IHost currentConnectionSelected = getCurrentConnection(); if (currentConnectionSelected != null) { - IRSESystemType sysType = currentConnectionSelected.getSystemType(); - if (sysType != null && sysType.isEnabled() && !sysType.isLocal()) { - if(button!=null) { + if (RSEHelper.isHostViable(currentConnectionSelected) && button != null){ button.setEnabled(true); ret=true; - } } } return ret;
@@ -156,10 +153,8 @@ public class BaseSettingDialog extends Dialog { protected void updateCurConn() { IHost currentConnectionSelected = getCurrentConnection(); if (currentConnectionSelected != null) { - IRSESystemType sysType = currentConnectionSelected.getSystemType(); - if (sysType != null && sysType.isEnabled() && !sysType.isLocal()) { + if (RSEHelper.isHostViable(currentConnectionSelected)) curConn=currentConnectionSelected.getAliasName(); - } } updateOkButton(); }
Signature · 1 line
1.7.9.5
PATCH 3/12 Move logic for waiting for RSE initialization to RSEHelper
In reply to Ioana Grigoropol- BaseSettingsDialog contains code that ensures that RSE plug-in is initialized before performing any remote actions
- this piece of code should be placed in the RSEHelper since it does not have any relevance for the GUI class
- created method in RSEHelper called waitForRSEInitCompletition with this functionality
- replaced code in BaseSettingsDialog with a call to waitForRSEInitCompletition
--- .../src/org/yocto/sdk/remotetools/RSEHelper.java | 9 +++++++++ .../sdk/remotetools/actions/BaseSettingDialog.java | 8 +------- 2 files changed, 10 insertions(+), 7 deletions(-)
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/RSEHelper.java +9 -0
@@ -403,4 +403,13 @@ public class RSEHelper { return true; return false; } + + public static void waitForRSEInitCompletition() { + if (!RSECorePlugin.isInitComplete(RSECorePlugin.INIT_MODEL)) + try { + RSECorePlugin.waitForInitCompletion(RSECorePlugin.INIT_MODEL); + } catch (InterruptedException e) { + return; + } + } }
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseSettingDialog.java +1 -7
@@ -27,7 +27,6 @@ import org.yocto.sdk.remotetools.RSEHelper; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.rse.core.IRSESystemType; -import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.swt.SWT;
@@ -181,12 +180,7 @@ public class BaseSettingDialog extends Dialog { protected void updateConnectionPulldown() { int index=-1; - if (!RSECorePlugin.isInitComplete(RSECorePlugin.INIT_MODEL)) - try { - RSECorePlugin.waitForInitCompletion(RSECorePlugin.INIT_MODEL); - } catch (InterruptedException e) { - return; - } + RSEHelper.waitForRSEInitCompletition(); // already initialized connectionCombo.removeAll(); IHost[] connections = RSEHelper.getSuitableConnections();
Signature · 1 line
1.7.9.5
PATCH v2 3/7 Move ShellSession to org.yocto.remote.utils separate plugin
In reply to Ioana Grigoropol- ShellSession is used as a wrapper for a remote shell used for running commands on a remote machine with bitbake environment
- move ShellSession org.yocto.remote.plugin since it is part of remote utilities
- remove shell session class from remotetools plugin
- modify org.yocto.sdk.remotetools to use implementation from org.yocto.remote.utils
--- .../src/org/yocto/remote/utils/ShellSession.java | 327 +++++++++++++++++++ .../org/yocto/sdk/remotetools/ShellSession.java | 341 -------------------- .../sdk/remotetools/actions/SystemtapModel.java | 2 +- 3 files changed, 328 insertions(+), 342 deletions(-) create mode 100644 plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/ShellSession.java delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/ShellSession.java
plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/ShellSession.java new file +327 -0
@@ -0,0 +1,327 @@ +/***************************************************************************** + * Copyright (c) 2009 Ken Gilmer + * 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: + * Ken Gilmer - initial API and implementation + * Jessica Zhang - Adopt for Yocto Tools plugin + *******************************************************************************/ +package org.yocto.remote.utils; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.lang.reflect.InvocationTargetException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.eclipse.jface.dialogs.MessageDialog; + +public class ShellSession { + /** + * Bash shell + */ + public static final int SHELL_TYPE_BASH = 1; + /** + * sh shell + */ + public static final int SHELL_TYPE_SH = 2; + private volatile boolean interrupt = false; + /** + * String used to isolate command execution + */ + public static final String TERMINATOR = "build$"; + public static final String LT = System.getProperty("line.separator"); + private Process process; + + private OutputStream pos = null; + + private String shellPath = null; + private final String initCmd; + private final File root; + + private OutputStreamWriter out; + + public static String getFilePath(String file) throws IOException { + File f = new File(file); + + if (!f.exists() || f.isDirectory()) { + throw new IOException("Path passed is not a file: " + file); + } + + StringBuffer sb = new StringBuffer(); + + String elems[] = file.split(File.separator); + + for (int i = 0; i < elems.length - 1; ++i) { + sb.append(elems[i]); + sb.append(File.separator); + } + + return sb.toString(); + } + + public ShellSession(int shellType, File root, String initCmd, OutputStream out) throws IOException { + this.root = root; + this.initCmd = initCmd; + if (out == null) { + this.out = new OutputStreamWriter(null); + } else { + this.out = new OutputStreamWriter(out); + } + if (shellType == SHELL_TYPE_SH) { + shellPath = "/bin/sh"; + } + shellPath = "/bin/bash"; + + initializeShell(); + } + + private void initializeShell() throws IOException { + process = Runtime.getRuntime().exec(shellPath); + pos = process.getOutputStream(); + + if (root != null) { + execute("cd " + root.getAbsolutePath()); + } + + if (initCmd != null) { + execute("source " + initCmd); + } + } + + synchronized + public String execute(String command, int[] retCode) throws IOException { + String errorMessage = null; + + interrupt = false; + out.write(command); + out.write(LT); + + sendToProcessAndTerminate(command); + + if (process.getErrorStream().available() > 0) { + byte[] msg = new byte[process.getErrorStream().available()]; + + process.getErrorStream().read(msg, 0, msg.length); + String msg_str = new String(msg); + out.write(msg_str); + out.write(LT); + if (!msg_str.contains("WARNING")) + errorMessage = "Error while executing: " + command + LT + new String(msg); + } + + BufferedReader br = new BufferedReader(new InputStreamReader(process + .getInputStream())); + + StringBuffer sb = new StringBuffer(); + String line = null; + + while (true) { + line = br.readLine(); + if (line != null) { + sb.append(line); + sb.append(LT); + out.write(line); + out.write(LT); + } + if (line.endsWith(TERMINATOR)) + break; + } + if (interrupt) { + process.destroy(); + initializeShell(); + interrupt = false; + }else if (line != null && retCode != null) { + try { + retCode[0]=Integer.parseInt(line.substring(0,line.lastIndexOf(TERMINATOR))); + }catch (NumberFormatException e) { + throw new IOException("Can NOT get return code" + command + LT + line); + } + } + out.flush(); + if (errorMessage != null) { + throw new IOException(errorMessage); + } + return sb.toString(); + } + + synchronized + public void execute(String command) throws IOException { + interrupt = false; + String errorMessage = null; + + sendToProcessAndTerminate(command); + boolean cancel = false; + try { + InputStream is = process.getInputStream(); + InputStream es = process.getErrorStream(); + String info; + while (!cancel) { + info = null; + StringBuffer buffer = new StringBuffer(); + int c; + while (is.available() > 0) { + c = is.read(); + char ch = (char) c; + buffer.append(ch); + if (ch == '\n') { + info = buffer.toString(); + if (!info.trim().endsWith(TERMINATOR)) { + out.write(info); + out.write(LT); + buffer.delete(0, buffer.length()); + } else { + cancel = true; + break; + } + } + } + while (es.available() > 0) { + c = es.read(); + char ch = (char) c; + buffer.append(ch); + if (ch == '\n') { + info = buffer.toString(); + if (!info.contains("WARNING")) + errorMessage += info; + out.write(info); + out.write(LT); + buffer.delete(0, buffer.length()); + } + } + } + } catch (IOException e) { + try { + throw new InvocationTargetException(e); + } catch (InvocationTargetException e1) { + e1.printStackTrace(); + } + } + out.flush(); + if (errorMessage != null) { + throw new IOException(errorMessage); + } + if (interrupt) { + process.destroy(); + initializeShell(); + interrupt = false; + } + } + synchronized + public boolean ensureKnownHostKey(String user, String host) throws IOException { + + boolean loadKeysMatch = false; + boolean accepted = false; + Process proc = Runtime.getRuntime().exec("ssh -o LogLevel=DEBUG3 " + user + "@" + host); + Pattern patternLoad = Pattern.compile("^debug3: load_hostkeys: loaded (\\d+) keys"); + Pattern patternAuthSucceeded = Pattern.compile("^debug1: Authentication succeeded.*"); + + try { + InputStream es = proc.getErrorStream(); + String info; + while (!loadKeysMatch) { + info = null; + StringBuffer buffer = new StringBuffer(); + int c; + while (es.available() > 0) { + c = es.read(); + char ch = (char) c; + buffer.append(ch); + if (ch == '\r') { + info = buffer.toString().trim(); + Matcher m = patternLoad.matcher(info); + if(m.matches()) { + int keys = new Integer(m.group(1)); + if (keys == 0) { + proc.destroy(); + accepted = MessageDialog.openQuestion(null, "Host authenticity", "The authenticity of host '" + host + "(" + host + ")' can't be established.\nAre you sure you want to continue connecting ?"); + if (accepted){ + proc = Runtime.getRuntime().exec("ssh -o StrictHostKeyChecking=no " + user + "@" + host);//add host key to known_hosts + try { + Thread.sleep(2000); //wait for process to finish + } catch (InterruptedException e) { + e.printStackTrace(); + } + proc.destroy(); + } else { + MessageDialog.openError(null, "Host authenticity", "Host key verification failed."); + } + } else { + String errorMsg = ""; + // wait to check if key is the same and authentication succeeds + while (es.available() > 0) { + c = es.read(); + ch = (char) c; + buffer.append(ch); + if (ch == '\r') { + info = buffer.toString().trim(); + Matcher mAuthS = patternAuthSucceeded.matcher(info); + if(mAuthS.matches()) { + accepted = true; + break; + } else { + if (!info.startsWith("debug")) + errorMsg += info + "\n"; + } + try { + Thread.sleep(100); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + buffer.delete(0, buffer.length()); + } + } + if (!accepted && !errorMsg.isEmpty()) + MessageDialog.openError(null, "Host authenticity", errorMsg); + } + loadKeysMatch = true; + break; + } + buffer.delete(0, buffer.length()); + } + } + } + es.close(); + } catch (IOException e) { + try { + throw new InvocationTargetException(e); + } catch (InvocationTargetException e1) { + e1.printStackTrace(); + } + } + return accepted; + } + + /** + * Send command string to shell process and add special terminator string so + * reader knows when output is complete. + * + * @param command + * @throws IOException + */ + private void sendToProcessAndTerminate(String command) throws IOException { + pos.write(command.getBytes()); + pos.write(LT.getBytes()); + pos.flush(); + pos.write("echo $?".getBytes()); + pos.write(TERMINATOR.getBytes()); + pos.write(LT.getBytes()); + pos.flush(); + } + + /** + * Interrupt any running processes. + */ + public void interrupt() { + interrupt = true; + } +}
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/ShellSession.java deleted +0 -341
341 lines not on this page · raw message
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapModel.java +1 -1
@@ -19,7 +19,7 @@ import org.eclipse.ui.console.ConsolePlugin; import org.eclipse.ui.console.IConsole; import org.eclipse.ui.console.IConsoleManager; import org.eclipse.ui.console.MessageConsole; -import org.yocto.sdk.remotetools.ShellSession; +import org.yocto.remote.utils.ShellSession; public class SystemtapModel extends BaseModel { protected static final String DEFAULT_INIT_SCRIPT = "oe-init-build-env";
Signature · 1 line
1.7.9.5
PATCH v2 4/7 Move CommonHelper to org.yocto.remote.utils separate plugin
In reply to Ioana Grigoropol- common helper is better suited to org.yocto.remote.utils since it is used for:
- running commands
- displaying error dialogs
- remove common helper from remote tools plugin and add it to a separated plugin
- modify org.yocto.sdk.remotetools to use implementation from org.yocto.remote.utils
--- .../src/org/yocto/remote/utils/CommonHelper.java | 46 ++++++++++++++++++++ .../org/yocto/sdk/remotetools/CommonHelper.java | 44 ------------------- .../sdk/remotetools/actions/OprofileModel.java | 2 +- .../actions/SystemtapSettingDialog.java | 2 +- .../sdk/remotetools/actions/TerminalHandler.java | 2 +- 5 files changed, 49 insertions(+), 47 deletions(-) create mode 100644 plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/CommonHelper.java delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/CommonHelper.java
plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/CommonHelper.java new file +46 -0
@@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2010 Intel Corporation. + * 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: + * Intel - initial API and implementation + *******************************************************************************/ +package org.yocto.remote.utils; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.swt.widgets.Display; + +public class CommonHelper { + + static public boolean isExecAvail(String exec) { + boolean ret = false; + try { + Process p = Runtime.getRuntime().exec(new String[] {"which", exec}); + p.waitFor(); + if(p.exitValue() == 0) { + ret = true; + } + } catch (Exception e) { + e.printStackTrace(); + } + return ret; + } + + public static void showErrorDialog(final String dialogTitle, final String errorMessage, final String reason) { + //needs to be run in the ui thread otherwise swt throws invalid thread access + Display.getDefault().syncExec(new Runnable() { + @Override + public void run() { + ErrorDialog.openError(null, dialogTitle, errorMessage, + new Status(IStatus.ERROR,Activator.PLUGIN_ID,reason)); + } + }); + + } + +}
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/CommonHelper.java deleted +0 -44
44 lines not on this page · raw message
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/OprofileModel.java +1 -1
@@ -21,9 +21,9 @@ import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.rse.core.model.IHost; import org.eclipse.ui.IWorkbenchWindow; +import org.yocto.remote.utils.CommonHelper; import org.yocto.sdk.ide.YoctoSDKPlugin; import org.yocto.sdk.ide.preferences.PreferenceConstants; -import org.yocto.sdk.remotetools.CommonHelper; import org.yocto.sdk.remotetools.LocalJob; import org.yocto.sdk.remotetools.Messages;
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapSettingDialog.java +1 -1
@@ -27,8 +27,8 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import org.yocto.remote.utils.CommonHelper; import org.yocto.sdk.remotetools.Activator; -import org.yocto.sdk.remotetools.CommonHelper; import org.yocto.sdk.remotetools.Messages; import org.yocto.sdk.remotetools.SWTFactory;
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/TerminalHandler.java +1 -1
@@ -33,8 +33,8 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.Shell; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; +import org.yocto.remote.utils.CommonHelper; import org.yocto.remote.utils.RSEHelper; -import org.yocto.sdk.remotetools.CommonHelper; abstract public class TerminalHandler extends AbstractHandler {
Signature · 1 line
1.7.9.5
PATCH 4/12 Move filtering of suitable connections to RSEHelper
In reply to Ioana Grigoropol- BaseSettingDialog performs an extra filtering for suitable connections for a given host by checking the remote system type
- this checking should be done in RSEHelper since it involves a remote action and thus removing BaseSettingDialog dependency on RSE Api
- modified RSEHelper.getSuitableConnections to include the filtering for connections with associated system type disabled
--- .../src/org/yocto/sdk/remotetools/RSEHelper.java | 4 ++++ .../sdk/remotetools/actions/BaseSettingDialog.java | 10 +++------- 2 files changed, 7 insertions(+), 7 deletions(-)
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/RSEHelper.java +4 -0
@@ -150,6 +150,10 @@ public class RSEHelper { if(!terminalConnections.contains(fileConnection) && !shellConnections.contains(fileConnection)){ iter.remove(); } + IRSESystemType sysType = fileConnection.getSystemType(); + if (sysType == null || !sysType.isEnabled()) { + iter.remove(); + } } return (IHost[]) filConnections.toArray(new IHost[filConnections.size()]);
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseSettingDialog.java +3 -7
@@ -26,7 +26,6 @@ import org.yocto.sdk.remotetools.SWTFactory; import org.yocto.sdk.remotetools.RSEHelper; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.ui.actions.SystemNewConnectionAction; import org.eclipse.swt.SWT;
@@ -185,12 +184,9 @@ public class BaseSettingDialog extends Dialog { connectionCombo.removeAll(); IHost[] connections = RSEHelper.getSuitableConnections(); for (int i = 0; i < connections.length; i++) { - IRSESystemType sysType = connections[i].getSystemType(); - if (sysType != null && sysType.isEnabled()) { - connectionCombo.add(connections[i].getAliasName()); - if(connections[i].getAliasName().equals(curConn)) - index=i; - } + connectionCombo.add(connections[i].getAliasName()); + if(connections[i].getAliasName().equals(curConn)) + index=i; } if(index>=0) {
Signature · 1 line
1.7.9.5
PATCH 5/12 Initial commit for separate remote utilities plugin
In reply to Ioana Grigoropol--- plugins/org.yocto.remote.utils/.classpath | 7 +++ plugins/org.yocto.remote.utils/.project | 28 +++++++++ .../.settings/org.eclipse.jdt.core.prefs | 7 +++ .../org.yocto.remote.utils/META-INF/MANIFEST.MF | 10 ++++ plugins/org.yocto.remote.utils/build.properties | 4 ++ .../src/org/yocto/remote/utils/Activator.java | 60 ++++++++++++++++++++ 6 files changed, 116 insertions(+) create mode 100644 plugins/org.yocto.remote.utils/.classpath create mode 100644 plugins/org.yocto.remote.utils/.project create mode 100644 plugins/org.yocto.remote.utils/.settings/org.eclipse.jdt.core.prefs create mode 100644 plugins/org.yocto.remote.utils/META-INF/MANIFEST.MF create mode 100644 plugins/org.yocto.remote.utils/build.properties create mode 100644 plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/Activator.java
plugins/org.yocto.remote.utils/.classpath new file +7 -0
@@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath>
plugins/org.yocto.remote.utils/.project new file +28 -0
@@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.yocto.remote.utils</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription>
plugins/org.yocto.remote.utils/.settings/org.eclipse.jdt.core.prefs new file +7 -0
@@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7
plugins/org.yocto.remote.utils/META-INF/MANIFEST.MF new file +10 -0
@@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Utils +Bundle-SymbolicName: org.yocto.remote.utils +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.yocto.remote.utils.Activator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.7
plugins/org.yocto.remote.utils/build.properties new file +4 -0
@@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .
plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/Activator.java new file +60 -0
60 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v2 5/7 Move TerminalHandler to org.yocto.remote.utils
In reply to Ioana Grigoropol- move TerminalHandler to separate plugin since it performs actions that are best suited for remote utilities
- remove TerminalHandler from remotetools plugin
- modify org.yocto.sdk.remotetools to use implementation from org.yocto.remote.utils
--- .../org.yocto.remote.utils/META-INF/MANIFEST.MF | 9 +- .../org/yocto/remote/utils/TerminalHandler.java | 128 ++++++++++++++++++++ .../sdk/remotetools/actions/DialogHandler.java | 1 + .../sdk/remotetools/actions/TerminalHandler.java | 128 -------------------- 4 files changed, 137 insertions(+), 129 deletions(-) create mode 100644 plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/TerminalHandler.java delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/TerminalHandler.java
plugins/org.yocto.remote.utils/META-INF/MANIFEST.MF +8 -1
@@ -11,10 +11,17 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.eclipse.rse.core, org.eclipse.rse.core.model, org.eclipse.rse.core.subsystems, + org.eclipse.rse.internal.terminals.ui, + org.eclipse.rse.internal.terminals.ui.views, org.eclipse.rse.services, org.eclipse.rse.services.files, org.eclipse.rse.services.shells, + org.eclipse.rse.services.terminals, org.eclipse.rse.subsystems.files.core.servicesubsystem, org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem, - org.eclipse.rse.subsystems.terminals.core + org.eclipse.rse.subsystems.terminals.core, + org.eclipse.rse.subsystems.terminals.core.elements, + org.eclipse.rse.ui, + org.eclipse.tm.internal.terminal.control, + org.eclipse.tm.internal.terminal.provisional.api Export-Package: org.yocto.remote.utils
plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/TerminalHandler.java new file +128 -0
128 lines not on this page · raw message
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/DialogHandler.java +1 -0
@@ -15,6 +15,7 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.rse.core.model.IHost; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.handlers.HandlerUtil; +import org.yocto.remote.utils.TerminalHandler; abstract public class DialogHandler extends TerminalHandler {
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/TerminalHandler.java deleted +0 -128
128 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 6/12 Move RSEHelper to a separate plugin
In reply to Ioana Grigoropol- move RSEHelper to newly created separate plugin org.yocto.remote.utils
- clean-up RSEHelper code by removing all unused methods
- moved message strings that are relevant for this plugin to the corresponding class
- modify remotetools plugin to use RSEHelper from org.yocto.remote.utils
---
.../org.yocto.remote.utils/META-INF/MANIFEST.MF | 10 ++
.../src/org/yocto/remote/utils/Activator.java | 4 +-
.../src/org/yocto/remote/utils/Messages.java | 35 +++++
.../src/org/yocto/remote/utils}/RSEHelper.java | 163 ++++++--------------
.../org.yocto.sdk.remotetools/META-INF/MANIFEST.MF | 3 +-
.../yocto/sdk/remotetools/actions/BaseModel.java | 2 +-
.../sdk/remotetools/actions/BaseSettingDialog.java | 2 +-
.../sdk/remotetools/actions/TerminalHandler.java | 2 +-
.../sdk/remotetools/remote/RemoteShellExec.java | 2 +-
9 files changed, 98 insertions(+), 125 deletions(-)
create mode 100644 plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/Messages.java
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools => org.yocto.remote.utils/src/org/yocto/remote/utils}/RSEHelper.java (78%)plugins/org.yocto.remote.utils/META-INF/MANIFEST.MF +10 -0
@@ -8,3 +8,13 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Import-Package: org.eclipse.rse.core, + org.eclipse.rse.core.model, + org.eclipse.rse.core.subsystems, + org.eclipse.rse.services, + org.eclipse.rse.services.files, + org.eclipse.rse.services.shells, + org.eclipse.rse.subsystems.files.core.servicesubsystem, + org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem, + org.eclipse.rse.subsystems.terminals.core +Export-Package: org.yocto.remote.utils
plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/Activator.java +3 -1
@@ -23,7 +23,7 @@ public class Activator extends AbstractUIPlugin { // The shared instance private static Activator plugin; - + /** * The constructor */
@@ -34,6 +34,7 @@ public class Activator extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this;
@@ -43,6 +44,7 @@ public class Activator extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context);
plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/Messages.java new file +35 -0
@@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2013 Intel Corporation. + * 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: + * Intel - initial API and implementation + *******************************************************************************/ +package org.yocto.remote.utils; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + + private static final String BUNDLE_NAME = "org.yocto.remote.utils.messages"; //$NON-NLS-1$ + + public static String ErrorNoSubsystem; + public static String ErrorConnectSubsystem; + + public static String InfoDownload; + public static String InfoUpload; + + public static String RemoteShellExec_1; + public static String RemoteShellExec_2; + + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +}
plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/RSEHelper.java renamed from plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/RSEHelper.java +44 -119
319 lines not on this page · raw message
plugins/org.yocto.sdk.remotetools/META-INF/MANIFEST.MF +2 -1
@@ -24,7 +24,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.eclipse.core.resources, org.eclipse.debug.internal.ui, org.eclipse.rse.shells.ui, - org.eclipse.ui.forms.widgets + org.eclipse.ui.forms.widgets, + org.yocto.remote.utils Bundle-Vendor: %Bundle-Vendor Bundle-ClassPath: lib/json-simple-1.1.1.jar, .
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseModel.java +1 -1
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.rse.core.model.IHost; -import org.yocto.sdk.remotetools.RSEHelper; +import org.yocto.remote.utils.RSEHelper; import org.yocto.sdk.remotetools.remote.RemoteShellExec; abstract public class BaseModel implements IRunnableWithProgress {
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseSettingDialog.java +1 -1
@@ -21,9 +21,9 @@ package org.yocto.sdk.remotetools.actions; +import org.yocto.remote.utils.RSEHelper; import org.yocto.sdk.remotetools.Messages; import org.yocto.sdk.remotetools.SWTFactory; -import org.yocto.sdk.remotetools.RSEHelper; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.rse.core.model.IHost;
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/TerminalHandler.java +1 -1
@@ -33,8 +33,8 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.Shell; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; +import org.yocto.remote.utils.RSEHelper; import org.yocto.sdk.remotetools.CommonHelper; -import org.yocto.sdk.remotetools.RSEHelper; abstract public class TerminalHandler extends AbstractHandler {
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/remote/RemoteShellExec.java +1 -1
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor; //import org.eclipse.tcf.services.IProcesses; //import org.eclipse.tcf.util.TCFTask; import org.eclipse.rse.core.model.IHost; -import org.yocto.sdk.remotetools.RSEHelper; +import org.yocto.remote.utils.RSEHelper; public class RemoteShellExec {
Signature · 1 line
1.7.9.5
PATCH v2 6/7 Remove unused TCFTerminalConnectors
In reply to Ioana Grigoropol- removed TCFTerminalConnector and TCFTerminalConnectorImpl since there are no usages of this classes
--- .../remotetools/views/TCFTerminalConnector.java | 49 ---------- .../views/TCFTerminalConnectorImpl.java | 98 -------------------- 2 files changed, 147 deletions(-) delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnector.java delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnectorImpl.java
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnector.java deleted +0 -49
@@ -1,49 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2008, 2009 MontaVista Software, Inc. and others - * 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: - * Anna Dushistova (MontaVista) - initial API and implementation - * Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point - ********************************************************************************/ -package org.yocto.sdk.remotetools.views; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.rse.core.model.IHost; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; - -public class TCFTerminalConnector extends TCFTerminalConnectorImpl implements ITerminalConnector { - - public TCFTerminalConnector(IHost host) { - super(host); - } - - public String getId() { - return "yocto_tcf_internal_connector"; //$NON-NLS-1$ - } - - public String getInitializationErrorMessage() { - return null; - } - - public String getName() { - return "yocto_tcf_internal_connector"; - } - - public boolean isHidden() { - return true; - } - - public boolean isInitialized() { - return true; - } - - public Object getAdapter(Class adapterType) { - if (adapterType.isInstance(this)) - return this; - return Platform.getAdapterManager().getAdapter(this, adapterType); - } - -}
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnectorImpl.java deleted +0 -98
98 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 7/12 Move RemoteShellExec to separate plugin
In reply to Ioana Grigoropol- RemoteShellExec is a wrapper over a remote executiong of a command in a shell and it belongs to org.yocto.remote.utils plugin
- remove RemoteShellExec from remotetools plugin and add it to org.yocto.remote.utils
- modify org.yocto.sdk.remotetools to use implementation from org.yocto.remote.utils
---
.../org/yocto/remote/utils}/RemoteShellExec.java | 95 +++++++++-----------
.../yocto/sdk/remotetools/actions/BaseModel.java | 2 +-
2 files changed, 44 insertions(+), 53 deletions(-)
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/remote => org.yocto.remote.utils/src/org/yocto/remote/utils}/RemoteShellExec.java (69%)plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/RemoteShellExec.java renamed from plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/remote/RemoteShellExec.java +43 -52
@@ -8,7 +8,7 @@ * Contributors: * Intel - initial API and implementation *******************************************************************************/ -package org.yocto.sdk.remotetools.remote; +package org.yocto.remote.utils; import java.io.BufferedReader; import java.io.IOException;
@@ -17,60 +17,53 @@ import java.io.InputStreamReader; import java.io.OutputStream; import org.eclipse.core.runtime.IProgressMonitor; -//import org.eclipse.tcf.protocol.IToken; -//import org.eclipse.tcf.services.IStreams; -//import org.eclipse.tcf.services.IProcesses; -//import org.eclipse.tcf.util.TCFTask; import org.eclipse.rse.core.model.IHost; -import org.yocto.remote.utils.RSEHelper; public class RemoteShellExec { - + public static final int STATE_NULL = 0, STATE_RUNNING = 1, STATE_EXITED = 2; - - private String command; - private IHost host; - + + private final String command; + private final IHost host; + private InputStream fInStream; private OutputStream fOutStream; private InputStream fErrStream; private Process remoteShellProcess; - - private int exit_code=0; - private int status=STATE_NULL; - - private String RETURN_VALUE_TAG = "org.yocto.sdk.remotetools.RVTAG"; - private String RETURN_VALUE_CMD = ";echo \"" + RETURN_VALUE_TAG + "$?\""; - + + private int exitCode = 0; + private int status = STATE_NULL; + + private final String RETURN_VALUE_TAG = "org.yocto.sdk.remotetools.RVTAG"; + private final String RETURN_VALUE_CMD = ";echo \"" + RETURN_VALUE_TAG + "$?\""; + public RemoteShellExec(IHost host, String command) { assert(host != null); this.host = host; - this.command=command; + this.command = command; } - - public int getStatus() - { + + public int getStatus() { return status; } - - public int getExitCode() - { - return exit_code; + + public int getExitCode() { + return exitCode; } - + private void reset() { - fInStream=null; - fOutStream=null; - fErrStream=null; - - remoteShellProcess=null; - exit_code=0; - status=STATE_NULL; + fInStream = null; + fOutStream = null; + fErrStream = null; + + remoteShellProcess = null; + exitCode = 0; + status = STATE_NULL; } - + public InputStream getInputStream() { return fInStream; }
@@ -78,15 +71,15 @@ public class RemoteShellExec { public OutputStream getOutputStream() { return fOutStream; } - + public InputStream getErrStream() { return fErrStream; } - + public synchronized void start(String prelaunchCmd, String argument, IProgressMonitor monitor) throws Exception { if(status == STATE_RUNNING) return; - + reset(); argument = (argument == null ? RETURN_VALUE_CMD : argument + RETURN_VALUE_CMD); remoteShellProcess = RSEHelper.remoteShellExec(this.host, prelaunchCmd, this.command, argument, monitor);
@@ -95,41 +88,39 @@ public class RemoteShellExec { fErrStream = remoteShellProcess.getErrorStream(); status = STATE_RUNNING; } - + public synchronized void terminate() throws Exception { - if(status != STATE_RUNNING || remoteShellProcess != null) return; - + remoteShellProcess.destroy(); reset(); } - + public int waitFor(IProgressMonitor monitor) throws InterruptedException { - while(status==STATE_RUNNING) { - if(monitor!=null) { + while(status == STATE_RUNNING) { + if(monitor != null) { if(monitor.isCanceled()) { throw new InterruptedException("User Cancelled"); } } - + try { remoteShellProcess.waitFor(); }catch(InterruptedException e){ //get the return value try { if(fInStream.available() != 0) { - BufferedReader in=new BufferedReader(new InputStreamReader(fInStream)); + BufferedReader in = new BufferedReader(new InputStreamReader(fInStream)); String thisline; int idx; - while((thisline=in.readLine()) != null) { - if(thisline.indexOf(RETURN_VALUE_CMD)==-1) { - idx=thisline.indexOf(RETURN_VALUE_TAG); + while((thisline = in.readLine()) != null) { + if(thisline.indexOf(RETURN_VALUE_CMD) == -1) { + idx = thisline.indexOf(RETURN_VALUE_TAG); if(idx != -1) { try { - exit_code=(new Integer(thisline.substring(idx+RETURN_VALUE_TAG.length()))).intValue(); + exitCode=(new Integer(thisline.substring(idx+RETURN_VALUE_TAG.length()))).intValue(); }catch(NumberFormatException e2) { - // } break; }
@@ -143,7 +134,7 @@ public class RemoteShellExec { status=STATE_EXITED; } } - return exit_code; + return exitCode; } }
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseModel.java +1 -1
@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.rse.core.model.IHost; import org.yocto.remote.utils.RSEHelper; -import org.yocto.sdk.remotetools.remote.RemoteShellExec; +import org.yocto.remote.utils.RemoteShellExec; abstract public class BaseModel implements IRunnableWithProgress { protected IHost host;
Signature · 1 line
1.7.9.5
PATCH v2 7/7 Remove all plugin dependencies to RSE APi from remote tools plugin
In reply to Ioana Grigoropol- removed all plugin dependencies to the RSE API & kept only the ones needed for GUI actions and Terminal views
--- .../org.yocto.sdk.remotetools/META-INF/MANIFEST.MF | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
plugins/org.yocto.sdk.remotetools/META-INF/MANIFEST.MF +4 -6
@@ -7,16 +7,10 @@ Bundle-Activator: org.yocto.sdk.remotetools.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.rse.core;bundle-version="3.0.0", - org.eclipse.rse.services;bundle-version="3.0.0", - org.eclipse.rse.subsystems.files.core;bundle-version="3.0.0", - org.eclipse.rse.ui;bundle-version="3.0.0", org.yocto.sdk.ide, - org.eclipse.tm.terminal;bundle-version="3.0.1", - org.eclipse.rse.subsystems.terminals.core;bundle-version="[1.0.0,2.0.0)", org.eclipse.rse.terminals.ui;bundle-version="1.0.100", org.eclipse.cdt;bundle-version="7.0.0", org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0", - org.eclipse.rse.subsystems.shells.core, org.eclipse.ui.ide;bundle-version="3.8.0", org.eclipse.ui.console;bundle-version="3.5.100" Bundle-ActivationPolicy: lazy
@@ -24,6 +18,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.eclipse.core.resources, org.eclipse.debug.internal.ui, org.eclipse.rse.shells.ui, + org.eclipse.rse.ui.actions, + org.eclipse.tm.internal.terminal.control, + org.eclipse.tm.internal.terminal.control.actions, + org.eclipse.tm.internal.terminal.provisional.api, org.eclipse.ui.forms.widgets, org.yocto.remote.utils Bundle-Vendor: %Bundle-Vendor
Signature · 1 line
1.7.9.5
PATCH 8/12 Move ShellSession to org.yocto.remote.utils separate plugin
In reply to Ioana Grigoropol- ShellSession is used as a wrapper for a remote shell used for running commands on a remote machine with bitbake environment
- move ShellSession org.yocto.remote.plugin since it is part of remote utilities
- remove shell session class from remotetools plugin
- modify org.yocto.sdk.remotetools to use implementation from org.yocto.remote.utils
---
.../src/org/yocto/remote/utils}/ShellSession.java | 68 ++++++++------------
.../sdk/remotetools/actions/SystemtapModel.java | 2 +-
2 files changed, 28 insertions(+), 42 deletions(-)
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools => org.yocto.remote.utils/src/org/yocto/remote/utils}/ShellSession.java (95%)plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/ShellSession.java renamed from plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/ShellSession.java +27 -41
@@ -9,7 +9,7 @@ * Ken Gilmer - initial API and implementation * Jessica Zhang - Adopt for Yocto Tools plugin *******************************************************************************/ -package org.yocto.sdk.remotetools; +package org.yocto.remote.utils; import java.io.BufferedReader; import java.io.File;
@@ -37,38 +37,36 @@ public class ShellSession { /** * String used to isolate command execution */ - //public static final String TERMINATOR = "#234o987dsfkcqiuwey18837032843259d"; public static final String TERMINATOR = "build$"; public static final String LT = System.getProperty("line.separator"); - + private Process process; + + private OutputStream pos = null; + + private String shellPath = null; + private final String initCmd; + private final File root; + + private OutputStreamWriter out; + public static String getFilePath(String file) throws IOException { File f = new File(file); - + if (!f.exists() || f.isDirectory()) { throw new IOException("Path passed is not a file: " + file); } - + StringBuffer sb = new StringBuffer(); - + String elems[] = file.split(File.separator); - + for (int i = 0; i < elems.length - 1; ++i) { sb.append(elems[i]); sb.append(File.separator); } - + return sb.toString(); } - private Process process; - - private OutputStream pos = null; - - private String shellPath = null; - private final String initCmd; - private final File root; - - private OutputStreamWriter out; - public ShellSession(int shellType, File root, String initCmd, OutputStream out) throws IOException { this.root = root;
@@ -82,31 +80,31 @@ public class ShellSession { shellPath = "/bin/sh"; } shellPath = "/bin/bash"; - + initializeShell(); } private void initializeShell() throws IOException { process = Runtime.getRuntime().exec(shellPath); pos = process.getOutputStream(); - + if (root != null) { execute("cd " + root.getAbsolutePath()); } - + if (initCmd != null) { execute("source " + initCmd); } } - synchronized + synchronized public String execute(String command, int[] retCode) throws IOException { String errorMessage = null; - + interrupt = false; out.write(command); out.write(LT); - + sendToProcessAndTerminate(command); if (process.getErrorStream().available() > 0) {
@@ -119,7 +117,7 @@ public class ShellSession { if (!msg_str.contains("WARNING")) errorMessage = "Error while executing: " + command + LT + new String(msg); } - + BufferedReader br = new BufferedReader(new InputStreamReader(process .getInputStream()));
@@ -155,11 +153,11 @@ public class ShellSession { return sb.toString(); } - synchronized + synchronized public void execute(String command) throws IOException { interrupt = false; String errorMessage = null; - + sendToProcessAndTerminate(command); boolean cancel = false; try {
@@ -206,7 +204,7 @@ public class ShellSession { } catch (InvocationTargetException e1) { e1.printStackTrace(); } - } + } out.flush(); if (errorMessage != null) { throw new IOException(errorMessage);
@@ -302,23 +300,11 @@ public class ShellSession { } return accepted; } - - private void clearErrorStream(InputStream is) { - - try { - byte b[] = new byte[is.available()]; - is.read(b); - System.out.println("clearing: " + new String(b)); - } catch (IOException e) { - e.printStackTrace(); - //Ignore any error - } - } /** * Send command string to shell process and add special terminator string so * reader knows when output is complete. - * + * * @param command * @throws IOException */
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapModel.java +1 -1
@@ -19,7 +19,7 @@ import org.eclipse.ui.console.ConsolePlugin; import org.eclipse.ui.console.IConsole; import org.eclipse.ui.console.IConsoleManager; import org.eclipse.ui.console.MessageConsole; -import org.yocto.sdk.remotetools.ShellSession; +import org.yocto.remote.utils.ShellSession; public class SystemtapModel extends BaseModel { protected static final String DEFAULT_INIT_SCRIPT = "oe-init-build-env";
Signature · 1 line
1.7.9.5
PATCH 9/12 Move CommonHelper to org.yocto.remote.utils separate plugin
In reply to Ioana Grigoropol- common helper is better suited to org.yocto.remote.utils since it is used for:
- running commands
- displaying error dialogs
- remove common helper from remote tools plugin and add it to a separated plugin
- modify org.yocto.sdk.remotetools to use implementation from org.yocto.remote.utils
---
.../src/org/yocto/remote/utils}/CommonHelper.java | 20 +++++++++++---------
.../sdk/remotetools/actions/OprofileModel.java | 2 +-
.../actions/SystemtapSettingDialog.java | 2 +-
.../sdk/remotetools/actions/TerminalHandler.java | 2 +-
4 files changed, 14 insertions(+), 12 deletions(-)
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools => org.yocto.remote.utils/src/org/yocto/remote/utils}/CommonHelper.java (77%)plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/CommonHelper.java renamed from plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/CommonHelper.java +11 -9
@@ -8,7 +8,7 @@ * Contributors: * Intel - initial API and implementation *******************************************************************************/ -package org.yocto.sdk.remotetools; +package org.yocto.remote.utils; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status;
@@ -18,27 +18,29 @@ import org.eclipse.swt.widgets.Display; public class CommonHelper { static public boolean isExecAvail(String exec) { - boolean ret=false; + boolean ret = false; try { - Process p=Runtime.getRuntime().exec(new String[] {"which",exec}); + Process p = Runtime.getRuntime().exec(new String[] {"which", exec}); p.waitFor(); - if(p.exitValue()==0) { - ret=true; + if(p.exitValue() == 0) { + ret = true; } } catch (Exception e) { e.printStackTrace(); } return ret; } - + public static void showErrorDialog(final String dialogTitle, final String errorMessage, final String reason) { - //needs to be run in the ui thread otherwise swt throws invalid thread access + //needs to be run in the ui thread otherwise swt throws invalid thread access Display.getDefault().syncExec(new Runnable() { + @Override public void run() { - ErrorDialog.openError(null, dialogTitle, errorMessage, new Status(IStatus.ERROR,Activator.PLUGIN_ID,reason)); + ErrorDialog.openError(null, dialogTitle, errorMessage, + new Status(IStatus.ERROR,Activator.PLUGIN_ID,reason)); } }); } - + }
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/OprofileModel.java +1 -1
@@ -21,9 +21,9 @@ import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.rse.core.model.IHost; import org.eclipse.ui.IWorkbenchWindow; +import org.yocto.remote.utils.CommonHelper; import org.yocto.sdk.ide.YoctoSDKPlugin; import org.yocto.sdk.ide.preferences.PreferenceConstants; -import org.yocto.sdk.remotetools.CommonHelper; import org.yocto.sdk.remotetools.LocalJob; import org.yocto.sdk.remotetools.Messages;
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapSettingDialog.java +1 -1
@@ -27,8 +27,8 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import org.yocto.remote.utils.CommonHelper; import org.yocto.sdk.remotetools.Activator; -import org.yocto.sdk.remotetools.CommonHelper; import org.yocto.sdk.remotetools.Messages; import org.yocto.sdk.remotetools.SWTFactory;
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/TerminalHandler.java +1 -1
@@ -33,8 +33,8 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.Shell; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; +import org.yocto.remote.utils.CommonHelper; import org.yocto.remote.utils.RSEHelper; -import org.yocto.sdk.remotetools.CommonHelper; abstract public class TerminalHandler extends AbstractHandler {
Signature · 1 line
1.7.9.5
PATCH 10/12 Move TerminalHandler to org.yocto.remote.utils
In reply to Ioana Grigoropol- move TerminalHandler to separate plugin since it performs actions that are best suited for remote utilities
- remove TerminalHandler from remotetools plugin
- modify org.yocto.sdk.remotetools to use implementation from org.yocto.remote.utils
---
.../org.yocto.remote.utils/META-INF/MANIFEST.MF | 9 ++++++-
.../org/yocto/remote/utils}/TerminalHandler.java | 28 ++++++++++----------
.../sdk/remotetools/actions/DialogHandler.java | 1 +
3 files changed, 23 insertions(+), 15 deletions(-)
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions => org.yocto.remote.utils/src/org/yocto/remote/utils}/TerminalHandler.java (94%)plugins/org.yocto.remote.utils/META-INF/MANIFEST.MF +8 -1
@@ -11,10 +11,17 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.eclipse.rse.core, org.eclipse.rse.core.model, org.eclipse.rse.core.subsystems, + org.eclipse.rse.internal.terminals.ui, + org.eclipse.rse.internal.terminals.ui.views, org.eclipse.rse.services, org.eclipse.rse.services.files, org.eclipse.rse.services.shells, + org.eclipse.rse.services.terminals, org.eclipse.rse.subsystems.files.core.servicesubsystem, org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem, - org.eclipse.rse.subsystems.terminals.core + org.eclipse.rse.subsystems.terminals.core, + org.eclipse.rse.subsystems.terminals.core.elements, + org.eclipse.rse.ui, + org.eclipse.tm.internal.terminal.control, + org.eclipse.tm.internal.terminal.provisional.api Export-Package: org.yocto.remote.utils
plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/TerminalHandler.java renamed from plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/TerminalHandler.java +14 -14
@@ -8,7 +8,7 @@ * Contributors: * Intel - initial API and implementation *******************************************************************************/ -package org.yocto.sdk.remotetools.actions; +package org.yocto.remote.utils; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionException;
@@ -33,20 +33,18 @@ import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.widgets.Shell; import org.eclipse.tm.internal.terminal.control.ITerminalViewControl; import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; -import org.yocto.remote.utils.CommonHelper; -import org.yocto.remote.utils.RSEHelper; abstract public class TerminalHandler extends AbstractHandler { - - + + protected Shell shell; - - protected String changeTerm="export TERM=vt100;"; - + + protected String changeTerm = "export TERM=vt100;"; + abstract protected String getInitCmd(); abstract protected String getConnnectionName(); abstract protected String getDialogTitle(); - + protected ITerminalShell getTerminalShellFromTab(CTabItem item) { ITerminalShell terminalShell = null; ITerminalViewControl terminalViewControl = (ITerminalViewControl) item
@@ -65,7 +63,8 @@ abstract public class TerminalHandler extends AbstractHandler { try { ProgressMonitorDialog dialog = new ProgressMonitorDialog(shell); dialog.run(true, true, new IRunnableWithProgress(){ - public void run(IProgressMonitor monitor) { + @Override + public void run(IProgressMonitor monitor) { monitor.beginTask("Connecting to remote target ...", 100); try { terminalSubSystem.connect(new NullProgressMonitor(), false);
@@ -73,7 +72,7 @@ abstract public class TerminalHandler extends AbstractHandler { } catch (Exception e) { CommonHelper.showErrorDialog("Connection failure", null, e.getMessage()); monitor.done(); - + } } });
@@ -88,11 +87,11 @@ abstract public class TerminalHandler extends AbstractHandler { return true; return false; } - + public void execute(IHost host) throws ExecutionException { - + final ITerminalServiceSubSystem terminalSubSystem = RSEHelper.getTerminalSubSystem(host); - + if (terminalSubSystem != null) { TerminalsUI terminalsUI = TerminalsUI.getInstance(); TerminalViewer viewer = terminalsUI.activateTerminalsView();
@@ -103,6 +102,7 @@ abstract public class TerminalHandler extends AbstractHandler { //we have manually exit it here try { tab.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { Object source = e.getSource(); if (source instanceof CTabItem) {
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/DialogHandler.java +1 -0
@@ -15,6 +15,7 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.rse.core.model.IHost; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.handlers.HandlerUtil; +import org.yocto.remote.utils.TerminalHandler; abstract public class DialogHandler extends TerminalHandler {
Signature · 1 line
1.7.9.5
PATCH 11/12 Remove unused TCFTerminalConnectors
In reply to Ioana Grigoropol- removed TCFTerminalConnector and TCFTerminalConnectorImpl since there are no usages of this classes
--- .../remotetools/views/TCFTerminalConnector.java | 49 ---------- .../views/TCFTerminalConnectorImpl.java | 98 -------------------- 2 files changed, 147 deletions(-) delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnector.java delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnectorImpl.java
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnector.java deleted +0 -49
@@ -1,49 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2008, 2009 MontaVista Software, Inc. and others - * 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: - * Anna Dushistova (MontaVista) - initial API and implementation - * Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point - ********************************************************************************/ -package org.yocto.sdk.remotetools.views; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.rse.core.model.IHost; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; - -public class TCFTerminalConnector extends TCFTerminalConnectorImpl implements ITerminalConnector { - - public TCFTerminalConnector(IHost host) { - super(host); - } - - public String getId() { - return "yocto_tcf_internal_connector"; //$NON-NLS-1$ - } - - public String getInitializationErrorMessage() { - return null; - } - - public String getName() { - return "yocto_tcf_internal_connector"; - } - - public boolean isHidden() { - return true; - } - - public boolean isInitialized() { - return true; - } - - public Object getAdapter(Class adapterType) { - if (adapterType.isInstance(this)) - return this; - return Platform.getAdapterManager().getAdapter(this, adapterType); - } - -}
plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnectorImpl.java deleted +0 -98
98 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 12/12 Remove all plugin dependencies to RSE APi from remote tools plugin
In reply to Ioana Grigoropol- removed all plugin dependencies to the RSE API & kept only the ones needed for GUI actions and Terminal views
--- .../org.yocto.sdk.remotetools/META-INF/MANIFEST.MF | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
plugins/org.yocto.sdk.remotetools/META-INF/MANIFEST.MF +4 -6
@@ -7,16 +7,10 @@ Bundle-Activator: org.yocto.sdk.remotetools.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.rse.core;bundle-version="3.0.0", - org.eclipse.rse.services;bundle-version="3.0.0", - org.eclipse.rse.subsystems.files.core;bundle-version="3.0.0", - org.eclipse.rse.ui;bundle-version="3.0.0", org.yocto.sdk.ide, - org.eclipse.tm.terminal;bundle-version="3.0.1", - org.eclipse.rse.subsystems.terminals.core;bundle-version="[1.0.0,2.0.0)", org.eclipse.rse.terminals.ui;bundle-version="1.0.100", org.eclipse.cdt;bundle-version="7.0.0", org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0", - org.eclipse.rse.subsystems.shells.core, org.eclipse.ui.ide;bundle-version="3.8.0", org.eclipse.ui.console;bundle-version="3.5.100" Bundle-ActivationPolicy: lazy
@@ -24,6 +18,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.eclipse.core.resources, org.eclipse.debug.internal.ui, org.eclipse.rse.shells.ui, + org.eclipse.rse.ui.actions, + org.eclipse.tm.internal.terminal.control, + org.eclipse.tm.internal.terminal.control.actions, + org.eclipse.tm.internal.terminal.provisional.api, org.eclipse.ui.forms.widgets, org.yocto.remote.utils Bundle-Vendor: %Bundle-Vendor
Signature · 1 line
1.7.9.5
Please disregard this patch set, I will send a clean batch.
________________________________________
From: Grigoropol, IoanaX
Sent: Thursday, May 09, 2013 10:46 AM
To: [email protected]
Cc: Grigoropol, IoanaX
Subject: [PATCH 00/12] Refactor Remote tools plugin & create Remote Utils separate plugin
- some more refactoring for the org.yocto.sdk.remotetools
- create & populate org.yocto.remote.utils
Ioana Grigoropol (12):
Separate remote logic from GUI login in TerminalHandler
implementation
Move remote system type checkings from GUI Dialogs and to RSEHelper Move logic for waiting for RSE initialization to RSEHelper Move filtering of suitable connections to RSEHelper Initial commit for separate remote utilities plugin
Move RSEHelper to a separate plugin
Move RemoteShellExec to separate plugin
Move ShellSession to org.yocto.remote.utils separate plugin Move CommonHelper to org.yocto.remote.utils separate plugin Move TerminalHandler to org.yocto.remote.utils
Remove unused TCFTerminalConnectors
Remove all plugin dependencies to RSE APi from remote tools plugin
plugins/org.yocto.remote.utils/.classpath | 7 +
plugins/org.yocto.remote.utils/.project | 28 +++
.../.settings/org.eclipse.jdt.core.prefs | 7 +
.../org.yocto.remote.utils/META-INF/MANIFEST.MF | 27 +++
plugins/org.yocto.remote.utils/build.properties | 4 +
.../src/org/yocto/remote/utils/Activator.java | 62 +++++++
.../src/org/yocto/remote/utils}/CommonHelper.java | 20 ++-
.../src/org/yocto/remote/utils/Messages.java | 35 ++++
.../src/org/yocto/remote/utils}/RSEHelper.java | 178 +++++++-------------
.../org/yocto/remote/utils}/RemoteShellExec.java | 95 +++++------
.../src/org/yocto/remote/utils}/ShellSession.java | 68 +++-----
.../org/yocto/remote/utils}/TerminalHandler.java | 121 +++++--------
.../org.yocto.sdk.remotetools/META-INF/MANIFEST.MF | 13 +-
.../yocto/sdk/remotetools/actions/BaseModel.java | 4 +-
.../sdk/remotetools/actions/BaseSettingDialog.java | 29 +---
.../sdk/remotetools/actions/DialogHandler.java | 42 +++++
.../sdk/remotetools/actions/LatencytopHandler.java | 2 +-
.../sdk/remotetools/actions/OprofileModel.java | 2 +-
.../yocto/sdk/remotetools/actions/PerfHandler.java | 2 +-
.../sdk/remotetools/actions/SystemtapModel.java | 2 +-
.../actions/SystemtapSettingDialog.java | 2 +-
.../remotetools/views/TCFTerminalConnector.java | 49 ------
.../views/TCFTerminalConnectorImpl.java | 98 -----------
23 files changed, 416 insertions(+), 481 deletions(-)
create mode 100644 plugins/org.yocto.remote.utils/.classpath
create mode 100644 plugins/org.yocto.remote.utils/.project
create mode 100644 plugins/org.yocto.remote.utils/.settings/org.eclipse.jdt.core.prefs
create mode 100644 plugins/org.yocto.remote.utils/META-INF/MANIFEST.MF
create mode 100644 plugins/org.yocto.remote.utils/build.properties
create mode 100644 plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/Activator.java
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools => org.yocto.remote.utils/src/org/yocto/remote/utils}/CommonHelper.java (77%)
create mode 100644 plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/Messages.java
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools => org.yocto.remote.utils/src/org/yocto/remote/utils}/RSEHelper.java (77%)
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/remote => org.yocto.remote.utils/src/org/yocto/remote/utils}/RemoteShellExec.java (69%)
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools => org.yocto.remote.utils/src/org/yocto/remote/utils}/ShellSession.java (95%)
rename plugins/{org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions => org.yocto.remote.utils/src/org/yocto/remote/utils}/TerminalHandler.java (55%)
create mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/DialogHandler.java
delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnector.java
delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnectorImpl.java--
1.7.9.5