From 7843d17c6059ae507dcd41432ee491626c357a42 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Mon, 7 May 2012 17:50:46 +0000 Subject: [PATCH] Bug 346892 - Update to commons-net 3.1 --- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.rse.services.telnet/META-INF/MANIFEST.MF | 2 +- .../services/telnet/terminal/TelnetTerminalShell.java | 5 ++--- .../META-INF/MANIFEST.MF | 2 +- rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.connectorservice.telnet/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.telnet/META-INF/MANIFEST.MF index 333f7b77a36..59ad3329b51 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.telnet/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.connectorservice.telnet/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui, - org.apache.commons.net;bundle-version="[1.4.1,3.0.0)" + org.apache.commons.net;bundle-version="[1.4.1,4.0.0)" Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true Export-Package: org.eclipse.rse.internal.connectorservice.telnet;x-friends:="org.eclipse.rse.subsystems.shells.telnet" diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF index 688e855679e..2614aa74953 100644 --- a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)", - org.apache.commons.net;bundle-version="[1.4.1,3.0.0)", + org.apache.commons.net;bundle-version="[1.4.1,4.0.0)", org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)" Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true diff --git a/rse/plugins/org.eclipse.rse.services.telnet/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.telnet/META-INF/MANIFEST.MF index 3c665224da9..4873853da0a 100644 --- a/rse/plugins/org.eclipse.rse.services.telnet/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.services.telnet/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.rse.internal.services.telnet.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.rse.services;bundle-version="[3.1.0,4.0.0)", - org.apache.commons.net;bundle-version="[2.0.0,3.0.0)" + org.apache.commons.net;bundle-version="[2.0.0,4.0.0)" Export-Package: org.eclipse.rse.internal.services.telnet;x-friends:="org.eclipse.rse.connectorservice.telnet,org.eclipse.rse.subsystems.shells.telnet", org.eclipse.rse.internal.services.telnet.terminal;x-friends:="org.eclipse.rse.subsystems.shells.telnet" Bundle-ActivationPolicy: lazy diff --git a/rse/plugins/org.eclipse.rse.services.telnet/src/org/eclipse/rse/internal/services/telnet/terminal/TelnetTerminalShell.java b/rse/plugins/org.eclipse.rse.services.telnet/src/org/eclipse/rse/internal/services/telnet/terminal/TelnetTerminalShell.java index 455b392feee..3c18b067503 100644 --- a/rse/plugins/org.eclipse.rse.services.telnet/src/org/eclipse/rse/internal/services/telnet/terminal/TelnetTerminalShell.java +++ b/rse/plugins/org.eclipse.rse.services.telnet/src/org/eclipse/rse/internal/services/telnet/terminal/TelnetTerminalShell.java @@ -26,12 +26,11 @@ import java.io.Writer; import org.apache.commons.net.io.ToNetASCIIInputStream; import org.apache.commons.net.telnet.EchoOptionHandler; -import org.apache.commons.net.telnet.InvalidTelnetOptionException; -import org.apache.commons.net.telnet.WindowSizeOptionHandler; import org.apache.commons.net.telnet.SuppressGAOptionHandler; import org.apache.commons.net.telnet.TelnetClient; import org.apache.commons.net.telnet.TelnetOption; import org.apache.commons.net.telnet.TerminalTypeOptionHandler; +import org.apache.commons.net.telnet.WindowSizeOptionHandler; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.rse.internal.services.telnet.ITelnetSessionProvider; import org.eclipse.rse.services.clientserver.PathUtility; @@ -281,7 +280,7 @@ public class TelnetTerminalShell extends AbstractTerminalShell { fTelnetClient.deleteOptionHandler(TelnetOption.WINDOW_SIZE); fTelnetClient.addOptionHandler(new WindowSizeOptionHandler( newWidth, newHeight, true, true, true, true)); - } catch (InvalidTelnetOptionException e) { + } catch (/*InvalidTelnetOptionException*/ Exception e) { e.printStackTrace(); } } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF index b1e7222b6ca..917d07afd57 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui.console, org.eclipse.rse.services.files.ftp;bundle-version="[3.0.0,4.0.0)", - org.apache.commons.net;bundle-version="[1.4.1,3.0.0)" + org.apache.commons.net;bundle-version="[1.4.1,4.0.0)" Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true Export-Package: org.eclipse.rse.internal.subsystems.files.ftp;x-internal:=true, diff --git a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF index 9cccc3f621f..a6531114ca8 100644 --- a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF +++ b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF @@ -27,7 +27,7 @@ Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)", org.eclipse.rse.files.ui, org.eclipse.rse.efs, org.eclipse.rse.tests.framework;bundle-version="[2.0.0,3.0.0)", - org.apache.commons.net;bundle-version="[1.4.1,3.0.0)", + org.apache.commons.net;bundle-version="[1.4.1,4.0.0)", org.eclipse.rse.subsystems.terminals.core;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy Eclipse-LazyStart: true