About

From c7da892cb23d50d4d85746c9a0b6b14bf570989d Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Thu, 26 Jun 2014 13:23:09 +0200 Subject: initial commit for Enea Linux 4.0 Migrated from the internal git server on the daisy-enea branch Signed-off-by: Adrian Dudau --- tcf/lke_rse_tcf.patch | 2097 ++++++++++++++++++++++++++++++++++++++++++++ tcf/readme | 175 ++++ tcf/terminals_agent.patch | 1042 ++++++++++++++++++++++ tcf/terminals_plugin.patch | 618 +++++++++++++ 4 files changed, 3932 insertions(+) create mode 100644 tcf/lke_rse_tcf.patch create mode 100644 tcf/readme create mode 100644 tcf/terminals_agent.patch create mode 100644 tcf/terminals_plugin.patch (limited to 'tcf') diff --git a/tcf/lke_rse_tcf.patch b/tcf/lke_rse_tcf.patch new file mode 100644 index 0000000..6054b93 --- /dev/null +++ b/tcf/lke_rse_tcf.patch @@ -0,0 +1,2097 @@ +Index: plugins/org.eclipse.tm.tcf.rse/META-INF/MANIFEST.MF +=================================================================== +--- plugins/org.eclipse.tm.tcf.rse/META-INF/MANIFEST.MF (revision 1190) ++++ plugins/org.eclipse.tm.tcf.rse/META-INF/MANIFEST.MF (working copy) +@@ -13,8 +13,16 @@ + org.eclipse.ui.views, + org.eclipse.rse.subsystems.files.core, + org.eclipse.rse.subsystems.processes.core, +- org.eclipse.rse.processes.ui ++ org.eclipse.rse.processes.ui, ++ org.eclipse.rse.subsystems.terminals.core, ++ org.eclipse.tm.tcf;bundle-version="0.3.0", ++ org.eclipse.rse.subsystems.shells.core;bundle-version="3.1.100", ++ org.eclipse.core.resources;bundle-version="3.6.0", ++ org.eclipse.tm.tcf.core;version="0.3.0" + Import-Package: org.eclipse.tm.tcf.core;version="0.3.0", ++ org.eclipse.rse.core.filters, ++ org.eclipse.tm.internal.tcf.terminals, ++ org.eclipse.rse.core.model, + org.eclipse.tm.tcf.protocol;version="0.3.0", + org.eclipse.tm.tcf.services;version="0.3.0", + org.eclipse.tm.tcf.util;version="0.3.0" +Index: plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java +=================================================================== +--- plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java (revision 1190) ++++ plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java (working copy) +@@ -39,6 +39,11 @@ + + private final TCFFileAdapter file_adapter = new TCFFileAdapter(); + ++ public TCFFileSubSystemConfiguration() { ++ super(); ++ setIsUnixStyle(true); ++ } ++ + @Override + public ISubSystem createSubSystemInternal(IHost host) { + TCFConnectorService connectorService = (TCFConnectorService)getConnectorService(host); +@@ -78,13 +83,12 @@ + @Override + public IConnectorService getConnectorService(IHost host) { + return TCFConnectorServiceManager.getInstance() +- .getConnectorService(host, ITCFSubSystem.class); ++ .getConnectorService(host, getServiceImplType()); + } + + @Override +- @SuppressWarnings("unchecked") +- public Class getServiceImplType() { +- return TCFFileService.class; ++ public Class getServiceImplType() { ++ return ITCFSubSystem.class; + } + + @Override +Index: plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileService.java +=================================================================== +--- plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileService.java (revision 1190) ++++ plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileService.java (working copy) +@@ -11,6 +11,7 @@ + * Uwe Stieber (Wind River) - [271224] NPE in TCFFileService#download + * Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse + * Uwe Stieber (Wind River) - [274277] The TCF file service subsystem implementation is not updating the progress monitor ++ * Intel Corporation - Make recursive copy/delete available (delete/copy a folder contains files) + *******************************************************************************/ + package org.eclipse.tm.internal.tcf.rse.files; + +@@ -18,6 +19,7 @@ + import java.io.BufferedOutputStream; + import java.io.File; + import java.io.FileInputStream; ++import java.io.FileNotFoundException; + import java.io.FileOutputStream; + import java.io.IOException; + import java.io.InputStream; +@@ -131,22 +133,125 @@ + return s; + } + ++ /* Delete from UI action will call deleteBatch interface, yet ++ * for copy from UI action, it will call copy! It's totally ++ * inconsistency! For solving the problem, we have to modify ++ * the copy itself and made it recursive. We can't modify it ++ * in the same way as delete does! ++ * ++ */ ++ ++ public void internalCopy(String srcParent, ++ String srcName, String tgtParent, String tgtName, IProgressMonitor monitor) ++ throws SystemMessageException, InterruptedException { ++ //Note the dest directory or file exist surely since UI operations have ++ //done something, rename it to copy of XXX ++ if (monitor != null) ++ { ++ if (monitor.isCanceled()) ++ { ++ throw new InterruptedException("User cancelled the copy operation!"); ++ } ++ } ++ ++ try ++ { ++ //firstly create the target directory! ++ this.createFolder(tgtParent, tgtName, monitor); ++ //then copy the next level directory! ++ final String new_srcpath = toRemotePath(srcParent, srcName); ++ final String new_tgtpath = toRemotePath(tgtParent, tgtName); ++ IHostFile[] arrFiles = internalFetch(new_srcpath, null, ++ FILE_TYPE_FILES_AND_FOLDERS, monitor); ++ if (arrFiles == null || arrFiles.length <=0 ) ++ return; ++ else ++ { ++ for (int i = 0; i < arrFiles.length; i++) ++ { ++ String srcFile = toRemotePath(new_srcpath, arrFiles[i].getName()); ++ String tgtFile = toRemotePath(new_tgtpath, arrFiles[i].getName()); ++ if (arrFiles[i].isFile()) ++ { ++ copy(srcFile, tgtFile, monitor); ++ } ++ else ++ { ++ //do recursive directory copy! ++ internalCopy(new_srcpath, arrFiles[i].getName(), new_tgtpath, ++ arrFiles[i].getName(), monitor); ++ } ++ } ++ } ++ } ++ catch (SystemMessageException e) ++ { ++ e.printStackTrace(); ++ throw new SystemMessageException(e.getSystemMessage()); ++ } ++ catch (InterruptedException e) ++ { ++ throw new InterruptedException("User cancelled the copy operation!"); ++ } ++ } ++ + public void copy(String srcParent, + String srcName, String tgtParent, String tgtName, IProgressMonitor monitor) + throws SystemMessageException { +- final String src = toRemotePath(srcParent, srcName); +- final String tgt = toRemotePath(tgtParent, tgtName); ++ ++ if (monitor != null) ++ monitor.beginTask("Copying remote files!", 1); ++ ++ try { ++ ++ IHostFile curFile = getFile(srcParent, srcName, monitor); ++ final String srcFile = toRemotePath(srcParent, srcName); ++ final String tgtFile = toRemotePath(tgtParent, tgtName); ++ ++ if (curFile.isFile()) ++ copy(srcFile, tgtFile, monitor); ++ else if (curFile.isDirectory()) ++ { ++ internalCopy(srcParent, srcName, tgtParent, tgtName, monitor); ++ } ++ else ++ { ++ FileNotFoundException e = ++ new FileNotFoundException("Failed to find the to be " + ++ "copied file or directory!"); ++ throw new SystemMessageException(getMessage(e)); ++ } ++ } ++ catch (Exception e) { ++ // TODO Auto-generated catch block ++ if (e instanceof SystemMessageException) ++ throw (SystemMessageException)e; ++ else if (e instanceof InterruptedException) ++ { ++ System.out.println("User cancelled the copy operation!"); ++ } ++ throw new SystemOperationFailedException(Activator.PLUGIN_ID, e); ++ ++ } ++ finally { ++ if (monitor != null) ++ monitor.done(); ++ } ++ } ++ ++ public void copy(final String srcFile, final String tgtFile, IProgressMonitor monitor) ++ throws SystemMessageException { + new TCFRSETask() { + public void run() { + IFileSystem fs = connector.getFileSystemService(); +- fs.copy(src, tgt, false, false, new IFileSystem.DoneCopy() { ++ fs.copy(srcFile, tgtFile, false, false, new IFileSystem.DoneCopy() { + public void doneCopy(IToken token, FileSystemException error) { + if (error != null) error(error); + else done(Boolean.TRUE); + } + }); + } +- }.getS(monitor, "Copy: " + srcName); //$NON-NLS-1$ ++ }.getS(monitor, "Copy: " + srcFile); //$NON-NLS-1$ + } + + public void copyBatch(String[] srcParents, +@@ -226,13 +331,81 @@ + }.getS(monitor, "Delete"); //$NON-NLS-1$ + } + ++ private void internalDelete(String parent, String name, ++ IProgressMonitor monitor) ++ throws SystemMessageException, InterruptedException ++ { ++ if (monitor != null) ++ { ++ if (monitor.isCanceled()) ++ { ++ throw new InterruptedException("User cancelled the delete operation!"); ++ } ++ } ++ ++ try ++ { ++ final String new_path = toRemotePath(parent, name); ++ IHostFile[] arrFiles = internalFetch(new_path, null, ++ FILE_TYPE_FILES_AND_FOLDERS, monitor); ++ if (arrFiles == null || arrFiles.length <= 0) ++ { ++ //This is an empty directory, directly delete! ++ delete(parent, name, monitor); ++ } ++ else ++ { ++ for (int i = 0; i < arrFiles.length; i++) ++ { ++ ++ if (arrFiles[i].isFile()) ++ { ++ delete(new_path, arrFiles[i].getName(), monitor); ++ } ++ else ++ internalDelete(new_path, arrFiles[i].getName(), monitor); ++ } ++ //now the folder becomes empty, let us delete it! ++ delete(parent, name, monitor); ++ } ++ } ++ catch (SystemMessageException e) { ++ // TODO Auto-generated catch block ++ e.printStackTrace(); ++ throw new SystemMessageException(e.getSystemMessage()); ++ } ++ catch (InterruptedException e) { ++ throw new InterruptedException("User cancelled the delete operation!"); ++ } ++ } ++ + @Override + public void deleteBatch(String[] remoteParents, String[] fileNames, + IProgressMonitor monitor) +- throws SystemMessageException { +- for (int i = 0; i < remoteParents.length; i++) { +- delete(remoteParents[i], fileNames[i], monitor); ++ throws SystemMessageException { ++ if (monitor != null) ++ monitor.beginTask("Deleting selected folders or files!", remoteParents.length); ++ try ++ { ++ for (int i = 0; i < remoteParents.length; i++) { ++ IHostFile curFile = getFile(remoteParents[i], fileNames[i], monitor); ++ if (curFile.isFile()) ++ delete(remoteParents[i], fileNames[i], monitor); ++ else if (curFile.isDirectory()) ++ internalDelete(remoteParents[i], fileNames[i], monitor); ++ } + } ++ catch (Exception x) { ++ if (x instanceof SystemMessageException) throw (SystemMessageException)x; ++ else if (x instanceof InterruptedException) { ++ System.out.println("user cancelled the delete operation!"); ++ } ++ throw new SystemOperationFailedException(Activator.PLUGIN_ID, x); ++ } ++ finally { ++ if (monitor != null) ++ monitor.done(); ++ } + } + + public void download(final String parent, +Index: plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorResources.java +=================================================================== +--- plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorResources.java (revision 0) ++++ plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorResources.java (revision 0) +@@ -0,0 +1,28 @@ ++/******************************************************************************* ++ * Copyright (c) 2010 Intel 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 ++ * ++ * Contributors: ++ * Intel Corporation - initial API and implementation ++ ******************************************************************************/ ++package org.eclipse.tm.internal.tcf.rse; ++ ++import org.eclipse.osgi.util.NLS; ++ ++public class TCFConnectorResources extends NLS { ++ private static final String BUNDLE_NAME = "org.eclipse.tm.internal.tcf.rse.TCFConnectorResources"; ++ static { ++ NLS.initializeMessages(BUNDLE_NAME, TCFConnectorResources.class); ++ } ++ private TCFConnectorResources() { ++ ++ } ++ ++ public static String TCFConnectorService_Name; ++ public static String TCFConnectorService_Description; ++ public static String PropertySet_Description; ++ ++} +Index: plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/ITCFSessionProvider.java +=================================================================== +--- plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/ITCFSessionProvider.java (revision 0) ++++ plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/ITCFSessionProvider.java (revision 0) +@@ -0,0 +1,29 @@ ++/******************************************************************************* ++ * Copyright (c) 2010 Intel 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 ++ * ++ * Contributors: ++ * Intel Corporation - initial API and implementation ++ ******************************************************************************/ ++ ++package org.eclipse.tm.internal.tcf.rse; ++ ++import org.eclipse.rse.services.files.RemoteFileException; ++import org.eclipse.tm.tcf.protocol.IChannel; ++ ++public interface ITCFSessionProvider { ++ public static final int ERROR_CODE = 100; // filed error code ++ public static final int SUCCESS_CODE = 150; // login pass code ++ public static final int CONNECT_CLOSED = 200; // code for end of login attempts ++ public static final int TCP_CONNECT_TIMEOUT = 10; //seconds - TODO: Make configurable ++ ++ public IChannel getChannel(); ++ public String getSessionUserId(); ++ public String getSessionPassword(); ++ public String getSessionHostName(); ++ public boolean isSubscribed(); ++ public void Subscribe() throws RemoteFileException; ++} +Index: plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java +=================================================================== +--- plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java (revision 1190) ++++ plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java (working copy) +@@ -26,10 +26,8 @@ + + private final TCFProcessAdapter process_adapter = new TCFProcessAdapter(); + +- @Override +- @SuppressWarnings("unchecked") +- public Class getServiceImplType() { +- return TCFProcessService.class; ++ public Class getServiceImplType() { ++ return ITCFSubSystem.class; + } + + @Override +@@ -50,7 +48,7 @@ + @Override + public IConnectorService getConnectorService(IHost host) { + return TCFConnectorServiceManager.getInstance() +- .getConnectorService(host, ITCFSubSystem.class); ++ .getConnectorService(host, getServiceImplType()); + } + + @Override +Index: plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorService.java +=================================================================== +--- plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorService.java (revision 1190) ++++ plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/TCFConnectorService.java (working copy) +@@ -10,29 +10,49 @@ + * Martin Oberhuber (Wind River) - [269682] Get port from RSE Property + * Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse + * Anna Dushistova (MontaVista) - [285373] TCFConnectorService should send CommunicationsEvent.BEFORE_CONNECT and CommunicationsEvent.BEFORE_DISCONNECT +- *******************************************************************************/ ++ * Intel Corporation - Make TCF being authenticated connection and attached streaming subscription/unsubscription method ++ ******************************************************************************/ + package org.eclipse.tm.internal.tcf.rse; + ++import java.io.IOException; + import java.util.ArrayList; + import java.util.HashMap; + import java.util.List; + import java.util.Map; ++import java.util.concurrent.ExecutionException; ++import java.util.concurrent.TimeUnit; ++import java.util.concurrent.TimeoutException; + + import org.eclipse.core.runtime.IProgressMonitor; + import org.eclipse.rse.core.model.IHost; +-import org.eclipse.rse.core.subsystems.BasicConnectorService; ++import org.eclipse.rse.core.model.IPropertySet; ++import org.eclipse.rse.core.model.PropertyType; ++import org.eclipse.rse.core.model.SystemSignonInformation; + import org.eclipse.rse.core.subsystems.CommunicationsEvent; ++import org.eclipse.rse.services.files.RemoteFileException; ++import org.eclipse.rse.ui.subsystems.StandardConnectorService; ++import org.eclipse.tm.internal.tcf.terminals.ITerminalsService; + import org.eclipse.tm.tcf.core.AbstractPeer; + import org.eclipse.tm.tcf.protocol.IChannel; + import org.eclipse.tm.tcf.protocol.IPeer; + import org.eclipse.tm.tcf.protocol.IService; ++import org.eclipse.tm.tcf.protocol.IToken; + import org.eclipse.tm.tcf.protocol.Protocol; + import org.eclipse.tm.tcf.services.IFileSystem; + import org.eclipse.tm.tcf.services.ILocator; ++import org.eclipse.tm.tcf.services.IStreams; + import org.eclipse.tm.tcf.services.ISysMonitor; ++import org.eclipse.tm.tcf.util.TCFTask; + ++public class TCFConnectorService extends StandardConnectorService implements ++ ITCFSessionProvider { + +-public class TCFConnectorService extends BasicConnectorService { ++ public static final String PROPERTY_SET_NAME = "TCF Connection Settings"; ++ public static final String PROPERTY_LOGIN_REQUIRED = "Login.Required"; //$NON-NLS-1$ ++ public static final String PROPERTY_PWD_REQUIRED="Pwd.Required"; ++ public static final String PROPERTY_LOGIN_PROMPT = "Login.Prompt"; //$NON-NLS-1$ ++ public static final String PROPERTY_PASSWORD_PROMPT = "Password.Prompt"; //$NON-NLS-1$ ++ public static final String PROPERTY_COMMAND_PROMPT = "Command.Prompt"; //$NON-NLS-1$ + + private IChannel channel; + private Throwable channel_error; +@@ -40,12 +60,62 @@ + + private boolean poll_timer_started; + ++ private boolean bSubscribed = false; ++ ++ /* subscribe the stream service on this TCP connection */ ++ private IStreams.StreamsListener streamListener = new IStreams.StreamsListener() { ++ public void created(String stream_type, String stream_id, ++ String context_id) { ++ System.out.printf("new stream id: %s , type: %s is created\n", ++ stream_id, stream_type); ++ } ++ ++ /** ++ * Called when a stream is disposed. ++ * ++ * @param stream_type ++ * - source type of the stream. ++ * @param stream_id ++ * - ID of the stream. ++ */ ++ public void disposed(String stream_type, String stream_id) { ++ System.out.printf("stream id: %s type: %s is disposed\n", ++ stream_id, stream_type); ++ } ++ }; ++ + public TCFConnectorService(IHost host, int port) { +- super("TCF", "Target Communication Framework", host, port); //$NON-NLS-1$ //$NON-NLS-2$ ++ super(TCFConnectorResources.TCFConnectorService_Name, ++ TCFConnectorResources.TCFConnectorService_Description, host, ++ port); //$NON-NLS-1$ //$NON-NLS-2$ ++ getTCFPropertySet(); + } ++ ++ public IPropertySet getTCFPropertySet() { ++ IPropertySet tcfSet = getPropertySet(PROPERTY_SET_NAME); ++ if (tcfSet == null) { ++ tcfSet = createPropertySet(PROPERTY_SET_NAME, TCFConnectorResources.PropertySet_Description); ++ //add default values if not set ++ tcfSet.addProperty(PROPERTY_LOGIN_REQUIRED, "true", PropertyType.getEnumPropertyType(new String[] {"true", "false"})); ++ tcfSet.addProperty(PROPERTY_PWD_REQUIRED, "false", PropertyType.getEnumPropertyType(new String[] {"true", "false"})); ++ tcfSet.addProperty(PROPERTY_LOGIN_PROMPT, "ogin: ", PropertyType.getStringPropertyType()); ++ tcfSet.addProperty(PROPERTY_PASSWORD_PROMPT, "assword: ", PropertyType.getStringPropertyType()); ++ tcfSet.addProperty(PROPERTY_COMMAND_PROMPT, "#", PropertyType.getStringPropertyType()); ++ } ++ return tcfSet; ++ } + ++ /** ++ * @return true if the associated connector service requires a password. ++ */ + @Override +- protected void internalConnect(final IProgressMonitor monitor) throws Exception { ++ public final boolean requiresPassword() { ++ return false; ++ } ++ ++ @Override ++ protected void internalConnect(final IProgressMonitor monitor) ++ throws Exception { + assert !Protocol.isDispatchThread(); + final Exception[] res = new Exception[1]; + // Fire comm event to signal state about to change +@@ -54,39 +124,55 @@ + synchronized (res) { + Protocol.invokeLater(new Runnable() { + public void run() { +- if (!connectTCFChannel(res, monitor)) add_to_wait_list(this); ++ if (!connectTCFChannel(res, monitor)) ++ add_to_wait_list(this); + } + }); + res.wait(); + } ++ if (res[0] != null) throw res[0]; + monitor.done(); +- if (res[0] != null) throw res[0]; + } + + @Override +- protected void internalDisconnect(final IProgressMonitor monitor) throws Exception { ++ protected void internalDisconnect(final IProgressMonitor monitor) ++ throws Exception { + assert !Protocol.isDispatchThread(); + final Exception[] res = new Exception[1]; + // Fire comm event to signal state about to change + fireCommunicationsEvent(CommunicationsEvent.BEFORE_DISCONNECT); + monitor.beginTask("Disconnecting " + getHostName(), 1); //$NON-NLS-1$ +- synchronized (res) { +- Protocol.invokeLater(new Runnable() { +- public void run() { +- if (!disconnectTCFChannel(res, monitor)) add_to_wait_list(this); +- } +- }); +- res.wait(); ++ try { ++ /* First UnSubscribe TCP channel */ ++ Unsubscribe(); ++ /* Disconnecting TCP channel */ ++ synchronized (res) { ++ Protocol.invokeLater(new Runnable() { ++ public void run() { ++ if (!disconnectTCFChannel(res, monitor)) ++ add_to_wait_list(this); ++ } ++ }); ++ res.wait(); ++ } ++ if (res[0] != null) throw res[0]; ++ + } +- monitor.done(); +- if (res[0] != null) throw res[0]; ++ catch (Exception e) { ++ e.printStackTrace(); ++ throw new RemoteFileException("Error creating Terminal", e); //$NON-NLS-1$ ++ } ++ finally { ++ monitor.done(); ++ } + } + + public boolean isConnected() { + final boolean res[] = new boolean[1]; + Protocol.invokeAndWait(new Runnable() { + public void run() { +- res[0] = channel != null && channel.getState() == IChannel.STATE_OPEN; ++ res[0] = channel != null ++ && channel.getState() == IChannel.STATE_OPEN; + } + }); + return res[0]; +@@ -108,7 +194,8 @@ + if (wait_list.isEmpty()) return; + Runnable[] r = wait_list.toArray(new Runnable[wait_list.size()]); + wait_list.clear(); +- for (int i = 0; i < r.length; i++) r[i].run(); ++ for (int i = 0; i < r.length; i++) ++ r[i].run(); + } + + private boolean connectTCFChannel(Exception[] res, IProgressMonitor monitor) { +@@ -117,9 +204,12 @@ + case IChannel.STATE_OPEN: + case IChannel.STATE_CLOSED: + synchronized (res) { +- if (channel_error instanceof Exception) res[0] = (Exception)channel_error; +- else if (channel_error != null) res[0] = new Exception(channel_error); +- else res[0] = null; ++ if (channel_error instanceof Exception) ++ res[0] = (Exception) channel_error; ++ else if (channel_error != null) ++ res[0] = new Exception(channel_error); ++ else ++ res[0] = null; + res.notify(); + return true; + } +@@ -137,7 +227,7 @@ + String host = getHostName().toLowerCase(); + int port = getConnectPort(); + if (port <= 0) { +- //Default fallback ++ // Default fallback + port = TCFConnectorServiceManager.TCF_PORT; + } + IPeer peer = null; +@@ -146,8 +236,8 @@ + for (IPeer p : locator.getPeers().values()) { + Map attrs = p.getAttributes(); + if ("TCP".equals(attrs.get(IPeer.ATTR_TRANSPORT_NAME)) && //$NON-NLS-1$ +- host.equalsIgnoreCase(attrs.get(IPeer.ATTR_IP_HOST)) && +- port_str.equals(attrs.get(IPeer.ATTR_IP_PORT))) { ++ host.equalsIgnoreCase(attrs.get(IPeer.ATTR_IP_HOST)) ++ && port_str.equals(attrs.get(IPeer.ATTR_IP_PORT))) { + peer = p; + break; + } +@@ -171,17 +261,18 @@ + + public void congestionLevel(int level) { + } +- + public void onChannelClosed(Throwable error) { + assert channel != null; + channel.removeChannelListener(this); + channel_error = error; ++ + if (wait_list.isEmpty()) { + fireCommunicationsEvent(CommunicationsEvent.CONNECTION_ERROR); + } + else { + run_wait_list(); + } ++ bSubscribed = false; + channel = null; + channel_error = null; + } +@@ -192,7 +283,8 @@ + return false; + } + +- private boolean disconnectTCFChannel(Exception[] res, IProgressMonitor monitor) { ++ private boolean disconnectTCFChannel(Exception[] res, ++ IProgressMonitor monitor) { + if (channel == null || channel.getState() == IChannel.STATE_CLOSED) { + synchronized (res) { + res[0] = null; +@@ -212,9 +304,12 @@ + } + + public V getService(Class service_interface) { +- if (channel == null || channel.getState() != IChannel.STATE_OPEN) throw new Error("Not connected"); //$NON-NLS-1$ ++ if (channel == null || channel.getState() != IChannel.STATE_OPEN) ++ throw new Error("Not connected"); //$NON-NLS-1$ + V m = channel.getRemoteService(service_interface); +- if (m == null) throw new Error("Remote peer does not support " + service_interface.getName() + " service"); //$NON-NLS-1$ //$NON-NLS-2$ ++ if (m == null) ++ throw new Error( ++ "Remote peer does not support " + service_interface.getName() + " service"); //$NON-NLS-1$ //$NON-NLS-2$ + return m; + } + +@@ -225,4 +320,111 @@ + public IFileSystem getFileSystemService() { + return getService(IFileSystem.class); + } ++ ++ public IChannel getChannel() { ++ // TODO Auto-generated method stub ++ return channel; ++ } ++ ++ public String getSessionHostName() { ++ // TODO Auto-generated method stub ++ String hostName = ""; ++ IHost host = getHost(); ++ if (host != null) hostName = host.getHostName(); ++ return hostName; ++ } ++ ++ public String getSessionUserId() { ++ // TODO Auto-generated method stub ++ return getUserId(); ++ } ++ ++ public String getSessionPassword() { ++ // TODO Auto-generated method stub ++ String password = ""; ++ SystemSignonInformation ssi = getSignonInformation(); ++ if (ssi != null) { ++ password = ssi.getPassword(); ++ } ++ return password; ++ } ++ ++ public boolean isSubscribed() { ++ // TODO Auto-generated method stub ++ return bSubscribed; ++ } ++ ++ public void Unsubscribe() throws IOException { ++ if (bSubscribed) { ++ System.out ++ .println("Unsubscribe streams before disconnecting TCP channel."); ++ try { ++ new TCFTask

About This Content

License