Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 050C51028B for ; Fri, 25 Oct 2013 03:35:40 +0000 (UTC) Received: (qmail 21475 invoked by uid 500); 25 Oct 2013 03:35:35 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 21309 invoked by uid 500); 25 Oct 2013 03:35:32 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 21294 invoked by uid 99); 25 Oct 2013 03:35:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Oct 2013 03:35:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3417B81CD9A; Fri, 25 Oct 2013 03:35:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: olamy@apache.org To: commits@maven.apache.org Date: Fri, 25 Oct 2013 03:35:29 -0000 Message-Id: <9a45065fe9af4d5e80b2a17b609f3134@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: formatting code formatting code Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/e476306f Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/e476306f Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/e476306f Branch: refs/heads/master Commit: e476306f1fd8d85f8555d0017bbdec5c68fe5a51 Parents: 0544394 Author: Olivier Lamy Authored: Fri Oct 25 14:35:11 2013 +1100 Committer: Olivier Lamy Committed: Fri Oct 25 14:35:11 2013 +1100 ---------------------------------------------------------------------- .../providers/ssh/jsch/AbstractJschWagon.java | 22 +++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/e476306f/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java index 01d8dd3..cc0e041 100644 --- a/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java +++ b/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java @@ -73,23 +73,21 @@ import com.jcraft.jsch.UIKeyboardInteractive; import com.jcraft.jsch.UserInfo; /** - * AbstractJschWagon - * - * + * AbstractJschWagon */ public abstract class AbstractJschWagon extends StreamWagon implements SshWagon, CommandExecutor { protected ScpHelper sshTool = new ScpHelper( this ); - + protected Session session; - + /** * @plexus.requirement role-hint="file" */ private volatile KnownHostsProvider knownHostsProvider; - + /** * @plexus.requirement */ @@ -130,13 +128,17 @@ public abstract class AbstractJschWagon throw new AuthenticationException( e.getMessage() ); } - try { + try + { Connector connector = ConnectorFactory.getDefault().createConnector(); - if ( connector != null ) { + if ( connector != null ) + { IdentityRepository repo = new RemoteIdentityRepository( connector ); sch.setIdentityRepository( repo ); } - } catch ( AgentProxyException e ) { + } + catch ( AgentProxyException e ) + { fireSessionDebug( "Unable to connect to agent: " + e.toString() ); } @@ -238,7 +240,7 @@ public abstract class AbstractJschWagon { config.setProperty( "PreferredAuthentications", "gssapi-with-mic,publickey,password,keyboard-interactive" ); } - + config.setProperty( "BatchMode", interactive ? "no" : "yes" ); session.setConfig( config );