Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Messages.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Method.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java22
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java2
7 files changed, 28 insertions, 28 deletions
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Messages.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Messages.java
index d0002fe90..2a12a6369 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Messages.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Messages.java
@@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
public class CVSSSH2Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.team.internal.ccvs.ssh2.messages";//$NON-NLS-1$
-
+
public static String JSchSession_3;
public static String JSchSession_4;
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Method.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Method.java
index a65f906ad..4125fd3c6 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Method.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Method.java
@@ -20,21 +20,21 @@ import org.eclipse.team.internal.ccvs.core.*;
* SSH2 will hijack the 'extssh' method and use the SSH2 protocol instead
* of SSH1. If the server doesn't support SSH2, the server connection method
* will try connecting with SSH1.
- *
+ *
* @since 3.0
*/
public class CVSSSH2Method implements IConnectionMethod {
-
+
@Override
public String getName() {
return "extssh"; //$NON-NLS-1$
}
-
+
@Override
public IServerConnection createConnection(ICVSRepositoryLocation root, String password) {
return new CVSSSH2ServerConnection(root, password);
}
-
+
@Override
public void disconnect(ICVSRepositoryLocation location) {
}
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java
index 2c4b595f9..562ae61b6 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java
@@ -31,7 +31,7 @@ public class CVSSSH2Plugin extends Plugin {
private ServiceRegistration debugRegistration;
private ServiceTracker tracker;
-
+
public CVSSSH2Plugin() {
super();
plugin = this;
@@ -54,7 +54,7 @@ public class CVSSSH2Plugin extends Plugin {
public static CVSSSH2Plugin getDefault() {
return plugin;
}
-
+
@Override
public void start(BundleContext context) throws Exception {
super.start(context);
@@ -67,7 +67,7 @@ public class CVSSSH2Plugin extends Plugin {
tracker = new ServiceTracker(getBundle().getBundleContext(), IJSchService.class.getName(), null);
tracker.open();
}
-
+
public IJSchService getJSchService() {
return (IJSchService)tracker.getService();
}
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java
index 0c6b7780b..860178aa0 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java
@@ -38,12 +38,12 @@ import com.jcraft.jsch.JSchException;
/**
* SSH2 connection method. Has the property of defaulting to SSH1 if the server
- * doesn't support SSH2.
+ * doesn't support SSH2.
*/
public class CVSSSH2ServerConnection implements IServerConnection {
-
+
private static final String SSH1_COMPATIBILITY_CLASS = "org.eclipse.team.internal.ccvs.ssh.SSHServerConnection"; //$NON-NLS-1$
-
+
private final class SSH2IOException extends IOException {
private static final long serialVersionUID = 1L;
@@ -67,7 +67,7 @@ public class CVSSSH2ServerConnection implements IServerConnection {
private JSchSession session;
private Channel channel;
private IServerConnection ssh1;
-
+
protected CVSSSH2ServerConnection(ICVSRepositoryLocation location, String password) {
this.location = location;
this.password = password;
@@ -100,7 +100,7 @@ public class CVSSSH2ServerConnection implements IServerConnection {
if (channel != null)
channel.disconnect();
}
- }
+ }
}
@Override
public InputStream getInputStream() {
@@ -122,7 +122,7 @@ public class CVSSSH2ServerConnection implements IServerConnection {
ssh1.open(monitor);
return;
}
- monitor.subTask(NLS.bind(CVSSSH2Messages.CVSSSH2ServerConnection_open, new String[] { location.getHost() }));
+ monitor.subTask(NLS.bind(CVSSSH2Messages.CVSSSH2ServerConnection_open, new String[] { location.getHost() }));
monitor.worked(1);
internalOpen(monitor);
}
@@ -193,7 +193,7 @@ public class CVSSSH2ServerConnection implements IServerConnection {
String message = e.getMessage();
if (JSchSession.isAuthenticationFailure(e)) {
// Do not retry as the Jsh library has it's own retry logic
- throw new CVSAuthenticationException(CVSSSH2Messages.CVSSSH2ServerConnection_0, CVSAuthenticationException.NO_RETRY,location, e);
+ throw new CVSAuthenticationException(CVSSSH2Messages.CVSSSH2ServerConnection_0, CVSAuthenticationException.NO_RETRY,location, e);
} else if (message.startsWith("Session.connect: ")) { //$NON-NLS-1$
// Jsh has messages formatted like "Session.connect: java.net.NoRouteToHostException: ..."
// Strip of the exception and try to convert it to a more meaningfull string
@@ -203,7 +203,7 @@ public class CVSSSH2ServerConnection implements IServerConnection {
if (end != -1) {
String exception = message.substring(start, end).trim();
if (exception.contains("NoRouteToHostException")) { //$NON-NLS-1$
- message = NLS.bind(CVSSSH2Messages.CVSSSH2ServerConnection_1, new String[] { location.getHost() });
+ message = NLS.bind(CVSSSH2Messages.CVSSSH2ServerConnection_1, new String[] { location.getHost() });
throw new NoRouteToHostException(message);
} else if (exception.contains("java.net.UnknownHostException")) { //$NON-NLS-1$
throw new UnknownHostException(location.getHost());
@@ -217,10 +217,10 @@ public class CVSSSH2ServerConnection implements IServerConnection {
}
}
}
-
+
/**
* Returns SSH-1 connection.
- *
+ *
* @return a connection or <code>null</code>, if SSH-1 is not supported
*/
private IServerConnection createSSH1Connection() {
@@ -254,7 +254,7 @@ public class CVSSSH2ServerConnection implements IServerConnection {
}
return null;
}
-
+
private boolean isChannelNotOpenError(JSchException ee) {
return ee.getMessage().contains("channel is not opened"); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java
index 62d43b29a..56eb62ffe 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java
@@ -30,7 +30,7 @@ import com.jcraft.jsch.*;
class JSchSession {
private static final int SSH_DEFAULT_PORT = 22;
private static Hashtable<String, JSchSession> pool = new Hashtable<>();
-
+
private final Session session;
private final ICVSRepositoryLocation location;
@@ -44,12 +44,12 @@ class JSchSession {
public static boolean isAuthenticationFailure(JSchException ee) {
return ee.getMessage().equals("Auth fail"); //$NON-NLS-1$
}
-
+
static JSchSession getSession(final ICVSRepositoryLocation location, String username, String password, String hostname, int port, IProgressMonitor monitor) throws JSchException {
int actualPort = port;
if (actualPort == ICVSRepositoryLocation.USE_DEFAULT_PORT)
actualPort = getPort(location);
-
+
String key = getPoolKey(username, hostname, actualPort);
try {
@@ -63,7 +63,7 @@ class JSchSession {
IJSchService service = getJSchService();
IJSchLocation jlocation=service.getLocation(username, hostname, actualPort);
- // As for the connection method "pserverssh2",
+ // As for the connection method "pserverssh2",
// there is not a place to save the given password for ssh2.
if (!location.getMethod().getName().equals("pserverssh2")) { //$NON-NLS-1$
IPasswordStore pstore = new IPasswordStore() {
@@ -84,7 +84,7 @@ class JSchSession {
jlocation.setPasswordStore(pstore);
}
jlocation.setComment(NLS.bind(CVSSSH2Messages.JSchSession_3, new String[] {location.toString()}));
-
+
Session session = null;
try {
session = createSession(service, jlocation, password, monitor);
@@ -156,7 +156,7 @@ class JSchSession {
static JSch getJSch() {
return getJSchService().getJSch();
}
-
+
private JSchSession(Session session, ICVSRepositoryLocation location) {
this.session = session;
this.location = location;
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java
index 3c1e29bab..b2afdb820 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java
@@ -118,7 +118,7 @@ public class PServerSSH2ServerConnection implements IServerConnection {
} catch (JSchException ee) {
retry--;
if(retry<0){
- throw new CVSAuthenticationException(CVSSSH2Messages.CVSSSH2ServerConnection_3, CVSAuthenticationException.NO_RETRY, location);
+ throw new CVSAuthenticationException(CVSSSH2Messages.CVSSSH2ServerConnection_3, CVSAuthenticationException.NO_RETRY, location);
}
if(session != null && session.isConnected()){
session.disconnect();
@@ -129,7 +129,7 @@ public class PServerSSH2ServerConnection implements IServerConnection {
}
// password for location will be over-written in JSchSession ;-<
((CVSRepositoryLocation)location).setPassword(password);
-
+
// CVSROOT=":pserver:localhost:"+lport+""cvs_root
try {
// If user does not give a password, it must be null.
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java
index 39dcfb033..4e258cc73 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/

Back to the top