Move RSEHelper to a separate plugin
PATCH v2 1/1 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
- add plugin resources need for RSEHelper
--- .../org.yocto.remote.utils/META-INF/MANIFEST.MF | 10 + .../org.yocto.remote.utils/resources/ust_tar.sh | 19 + .../org.yocto.remote.utils/resources/yocto_tool.sh | 125 ++++++ .../org.yocto.remote.utils/resources/yocto_ust.sh | 35 ++ .../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 +- 13 files changed, 577 insertions(+), 425 deletions(-) create mode 100755 plugins/org.yocto.remote.utils/resources/ust_tar.sh create mode 100755 plugins/org.yocto.remote.utils/resources/yocto_tool.sh create mode 100755 plugins/org.yocto.remote.utils/resources/yocto_ust.sh 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/resources/ust_tar.sh new file +19 -0
@@ -0,0 +1,19 @@ +#!/bin/sh + +#set PATH to include sbin dirs +export PATH="$PATH:/usr/local/sbin:/usr/sbin:/sbin" + +if [ ! -d "$@" ] || [ -z "$@" ]; then + exit 1 +fi + +DATESTRING="$(date +%Y%m%d%H%M%S%N)" +BASENAME=`basename $@` +DATAFILE=/tmp/${BASENAME}-${DATESTRING}.tar +cd $@ +cd .. + +tar -cf ${DATAFILE} ${BASENAME} &> /dev/null || exit $? + +echo -e "ustfile:$DATAFILE\n" +
plugins/org.yocto.remote.utils/resources/yocto_tool.sh new file +125 -0
125 lines not on this page · raw message
plugins/org.yocto.remote.utils/resources/yocto_ust.sh new file +35 -0
@@ -0,0 +1,35 @@ +#!/bin/sh + +#set PATH to include sbin dirs +export PATH="$PATH:/usr/local/sbin:/usr/sbin:/sbin" + +DATESTRING="$(date +%Y%m%d%H%M%S%N)" +TEMPFILE="/tmp/yocto-ust-tmp-$DATESTRING" + +rm -f ${TEMPFILE} +usttrace $@ &> ${TEMPFILE} +ret=$? + +if [ $ret -ne 0 ]; then + cat $TEMPFILE + rm -f $TEMPFILE + exit $ret +fi + +#search for output dir +USTDIR=`cat ${TEMPFILE} | awk '/^Trace was output in:/ { print $5}'` +rm -f ${TEMPFILE} + +if [ -z "$USTDIR" ]; then + exit 1 +fi + +BASENAME=`basename $USTDIR` +DATAFILE=/tmp/${BASENAME}.tar +cd $USTDIR +cd .. + +tar -cf ${DATAFILE} ${BASENAME} &> /dev/null || exit $? + +echo -e "ustfile:$DATAFILE\n" +
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
I have sent a v3 of this patch that includes also the clean-up for remotetools plugin. Please disregard this one.
________________________________________
From: Grigoropol, IoanaX
Sent: Thursday, May 09, 2013 3:06 PM
To: [email protected]
Cc: Grigoropol, IoanaX
Subject: [PATCH v2] 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
- add plugin resources need for RSEHelper
--- .../org.yocto.remote.utils/META-INF/MANIFEST.MF | 10 + .../org.yocto.remote.utils/resources/ust_tar.sh | 19 + .../org.yocto.remote.utils/resources/yocto_tool.sh | 125 ++++++ .../org.yocto.remote.utils/resources/yocto_ust.sh | 35 ++ .../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 +- 13 files changed, 577 insertions(+), 425 deletions(-) create mode 100755 plugins/org.yocto.remote.utils/resources/ust_tar.sh create mode 100755 plugins/org.yocto.remote.utils/resources/yocto_tool.sh create mode 100755 plugins/org.yocto.remote.utils/resources/yocto_ust.sh 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/resources/ust_tar.sh new file +19 -0
@@ -0,0 +1,19 @@ +#!/bin/sh + +#set PATH to include sbin dirs +export PATH="$PATH:/usr/local/sbin:/usr/sbin:/sbin" + +if [ ! -d "$@" ] || [ -z "$@" ]; then + exit 1 +fi + +DATESTRING="$(date +%Y%m%d%H%M%S%N)" +BASENAME=`basename $@` +DATAFILE=/tmp/${BASENAME}-${DATESTRING}.tar +cd $@ +cd .. + +tar -cf ${DATAFILE} ${BASENAME} &> /dev/null || exit $? + +echo -e "ustfile:$DATAFILE\n" +
plugins/org.yocto.remote.utils/resources/yocto_tool.sh new file +125 -0
125 lines not on this page · raw message
plugins/org.yocto.remote.utils/resources/yocto_ust.sh new file +35 -0
@@ -0,0 +1,35 @@ +#!/bin/sh + +#set PATH to include sbin dirs +export PATH="$PATH:/usr/local/sbin:/usr/sbin:/sbin" + +DATESTRING="$(date +%Y%m%d%H%M%S%N)" +TEMPFILE="/tmp/yocto-ust-tmp-$DATESTRING" + +rm -f ${TEMPFILE} +usttrace $@ &> ${TEMPFILE} +ret=$? + +if [ $ret -ne 0 ]; then + cat $TEMPFILE + rm -f $TEMPFILE + exit $ret +fi + +#search for output dir +USTDIR=`cat ${TEMPFILE} | awk '/^Trace was output in:/ { print $5}'` +rm -f ${TEMPFILE} + +if [ -z "$USTDIR" ]; then + exit 1 +fi + +BASENAME=`basename $USTDIR` +DATAFILE=/tmp/${BASENAME}.tar +cd $USTDIR +cd .. + +tar -cf ${DATAFILE} ${BASENAME} &> /dev/null || exit $? + +echo -e "ustfile:$DATAFILE\n" +
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 {
--
1.7.9.5