Attachment 107191 Details for Bug 239159 – patch that fixes the issue

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch that fixes the issue

processSubsystemOverTerminal.diff (text/plain), 11.69 KB, created by Anna Dushistova

on 2008-07-11 07:32:07 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Anna Dushistova

Created: 2008-07-11 07:32:07 EDT

Size: 11.69 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.subsystems.processes.shell.linux
>Index: src/org/eclipse/rse/internal/subsystems/processes/shell/linux/Activator.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/src/org/eclipse/rse/internal/subsystems/processes/shell/linux/Activator.java,v
>retrieving revision 1.3
>diff -u -r1.3 Activator.java
>--- src/org/eclipse/rse/internal/subsystems/processes/shell/linux/Activator.java	22 Feb 2007 23:11:46 -0000	1.3
>+++ src/org/eclipse/rse/internal/subsystems/processes/shell/linux/Activator.java	11 Jul 2008 11:24:26 -0000
>@@ -1,13 +1,14 @@
> /*******************************************************************************
>- * Copyright (c) 2006, 2007 MontaVista Software, Inc. and others.
>+ * Copyright (c) 2006, 2008 MontaVista Software, Inc. and others.
>  * 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: 
>- * Yu-Fen Kuo (MontaVista) - initial API and implementation
>+ * Yu-Fen Kuo       (MontaVista) - initial API and implementation
>  * Martin Oberhuber (Wind River) - [refactor] "shell" instead of "ssh" everywhere 
>+ * Anna Dushistova  (MontaVista) - [239159] The shell process subsystem not working without the shells subsystem present for the systemType
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.subsystems.processes.shell.linux;
>@@ -22,9 +23,9 @@
> 
> import org.eclipse.rse.core.model.IHost;
> import org.eclipse.rse.core.subsystems.ISubSystem;
>+import org.eclipse.rse.services.IService;
> import org.eclipse.rse.services.shells.IShellService;
> import org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystem;
>-import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem;
> 
> /**
>  * The activator class controls the plug-in life cycle
>@@ -159,9 +160,9 @@
>      * @return shell service object, or <code>null</code> if not found.
>      */
>     public static IShellService getShellService(IHost host) {
>-    	IShellServiceSubSystem ss = getShellServiceSubSystem(host);
>+    	ISubSystem ss = getSuitableSubSystem(host);
>     	if (ss!=null) {
>-    		return ss.getShellService();
>+    		return (IShellService)ss.getSubSystemConfiguration().getService(host).getAdapter(IShellService.class);
>     	}
>         return null;
>     }
>@@ -172,14 +173,19 @@
>      * @param host the connection 
>      * @return shell service subsystem, or <code>null</code> if not found.
>      */
>-    public static IShellServiceSubSystem getShellServiceSubSystem(IHost host) {
>+    public static ISubSystem getSuitableSubSystem(IHost host) {
>         if (host == null)
>             return null;
>         ISubSystem[] subSystems = host.getSubSystems();
>+        IShellService ssvc = null;
>         for (int i = 0; subSystems != null && i < subSystems.length; i++) {
>-            if (subSystems[i] instanceof IShellServiceSubSystem) {
>-                return (IShellServiceSubSystem)subSystems[i];
>-            }
>+        	IService svc = subSystems[i].getSubSystemConfiguration().getService(host);
>+        	if (svc!=null) {
>+        		ssvc = (IShellService)svc.getAdapter(IShellService.class);
>+        		if (ssvc != null) {
>+        		    return subSystems[i];	
>+        		}	
>+        	}
>         }
>         return null;
>     }
>Index: src/org/eclipse/rse/internal/subsystems/processes/shell/linux/DelegatingShellProcessConnectorService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/src/org/eclipse/rse/internal/subsystems/processes/shell/linux/DelegatingShellProcessConnectorService.java,v
>retrieving revision 1.2
>diff -u -r1.2 DelegatingShellProcessConnectorService.java
>--- src/org/eclipse/rse/internal/subsystems/processes/shell/linux/DelegatingShellProcessConnectorService.java	28 Mar 2007 20:28:12 -0000	1.2
>+++ src/org/eclipse/rse/internal/subsystems/processes/shell/linux/DelegatingShellProcessConnectorService.java	11 Jul 2008 11:24:26 -0000
>@@ -1,5 +1,5 @@
> /********************************************************************************
>- * Copyright (c) 2007 IBM Corporation. All rights reserved.
>+ * Copyright (c) 2007, 2008 IBM 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
>@@ -9,16 +9,15 @@
>  * component that contains this file: David McKnight.
>  * 
>  * Contributors:
>- * {Name} (company) - description of contribution.
>+ * Anna Dushistova  (MontaVista) - [239159] The shell process subsystem not working without the shells subsystem present for the systemType
>  ********************************************************************************/
> package org.eclipse.rse.internal.subsystems.processes.shell.linux;
> 
> import org.eclipse.rse.core.model.IHost;
> import org.eclipse.rse.core.subsystems.AbstractDelegatingConnectorService;
> import org.eclipse.rse.core.subsystems.IConnectorService;
>-
>+import org.eclipse.rse.core.subsystems.ISubSystem;
> import org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystem;
>-import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem;
> 
> /**
>  * This class delegates the connector service requests for the linux process 
>@@ -47,7 +46,7 @@
> 		}
> 		else
> 		{
>-			IShellServiceSubSystem ss = Activator.getShellServiceSubSystem(getHost());
>+			ISubSystem ss = Activator.getSuitableSubSystem(getHost());
> 			if (ss != null)
> 			{
> 				_realService = ss.getConnectorService();
>Index: src/org/eclipse/rse/internal/subsystems/processes/shell/linux/LinuxShellProcessService.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/src/org/eclipse/rse/internal/subsystems/processes/shell/linux/LinuxShellProcessService.java,v
>retrieving revision 1.5
>diff -u -r1.5 LinuxShellProcessService.java
>--- src/org/eclipse/rse/internal/subsystems/processes/shell/linux/LinuxShellProcessService.java	9 Apr 2008 21:41:04 -0000	1.5
>+++ src/org/eclipse/rse/internal/subsystems/processes/shell/linux/LinuxShellProcessService.java	11 Jul 2008 11:24:26 -0000
>@@ -12,6 +12,7 @@
>  * David McKnight   (IBM)        - [175308] Need to use a job to wait for shell to exit
>  * Martin Oberhuber (Wind River) - [226262] Make IService IAdaptable and add Javadoc
>  * Martin Oberhuber (Wind River) - [226301][api] IShellService should throw SystemMessageException on error
>+ * Anna Dushistova  (MontaVista) - [239159] The shell process subsystem not working without the shells subsystem present for the systemType
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.subsystems.processes.shell.linux;
>@@ -26,6 +27,7 @@
> import org.eclipse.core.runtime.NullProgressMonitor;
> 
> import org.eclipse.rse.core.model.IHost;
>+import org.eclipse.rse.core.subsystems.ISubSystem;
> import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
> import org.eclipse.rse.services.clientserver.processes.IHostProcess;
> import org.eclipse.rse.services.clientserver.processes.IHostProcessFilter;
>@@ -34,7 +36,6 @@
> import org.eclipse.rse.services.shells.HostShellProcessAdapter;
> import org.eclipse.rse.services.shells.IHostShell;
> import org.eclipse.rse.services.shells.IShellService;
>-import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem;
> 
> /**
>  * class to fetch remote linux target's process info
>@@ -106,7 +107,7 @@
>             final IProgressMonitor monitor) throws SystemMessageException {
>         // this is to workaround RSE bug 147531
>         if (filter.getUsername().equals("${user.id}") && host != null) { //$NON-NLS-1$
>-        	IShellServiceSubSystem ss = Activator.getShellServiceSubSystem(host);
>+        	ISubSystem ss = Activator.getSuitableSubSystem(host);
>         	if (ss!=null) {
>                 // change filter username so the filter will filter out the right
>                 // process for my processes
>Index: src/org/eclipse/rse/subsystems/processes/shell/linux/ShellProcessSubSystemConfiguration.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/src/org/eclipse/rse/subsystems/processes/shell/linux/ShellProcessSubSystemConfiguration.java,v
>retrieving revision 1.4
>diff -u -r1.4 ShellProcessSubSystemConfiguration.java
>--- src/org/eclipse/rse/subsystems/processes/shell/linux/ShellProcessSubSystemConfiguration.java	12 May 2007 01:40:00 -0000	1.4
>+++ src/org/eclipse/rse/subsystems/processes/shell/linux/ShellProcessSubSystemConfiguration.java	11 Jul 2008 11:24:26 -0000
>@@ -1,5 +1,5 @@
> /********************************************************************************
>- * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
>+ * Copyright (c) 2006, 2008 IBM Corporation and others. 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
>@@ -14,6 +14,7 @@
>  * Yu-Fen Kuo (MontaVista) - adapted from RSE ProcessServiceSubSystemConfiguration
>  * Martin Oberhuber (Wind River) - [refactor] "shell" instead of "ssh" everywhere
>  * Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core
>+ * Anna Dushistova  (MontaVista) - [239159] The shell process subsystem not working without the shells subsystem present for the systemType
>  *******************************************************************************/
> 
> package org.eclipse.rse.subsystems.processes.shell.linux;
>@@ -30,7 +31,6 @@
> import org.eclipse.rse.subsystems.processes.core.subsystem.IHostProcessToRemoteProcessAdapter;
> import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem;
> import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystemConfiguration;
>-import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystem;
> 
> /**
>  * This class is used by org.eclipse.rse.core.subsystemConfigurations extension
>@@ -58,7 +58,7 @@
> 
>     public IConnectorService getConnectorService(IHost host) 
>     {
>-    	IShellServiceSubSystem ss = Activator.getShellServiceSubSystem(host);
>+    	ISubSystem ss = Activator.getSuitableSubSystem(host);
>     	if (ss!=null) 
>     	{
>     		return ss.getConnectorService();
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/META-INF/MANIFEST.MF,v
>retrieving revision 1.11
>diff -u -r1.11 MANIFEST.MF
>--- META-INF/MANIFEST.MF	4 Jun 2008 01:57:05 -0000	1.11
>+++ META-INF/MANIFEST.MF	11 Jul 2008 11:24:25 -0000
>@@ -10,8 +10,7 @@
>  org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
>  org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)",
>  org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
>- org.eclipse.rse.subsystems.processes.core;bundle-version="[3.0.0,4.0.0)",
>- org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)"
>+ org.eclipse.rse.subsystems.processes.core;bundle-version="[3.0.0,4.0.0)"
> Bundle-ActivationPolicy: lazy
> Eclipse-LazyStart: true
> Bundle-Vendor: %providerName

Flags:

mober.at+eclipse: review+

Actions: View | Diff

Attachments on bug 239159: 107191