Attachment 36422 Details for Bug 102654 – cvs.ssh2 plug-in refers to new proxy settings

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

[patch] cvs.ssh2 plug-in refers to new proxy settings

cvs.ssh2.patch (text/plain), 4.25 KB, created by Atsuhiko Yamanaka

on 2006-03-16 11:37:32 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Atsuhiko Yamanaka

Created: 2006-03-16 11:37:32 EST

Size: 4.25 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.cvs.ssh2
>Index: src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java,v
>retrieving revision 1.22
>diff -u -r1.22 JSchSession.java
>--- src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java	16 Dec 2005 14:52:36 -0000	1.22
>+++ src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java	16 Mar 2006 15:56:57 -0000
>@@ -15,7 +15,6 @@
> import java.net.Socket;
> import java.net.UnknownHostException;
> import java.util.Enumeration;
>-import java.util.Map;
> 
> import org.eclipse.core.runtime.*;
> import org.eclipse.jface.preference.IPreferenceStore;
>@@ -396,32 +395,30 @@
> 			}
> 
> 			if (jschSession == null) {
>-
>-				boolean useProxy = store.getString(ISSHContants.KEY_PROXY).equals("true"); //$NON-NLS-1$
>+				boolean useProxy = CVSProviderPlugin.getPlugin().isUseProxy();
>                 Proxy proxy = null;
> 				if (useProxy) {
>-					String _type = store.getString(ISSHContants.KEY_PROXY_TYPE);
>-					String _host = store.getString(ISSHContants.KEY_PROXY_HOST);
>-					String _port = store.getString(ISSHContants.KEY_PROXY_PORT);
>+					String _type = CVSProviderPlugin.getPlugin().getProxyType();
>+					String _host = CVSProviderPlugin.getPlugin().getProxyHost();
>+					String _port = CVSProviderPlugin.getPlugin().getProxyPort();
> 
>-					boolean useAuth = store.getString(ISSHContants.KEY_PROXY_AUTH).equals("true"); //$NON-NLS-1$
>+					boolean useAuth = CVSProviderPlugin.getPlugin().isUseProxyAuth();
> 					String _user = ""; //$NON-NLS-1$
> 					String _pass = ""; //$NON-NLS-1$
> 					
> 					// Retrieve username and password from keyring.
>-					Map map = Platform.getAuthorizationInfo(CVSSSH2PreferencePage.FAKE_URL, "proxy", CVSSSH2PreferencePage.AUTH_SCHEME); //$NON-NLS-1$
>-				    if(map!=null){
>-				      _user=(String) map.get(ISSHContants.KEY_PROXY_USER);
>-				      _pass=(String) map.get(ISSHContants.KEY_PROXY_PASS);
>-				    }
>+					if(useAuth){
>+						_user=CVSProviderPlugin.getPlugin().getProxyUser();
>+						_pass=CVSProviderPlugin.getPlugin().getProxyPassword();
>+					}
> 
> 					String proxyhost = _host + ":" + _port; //$NON-NLS-1$
>-					if (_type.equals(ISSHContants.HTTP)) {
>+					if (_type.equals(CVSProviderPlugin.PROXY_TYPE_HTTP)) {
> 						proxy = new ProxyHTTP(proxyhost);
> 						if (useAuth) {
> 							((ProxyHTTP) proxy).setUserPasswd(_user, _pass);
> 						}
>-					} else if (_type.equals(ISSHContants.SOCKS5)) {
>+					} else if (_type.equals(CVSProviderPlugin.PROXY_TYPE_SOCKS5)) {
> 						proxy = new ProxySOCKS5(proxyhost);
> 						if (useAuth) {
> 							((ProxySOCKS5) proxy).setUserPasswd(_user, _pass);
>Index: src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java,v
>retrieving revision 1.30
>diff -u -r1.30 CVSSSH2PreferencePage.java
>--- src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java	14 Feb 2006 14:52:25 -0000	1.30
>+++ src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java	16 Mar 2006 15:56:57 -0000
>@@ -114,11 +114,11 @@
>     TabItem tabItem = new TabItem(tabFolder, SWT.NONE);
>     tabItem.setText(CVSSSH2Messages.CVSSSH2PreferencePage_19); 
>     tabItem.setControl(createGeneralPage(tabFolder));
>-
>+/*
>     tabItem = new TabItem(tabFolder, SWT.NONE);
>     tabItem.setText(CVSSSH2Messages.CVSSSH2PreferencePage_20); 
>     tabItem.setControl(createProxyPage(tabFolder));
>-
>+*/
>     tabItem = new TabItem(tabFolder, SWT.NONE);
>     tabItem.setText(CVSSSH2Messages.CVSSSH2PreferencePage_21); 
>     tabItem.setControl(createKeyManagementPage(tabFolder));
>@@ -228,7 +228,7 @@
> 
>     return group;
>   }
>-
>+/*
>   private Control createProxyPage(Composite parent) {
>     Composite group=new Composite(parent, SWT.NULL);
>     GridLayout layout=new GridLayout();
>@@ -340,6 +340,7 @@
>       });
>     return group;
>   }
>+  */
>   private Control createKeyManagementPage(Composite parent) {
>     int columnSpan=3;
>     Composite group=new Composite(parent, SWT.NULL);

Actions: View | Diff

Attachments on bug 102654: 28843 | 29375 | 36040 | 36346 | 36408 | 36410 | 36422 | 37225