Don't log info about using Apache MINA sshd SSH client

Since this is the default now, logging this is no longer necessary.
Also switch the default in case the setting is corrupted.

Bug: 549426
Change-Id: Iaee98ae9970f25bbc85f436cf0e4911d9ec80a54
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>

3 files changed, 15 insertions, 20 deletions

diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java
index f82cc6d6e6..f5c279b5c1 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java
@@ -149,7 +149,7 @@ public class Activator extends Plugin implements DebugOptionsListener {
 
 	/**
 	 * Utility method to log errors in the Egit plugin.
-	 * 
+	 *
 	 * @param message
 	 *            User comprehensible message
 	 * @param thr
@@ -258,24 +258,12 @@ public class Activator extends Plugin implements DebugOptionsListener {
 	@SuppressWarnings("unchecked")
 	private void setupSSH(final BundleContext context) {
 		String sshClient = Platform.getPreferencesService().getString(pluginId,
-				GitCorePreferences.core_sshClient, "jsch", null); //$NON-NLS-1$
+				GitCorePreferences.core_sshClient, "apache", null); //$NON-NLS-1$
 		SshSessionFactory previous = SshSessionFactory.getInstance();
-		if (SshClientType.APACHE.name().equalsIgnoreCase(sshClient)) {
-			if (previous instanceof EGitSshdSessionFactory) {
-				return;
-			}
-			logInfo(CoreText.Activator_SshClientUsingApache);
-			SshSessionFactory.setInstance(new EGitSshdSessionFactory());
-		} else {
+		if (SshClientType.JSCH.name().equalsIgnoreCase(sshClient)) {
 			if (previous instanceof EclipseSshSessionFactory) {
 				return;
 			}
-			if (!SshClientType.JSCH.name().equalsIgnoreCase(sshClient)) {
-				logWarning(
-						MessageFormat.format(
-								CoreText.Activator_SshClientUnknown, sshClient),
-						null);
-			}
 			ServiceReference ssh = context
 					.getServiceReference(IJSchService.class.getName());
 			if (ssh != null) {
@@ -289,6 +277,17 @@ public class Activator extends Plugin implements DebugOptionsListener {
 				}
 				SshSessionFactory.setInstance(new EGitSshdSessionFactory());
 			}
+		} else {
+			if (!SshClientType.APACHE.name().equalsIgnoreCase(sshClient)) {
+				logWarning(
+						MessageFormat.format(
+								CoreText.Activator_SshClientUnknown, sshClient),
+						null);
+			}
+			if (previous instanceof EGitSshdSessionFactory) {
+				return;
+			}
+			SshSessionFactory.setInstance(new EGitSshdSessionFactory());
 		}
 		if (previous instanceof SshdSessionFactory) {
 			((SshdSessionFactory) previous).close();
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java
index 093a7b8530..d8f2ef3f42 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java
@@ -58,9 +58,6 @@ public class CoreText extends NLS {
 	public static String Activator_SshClientUnknown;
 
 	/** */
-	public static String Activator_SshClientUsingApache;
-
-	/** */
 	public static String AssumeUnchangedOperation_adding;
 
 	/** */
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties
index ed1a174865..823af01151 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties
@@ -50,8 +50,7 @@ Activator_ignoreResourceFailed=Ignoring {0} failed
 Activator_noBuiltinLfsSupportDetected=Built-in LFS support not present/detected
 Activator_ReconfigureWindowCacheError=Exception when reconfiguring window cache from configuration, default configuration will be used
 Activator_SshClientNoJsch=JSch configured as SSH library, but JSch service cannot be found. Using Apache sshd library instead.
-Activator_SshClientUnknown=Unknown SSH library ''{0}'' configured; valid values are "jsch" or "apache". Using JSch.
-Activator_SshClientUsingApache=Using Apache MINA sshd as ssh client.
+Activator_SshClientUnknown=Unknown SSH library ''{0}'' configured; valid values are "jsch" or "apache". Using Apache.
 
 AssumeUnchangedOperation_adding=Marking resources unchanged
 AssumeUnchangedOperation_writingIndex=Writing index for {0}