fix(TDI-41246): rename the patch and add more information as readme

PATCH_RELEASE_NOTE.md

@@ -0,0 +1,59 @@
+---
+version: 7.0.1
+module: https://talend.poolparty.biz/coretaxonomy/42
+product:
+- https://talend.poolparty.biz/coretaxonomy/23
+---
+
+# TPS-3029
+
+| Info             | Value |
+| ---------------- | ---------------- |
+| Patch Name       | Patch_20190508_TPS-3029_v1-7.0.1 |
+| Release Date     | 2019-05-08 |
+| Target Version   | 20180411_1414-V7.0.1 |
+| Product affected | Talend Studio |
+
+## Introduction
+
+This is a self-contained patch.
+
+**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
+
+## Fixed issues
+
+This patch contains the following fixes:
+
+- TPS-3029 [7.0.1] SFTP connection fails after multiple executions (TDI-41246)
+
+## Prerequisites
+
+Consider the following requirements for your system:
+
+- Talend Studio 7.0.1 must be installed.
+
+## Installation
+
+### Installing the patch using Software update
+
+**NOTE**: If the customer has not yet installed any patch before with Nexus3, a TUP patch named Patch_20180510_TPS-2482_v1-7.0.1.zip must be deployed first in the appoarch "Installing the patch using Talend Studio".
+
+1) Logon TAC and switch to Configuration->Software Update, then enter the correct values and save referring to the documentation: https://help.talend.com/reader/f7Em9WV_cPm2RRywucSN0Q/j9x5iXV~vyxMlUafnDejaQ
+
+2) Switch to Software update page, where the new patch will be listed. The patch can be downloaded from here into the nexus repository.
+
+3) On Studio Side: Logon Studio with remote mode, on the logon page the Update button is displayed: click this button to install the patch.
+
+### Installing the patch using Talend Studio
+
+1) Create a folder named "patches" under your studio installer directory and copy the patch .zip file to this folder.
+
+2) Restart your studio: a window pops up, then click OK to install the patch, or restart the commandline and the patch will be installed automatically.
+
+### Installing the patch using Commandline
+
+Execute the following commands:
+
+1. Talend-Studio-win-x86_64.exe -nosplash -application org.talend.commandline.CommandLine -consoleLog -data commandline-workspace startServer -p 8002 --talendDebug
+2. initRemote {tac_url} -ul {TAC login username} -up {TAC login password}
+3. checkAndUpdate -tu {TAC login username} -tup {TAC login password}

main/plugins/org.talend.designer.components.localprovider/components/tFTPConnection/sftp_connect.javajet

@@ -0,0 +1,88 @@
+<%@ jet
+%>
+
+boolean retry_<%=cid%> = false;
+int retry_count_<%=cid%> = 0;
+int retry_max_<%=cid%> = 5;
+
+com.jcraft.jsch.Session session_<%=cid%> = null;
+com.jcraft.jsch.Channel channel_<%=cid%> = null;
+
+do {
+	retry_<%=cid%> = false;
+		
+    com.jcraft.jsch.JSch jsch_<%=cid%> = new com.jcraft.jsch.JSch(); 
+    
+    <%if (("PUBLICKEY").equals(authMethod)){%>
+    	<%if(isLog4jEnabled){%>
+    		log.info("<%=cid%> - SFTP authentication using a public key.");
+    		log.debug("<%=cid%> - Private key: '" + <%=privateKey%> + "'.");
+    	<%}%>
+    	jsch_<%=cid%>.addIdentity(<%=privateKey %>, defaultUserInfo_<%=cid%>.getPassphrase());
+    <%}%>
+    
+    session_<%=cid%> = jsch_<%=cid%>.getSession(<%=user%>, <%=host%>, <%=port%>);
+    session_<%=cid%>.setConfig("PreferredAuthentications", "publickey,password,keyboard-interactive,gssapi-with-mic");
+    
+    <%if (("PASSWORD").equals(authMethod)) {%> 
+    	<%if(isLog4jEnabled){%>
+    		log.info("<%=cid%> - SFTP authentication using a password.");
+    	<%}%>
+      		
+    	<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
+       	
+    	session_<%=cid%>.setPassword(decryptedPassword_<%=cid%>); 
+    <%}%>
+    
+    session_<%=cid%>.setUserInfo(defaultUserInfo_<%=cid%>); 
+    <%if (!useProxy) {%>
+    	if(("true").equals(System.getProperty("http.proxySet")) ){
+    		com.jcraft.jsch.ProxyHTTP proxy_<%=cid%> = new com.jcraft.jsch.ProxyHTTP(System.getProperty("http.proxyHost"),Integer.parseInt(System.getProperty("http.proxyPort")));
+    		if(!"".equals(System.getProperty("http.proxyUser"))){
+    			proxy_<%=cid%>.setUserPasswd(System.getProperty("http.proxyUser"),System.getProperty("http.proxyPassword"));
+    		}
+    		session_<%=cid%>.setProxy(proxy_<%=cid%>);
+    	}
+    <%}%>
+    	
+    <%if(isLog4jEnabled){%>
+    	log.info("<%=cid%> - Attempt to connect to  '" + <%=host %> + "' with username '" + <%=user%> + "'.");
+    <%}%>
+
+	channel_<%=cid%> = null;
+  	try {
+      	session_<%=cid%>.connect();
+      	channel_<%=cid%> = session_<%=cid%>.openChannel("sftp");
+      	channel_<%=cid%>.connect();
+      	<%if(isLog4jEnabled){%>
+      		log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
+      	<%}%>
+  	} catch (com.jcraft.jsch.JSchException e_<%=cid%>) {
+  		try {
+	  		if(channel_<%=cid%>!=null) {
+	  			channel_<%=cid%>.disconnect();
+	  		}
+	  		
+	  		if(session_<%=cid%>!=null) {
+	  			session_<%=cid%>.disconnect();
+	  		}
+  		} catch(java.lang.Exception ce_<%=cid%>) {
+  			<%if(isLog4jEnabled){%>
+      		log.warn("<%=cid%> - close sftp connection failed : " + ce_<%=cid%>.getClass() + " : " + ce_<%=cid%>.getMessage());
+      		<%}%>
+  		}
+		
+		String message_<%=cid%> = new TalendException(null, null, null).getExceptionCauseMessage(e_<%=cid%>);
+		if(message_<%=cid%>.contains("Signature length not correct") || message_<%=cid%>.contains("connection is closed by foreign host")) {
+			retry_<%=cid%> = true;
+			retry_count_<%=cid%>++;
+			<%if(isLog4jEnabled){%>
+      		log.info("<%=cid%> - connect: Signature length not correct or connection is closed by foreign host, so retry, retry time : " + retry_count_<%=cid%>);
+      		<%}%>
+		} else {
+			throw e_<%=cid%>;
+		}
+  	}
+} while(retry_<%=cid%> && (retry_count_<%=cid%> < retry_max_<%=cid%>));
+
+com.jcraft.jsch.ChannelSftp c_<%=cid%> = (com.jcraft.jsch.ChannelSftp)channel_<%=cid%>;

main/plugins/org.talend.designer.components.localprovider/components/tFTPConnection/tFTPConnection_begin.javajet

@@ -133,53 +133,12 @@ if (!sftp && !ftps) { // *** ftp *** //
 		}
 	};
 	final com.jcraft.jsch.UserInfo defaultUserInfo_<%=cid%> = new MyUserInfo();
-	com.jcraft.jsch.JSch jsch_<%=cid%> = new com.jcraft.jsch.JSch(); 
-
-	<%if (("PUBLICKEY").equals(authMethod)){%>
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - SFTP authentication using a public key.");
-			log.debug("<%=cid%> - Private key: '" + <%=privateKey%> + "'.");
-		<%}%>
-		jsch_<%=cid%>.addIdentity(<%=privateKey %>, defaultUserInfo_<%=cid%>.getPassphrase());
-	<%}%>
 	
-	com.jcraft.jsch.Session session_<%=cid%> = jsch_<%=cid%>.getSession(<%=user%>, <%=host%>, <%=port%>);
-	session_<%=cid%>.setConfig("PreferredAuthentications", "publickey,password,keyboard-interactive,gssapi-with-mic");
+	<%
+	passwordFieldName = "__PASS__";
+	%>
 	
-	<%if (("PASSWORD").equals(authMethod)) {%> 
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - SFTP authentication using a password.");
-		<%}%>
-	        
-		<%
-		passwordFieldName = "__PASS__";
-		%>
-    		
-		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-	   	
-		session_<%=cid%>.setPassword(decryptedPassword_<%=cid%>); 
-	<%}%>
-
-	session_<%=cid%>.setUserInfo(defaultUserInfo_<%=cid%>); 
-	<%if (!useProxy) {%>
-		if(("true").equals(System.getProperty("http.proxySet")) ){
-			com.jcraft.jsch.ProxyHTTP proxy_<%=cid%> = new com.jcraft.jsch.ProxyHTTP(System.getProperty("http.proxyHost"),Integer.parseInt(System.getProperty("http.proxyPort")));
-			if(!"".equals(System.getProperty("http.proxyUser"))){
-				proxy_<%=cid%>.setUserPasswd(System.getProperty("http.proxyUser"),System.getProperty("http.proxyPassword"));
-			}
-			session_<%=cid%>.setProxy(proxy_<%=cid%>);
-		}
-	<%}%>
-	<%if(isLog4jEnabled){%>
-		log.info("<%=cid%> - Attempt to connect to  '" + <%=host %> + "' with username '" + <%=user%> + "'.");
-	<%}%>
-	session_<%=cid%>.connect();
-	com.jcraft.jsch. Channel channel_<%=cid%> = session_<%=cid%>.openChannel("sftp"); 
-	channel_<%=cid%>.connect();
-	<%if(isLog4jEnabled){%>
-		log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-	<%}%>
-	com.jcraft.jsch.ChannelSftp c_<%=cid%> = (com.jcraft.jsch.ChannelSftp)channel_<%=cid%>;
+	<%@ include file="sftp_connect.javajet"%>
 	
 	<%if(use_encoding) {%>
 		c_<%=cid%>.setFilenameEncoding(<%=sEncoding%>);

main/plugins/org.talend.designer.components.localprovider/components/tFTPDelete/tFTPDelete_begin.javajet

@@ -124,57 +124,16 @@ int nb_file_<%=cid%> = 0;
   				}
 	    	}; 
 		    final com.jcraft.jsch.UserInfo defaultUserInfo_<%=cid%> = new MyUserInfo_<%=cid %>();
-		    com.jcraft.jsch.JSch jsch_<%=cid%>=new com.jcraft.jsch.JSch(); 
-
-			<%if (("PUBLICKEY").equals(authMethod)) {%>
-				<%if(isLog4jEnabled){%>
-					log.info("<%=cid%> - SFTP authentication using a public key.");
-					log.debug("<%=cid%> - Private key: '" + <%=privateKey%> + "'.");
-	  			<%}%>
-      			jsch_<%=cid%>.addIdentity(<%=privateKey %>, defaultUserInfo_<%=cid%>.getPassphrase());
-    		<%}%>
-    		
-    		com.jcraft.jsch.Session session_<%=cid%>=jsch_<%=cid%>.getSession(<%=user%>, <%=host%>, <%=port%>);
-    		session_<%=cid%>.setConfig("PreferredAuthentications", "publickey,password,keyboard-interactive,gssapi-with-mic");
-
-		    <%if (("PASSWORD").equals(authMethod)){ %>
-				<%if(isLog4jEnabled){%>
-					log.info("<%=cid%> - SFTP authentication using a password.");
-				<%}%>
-				
-				<%
-    			passwordFieldName = "__PASSWORD__";
-    			%> 
-    	
-    			<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-    			
-				session_<%=cid%>.setPassword(decryptedPassword_<%=cid%>); 
-		    <%}%>
-    		session_<%=cid%>.setUserInfo(defaultUserInfo_<%=cid%>); 
-			<%if (!useProxy) {%>
-				if(("true").equals(System.getProperty("http.proxySet")) ){
-		  			com.jcraft.jsch.ProxyHTTP proxy_<%=cid%> = new com.jcraft.jsch.ProxyHTTP(System.getProperty("http.proxyHost"),Integer.parseInt(System.getProperty("http.proxyPort")));
-			  		if(!"".equals(System.getProperty("http.proxyUser"))){
-			  			proxy_<%=cid%>.setUserPasswd(System.getProperty("http.proxyUser"),System.getProperty("http.proxyPassword"));
-			  		}
-		  			session_<%=cid%>.setProxy(proxy_<%=cid%>);
-			  	}
-			<%}%>
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username: '" + <%=user%> + "'.");
-			<%}%>
-		    session_<%=cid%>.connect();
-		    com.jcraft.jsch. Channel channel_<%=cid%>=session_<%=cid%>.openChannel("sftp");
-		    channel_<%=cid%>.connect();
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-			<%}%>
-		    com.jcraft.jsch.ChannelSftp c_<%=cid%>=(com.jcraft.jsch.ChannelSftp)channel_<%=cid%>;
 		    
-		    <%if(use_encoding) {%>
-		    	c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
-		    <%}%>	
-		    	
+  	    <%
+  			passwordFieldName = "__PASSWORD__";
+  			%>
+			
+			<%@ include file="../tFTPConnection/sftp_connect.javajet"%>
+		    
+	    <%if(use_encoding) {%>
+	    	c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
+	    <%}%>	
 		    	
 		<%} else {%>    
 			com.jcraft.jsch.ChannelSftp c_<%=cid%> = (com.jcraft.jsch.ChannelSftp)globalMap.get("<%=conn %>");

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileExist/tFTPFileExist_begin.javajet

@@ -129,56 +129,16 @@ if (sftp) { // *** sftp *** //
 			}
 		}; 
     	final com.jcraft.jsch.UserInfo defaultUserInfo_<%=cid%> = new MyUserInfo_<%=cid%>();
-    	com.jcraft.jsch.JSch jsch_<%=cid%>=new com.jcraft.jsch.JSch(); 
-
-    	<%if (("PUBLICKEY").equals(authMethod)) {%>
-	  		<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - SFTP authentication using a public key.");
-				log.debug("<%=cid%> - Private key: '" + <%=privateKey %> + "'.");
-	  		<%}%>
-      		jsch_<%=cid%>.addIdentity(<%=privateKey %>, defaultUserInfo_<%=cid%>.getPassphrase());
-    	<%}%>
     	
-    	com.jcraft.jsch.Session session_<%=cid%>=jsch_<%=cid%>.getSession(<%=user%>, <%=host%>, <%=port%>);
-    	session_<%=cid%>.setConfig("PreferredAuthentications", "publickey,password,keyboard-interactive,gssapi-with-mic");
-
-    	<%if (("PASSWORD").equals(authMethod)) {%> 
-	  		<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - SFTP authentication using a password.");
-	  		<%}%>
-	  		
-			<%
+    	<%
 			passwordFieldName = "__PASSWORD__";
-			%> 
+			%>
+		
+		<%@ include file="../tFTPConnection/sftp_connect.javajet"%>
     	
-			<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-	  		
-      		session_<%=cid%>.setPassword(decryptedPassword_<%=cid%>); 
-    	<%}%>
-    	session_<%=cid%>.setUserInfo(defaultUserInfo_<%=cid%>); 
-		<%if (!useProxy) {%>
-	  		if(("true").equals(System.getProperty("http.proxySet")) ){
-		  		com.jcraft.jsch.ProxyHTTP proxy_<%=cid%> = new com.jcraft.jsch.ProxyHTTP(System.getProperty("http.proxyHost"),Integer.parseInt(System.getProperty("http.proxyPort")));
-  				if(!"".equals(System.getProperty("http.proxyUser"))){
-  					proxy_<%=cid%>.setUserPasswd(System.getProperty("http.proxyUser"),System.getProperty("http.proxyPassword"));
-  				}
-  				session_<%=cid%>.setProxy(proxy_<%=cid%>);
-  			}
-		<%}%>
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" + <%=user%> + "'.");
-		<%}%>
-    	session_<%=cid%>.connect();
-		com.jcraft.jsch. Channel channel_<%=cid%>=session_<%=cid%>.openChannel("sftp");
-    	channel_<%=cid%>.connect();
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Connect to '" + <%=host%> + "' has succeeded.");
-		<%}%>
-    	com.jcraft.jsch.ChannelSftp c_<%=cid%>=(com.jcraft.jsch.ChannelSftp)channel_<%=cid%>;
-    	
-    	<%if(use_encoding) {%>
-    		c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
-    	<%}%>
+  	<%if(use_encoding) {%>
+  		c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
+  	<%}%>
   <%
   	} else {
   %>    

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileList/tFTPFileList_begin.javajet

@@ -146,52 +146,12 @@ if (sftp) {// *** sftp *** //
 			}
 		}; 
 		final com.jcraft.jsch.UserInfo defaultUserInfo_<%=cid%> = new MyUserInfo_<%=cid%>();
-		com.jcraft.jsch.JSch jsch_<%=cid%>=new com.jcraft.jsch.JSch(); 
-
-		<%if (("PUBLICKEY").equals(authMethod)) {%>
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - SFTP authentication using a public key.");
-				log.debug("<%=cid%> - Private key: '" + <%=privateKey%> + "'.");
-			<%}%>
-			jsch_<%=cid%>.addIdentity(<%=privateKey %>, defaultUserInfo_<%=cid%>.getPassphrase());
-		<%}%>
 		
-		com.jcraft.jsch.Session session_<%=cid%>=jsch_<%=cid%>.getSession(<%=user%>, <%=host%>, <%=port%>);
-		session_<%=cid%>.setConfig("PreferredAuthentications", "publickey,password,keyboard-interactive,gssapi-with-mic");
-
-		<%if (("PASSWORD").equals(authMethod)) {%>
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - SFTP authentication using a password.");
-			<%}%> 
-			
-			<%
-			passwordFieldName = "__PASSWORD__";
-			%> 
-
-			<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-
-			session_<%=cid%>.setPassword(decryptedPassword_<%=cid%>); 
-		<%}%>
-		session_<%=cid%>.setUserInfo(defaultUserInfo_<%=cid%>); 
-		<%if (!useProxy) {%>
-		if(("true").equals(System.getProperty("http.proxySet")) ){
-			com.jcraft.jsch.ProxyHTTP proxy_<%=cid%> = new com.jcraft.jsch.ProxyHTTP(System.getProperty("http.proxyHost"),Integer.parseInt(System.getProperty("http.proxyPort")));
-			if(!"".equals(System.getProperty("http.proxyUser"))){
-				proxy_<%=cid%>.setUserPasswd(System.getProperty("http.proxyUser"),System.getProperty("http.proxyPassword"));
-			}
-			session_<%=cid%>.setProxy(proxy_<%=cid%>);
-		}
-		<%}%>
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" + <%=user%> + "'.");
-		<%}%>
-		session_<%=cid%>.connect();
-		com.jcraft.jsch. Channel channel_<%=cid%>=session_<%=cid%>.openChannel("sftp");
-		channel_<%=cid%>.connect();
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-		<%}%>
-		com.jcraft.jsch.ChannelSftp c_<%=cid%>=(com.jcraft.jsch.ChannelSftp)channel_<%=cid%>;
+		<%
+		passwordFieldName = "__PASSWORD__";
+		%>
+		
+		<%@ include file="../tFTPConnection/sftp_connect.javajet"%>
 		
 		<%if(use_encoding) {%>
 			c_<%=cid%>.setFilenameEncoding(<%=encoding%>);

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileProperties/tFTPFileProperties_begin.javajet

@@ -149,56 +149,16 @@ if (sftp) {  // *** sftp *** //
       		}
     	}; 
     	final com.jcraft.jsch.UserInfo defaultUserInfo_<%=cid%> = new MyUserInfo_<%=cid%>();
-    	com.jcraft.jsch.JSch jsch_<%=cid%>=new com.jcraft.jsch.JSch(); 
-
-	    <%if (("PUBLICKEY").equals(authMethod)) {%>
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - SFTP authentication using a public key.");
-				log.debug("<%=cid%> - Private key: '" + <%=privateKey%> + "'.");
-	  		<%}%>
-	      jsch_<%=cid%>.addIdentity(<%=privateKey %>, defaultUserInfo_<%=cid%>.getPassphrase());
-	    <%}%>
-	    
-    	com.jcraft.jsch.Session session_<%=cid%>=jsch_<%=cid%>.getSession(<%=user%>, <%=host%>, <%=port%>);
-    	session_<%=cid%>.setConfig("PreferredAuthentications", "publickey,password,keyboard-interactive,gssapi-with-mic");
-
-	    <%if (("PASSWORD").equals(authMethod)) {%> 
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - SFTP authentication using a password.");
-			<%}%>
-			
-        	<%
-			passwordFieldName = "__PASSWORD__";
-			%> 
     	
-    		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-    		
-	      session_<%=cid%>.setPassword(decryptedPassword_<%=cid%>); 
-	    <%}%>
-    	session_<%=cid%>.setUserInfo(defaultUserInfo_<%=cid%>); 
-		<%if (!useProxy) {%>
-	  	if(("true").equals(System.getProperty("http.proxySet")) ){
-	  		com.jcraft.jsch.ProxyHTTP proxy_<%=cid%> = new com.jcraft.jsch.ProxyHTTP(System.getProperty("http.proxyHost"),Integer.parseInt(System.getProperty("http.proxyPort")));
-	  		if(!"".equals(System.getProperty("http.proxyUser"))){
-	  			proxy_<%=cid%>.setUserPasswd(System.getProperty("http.proxyUser"),System.getProperty("http.proxyPassword"));
-	  		}
-	  		session_<%=cid%>.setProxy(proxy_<%=cid%>);
-	  	}
-		<%}%>
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" + <%=user%> + "'.");
-		<%}%>
-	    session_<%=cid%>.connect();
-	    com.jcraft.jsch. Channel channel_<%=cid%>=session_<%=cid%>.openChannel("sftp");
-	    channel_<%=cid%>.connect();
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-		<%}%>
-	    com.jcraft.jsch.ChannelSftp c_<%=cid%>=(com.jcraft.jsch.ChannelSftp)channel_<%=cid%>;
+    	<%
+			passwordFieldName = "__PASSWORD__";
+			%>
+		
+		<%@ include file="../tFTPConnection/sftp_connect.javajet"%>
 	    
-	    <%if(use_encoding) {%>
-	    	c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
-	    <%}%>
+    <%if(use_encoding) {%>
+    	c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
+    <%}%>
 	    
 	<%} else {%>    
 		com.jcraft.jsch.ChannelSftp c_<%=cid%> = (com.jcraft.jsch.ChannelSftp)globalMap.get("<%=conn %>");

main/plugins/org.talend.designer.components.localprovider/components/tFTPGet/tFTPGet_begin.javajet

@@ -282,57 +282,15 @@ if (sftp) { // *** sftp *** //
   <%
 			} else{
   %>    
-				com.jcraft.jsch.JSch jsch_<%=cid%>=new com.jcraft.jsch.JSch(); 
-
-				<%if ("PUBLICKEY".equals(authMethod)){%>
-					<%if(isLog4jEnabled){%>
-						log.info("<%=cid%> - SFTP authentication using a public key.");
-						log.debug("<%=cid%> - Private key: '" + <%=privateKey%> + "'.");
-					  <%}%>
-    				jsch_<%=cid%>.addIdentity(<%=privateKey %>, defaultUserInfo_<%=cid%>.getPassphrase());
-			    <%}%>
+				<%
+      	passwordFieldName = "__PASSWORD__";
+      	%>
+				
+				<%@ include file="../tFTPConnection/sftp_connect.javajet"%>
 			    
-				com.jcraft.jsch.Session session_<%=cid%>=jsch_<%=cid%>.getSession(<%=user%>, <%=host%>, <%=port%>);
-				session_<%=cid%>.setConfig("PreferredAuthentications", "publickey,password,keyboard-interactive,gssapi-with-mic");
-
-			    <%if("PASSWORD".equals(authMethod)){%>
-					<%if(isLog4jEnabled){%>
-						log.info("<%=cid%> - SFTP authentication using a password.");
-					<%}%>
-					
-        			<%
-                	passwordFieldName = "__PASSWORD__";
-                	%> 
-                	
-                	<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-                	
-				      session_<%=cid%>.setPassword(decryptedPassword_<%=cid%>); 
-			    <%}%>
-
-				session_<%=cid%>.setUserInfo(defaultUserInfo_<%=cid%>); 
-				<%if (!useProxy) {%>
-				  	if(("true").equals(System.getProperty("http.proxySet")) ){
-				  		com.jcraft.jsch.ProxyHTTP proxy_<%=cid%> = new com.jcraft.jsch.ProxyHTTP(System.getProperty("http.proxyHost"),Integer.parseInt(System.getProperty("http.proxyPort")));
-				  		if(!"".equals(System.getProperty("http.proxyUser"))){
-				  			proxy_<%=cid%>.setUserPasswd(System.getProperty("http.proxyUser"),System.getProperty("http.proxyPassword"));
-				  		}
-				  		session_<%=cid%>.setProxy(proxy_<%=cid%>);
-				  	}
-				<%}%>
-				<%if(isLog4jEnabled){%>
-					log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username: '" + <%=user%> + "'.");
-				<%}%>
-			    session_<%=cid%>.connect();
-			    com.jcraft.jsch. Channel channel_<%=cid%>=session_<%=cid%>.openChannel("sftp");
-			    channel_<%=cid%>.connect();
-				<%if(isLog4jEnabled){%>
-					log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-				<%}%>
-			    com.jcraft.jsch.ChannelSftp c_<%=cid%>=(com.jcraft.jsch.ChannelSftp)channel_<%=cid%>;
-			    
-			    <%if(use_encoding) {%>
-			    	c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
-			    <%}%>
+		    <%if(use_encoding) {%>
+		    	c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
+		    <%}%>
   <%
 			}
   %>

main/plugins/org.talend.designer.components.localprovider/components/tFTPPut/tFTPPut_begin.javajet

@@ -146,52 +146,12 @@ int nb_file_<%=cid%> = 0;
       		}
 		};
 		final com.jcraft.jsch.UserInfo defaultUserInfo_<%=cid%> = new MyUserInfo_<%=cid %>();
-		com.jcraft.jsch.JSch jsch_<%=cid%>=new com.jcraft.jsch.JSch(); 
-
-		<%if (("PUBLICKEY").equals(authMethod)) {%>
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - SFTP authentication using a public key.");
-				log.debug("<%=cid%> - Private key: '" + <%=privateKey%> + "'.");
-	 		 <%}%>
-      		jsch_<%=cid%>.addIdentity(<%=privateKey %>, defaultUserInfo_<%=cid%>.getPassphrase());
-		<%}%>
 		
-		com.jcraft.jsch.Session session_<%=cid%>=jsch_<%=cid%>.getSession(<%=user%>, <%=host%>, <%=port%>);
-		session_<%=cid%>.setConfig("PreferredAuthentications", "publickey,password,keyboard-interactive,gssapi-with-mic");
-
-		<%if (("PASSWORD").equals(authMethod)) {%>
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - SFTP authentication using a password.");
-			<%}%>
-			
-        	<%
-        	passwordFieldName = "__PASSWORD__";
-        	%> 
-        	
-        	<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-        	
-			session_<%=cid%>.setPassword(decryptedPassword_<%=cid%>); 
-		<%}%>
-		session_<%=cid%>.setUserInfo(defaultUserInfo_<%=cid%>); 
-		<%if (!useProxy) {%>
-		if(("true").equals(System.getProperty("http.proxySet")) ){
-			com.jcraft.jsch.ProxyHTTP proxy_<%=cid%> = new com.jcraft.jsch.ProxyHTTP(System.getProperty("http.proxyHost"),Integer.parseInt(System.getProperty("http.proxyPort")));
-			if(!"".equals(System.getProperty("http.proxyUser"))){
-				proxy_<%=cid%>.setUserPasswd(System.getProperty("http.proxyUser"),System.getProperty("http.proxyPassword"));
-  			}
-			session_<%=cid%>.setProxy(proxy_<%=cid%>);
-		}
-		<%}%>
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" + <%=user%> + "'.");
-		<%}%>
-    	session_<%=cid%>.connect();
-    	com.jcraft.jsch. Channel channel_<%=cid%>=session_<%=cid%>.openChannel("sftp");
-    	channel_<%=cid%>.connect();
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Connect to '" + <%=host %> + " has succeeded." );
-		<%}%>
-		com.jcraft.jsch.ChannelSftp c_<%=cid%>=(com.jcraft.jsch.ChannelSftp)channel_<%=cid%>;
+		<%
+  	passwordFieldName = "__PASSWORD__";
+  	%>
+		
+		<%@ include file="../tFTPConnection/sftp_connect.javajet"%>
 
 		<%if(use_encoding) {%>
 			c_<%=cid%>.setFilenameEncoding(<%=encoding%>);

main/plugins/org.talend.designer.components.localprovider/components/tFTPRename/tFTPRename_begin.javajet

@@ -127,57 +127,16 @@ if (sftp) {  // *** sftp *** //
 			}
 		}; 
 		final com.jcraft.jsch.UserInfo defaultUserInfo_<%=cid%> = new MyUserInfo_<%=cid%>();
-		com.jcraft.jsch.JSch jsch_<%=cid%>=new com.jcraft.jsch.JSch(); 
-
-		<%if (("PUBLICKEY").equals(authMethod)) {%>
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - SFTP authentication using a public key.");
-				log.debug("<%=cid%> - Private key: '" + <%=privateKey%> + "'.");
-	  		<%}%>
-			jsch_<%=cid%>.addIdentity(<%=privateKey %>, defaultUserInfo_<%=cid%>.getPassphrase());
-		<%}%>
 		
-	    com.jcraft.jsch.Session session_<%=cid%>=jsch_<%=cid%>.getSession(<%=user%>, <%=host%>, <%=port%>);
-	    session_<%=cid%>.setConfig("PreferredAuthentications", "publickey,password,keyboard-interactive,gssapi-with-mic");
-
-    	<%if (("PASSWORD").equals(authMethod)) {%> 
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - SFTP authentication using a password.");
-			<%}%>
-			
-			<%
-			passwordFieldName = "__PASSWORD__";
-			%> 
+		<%
+		passwordFieldName = "__PASSWORD__";
+		%>
+		
+		<%@ include file="../tFTPConnection/sftp_connect.javajet"%>
     	
-			<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-			
-		session_<%=cid%>.setPassword(decryptedPassword_<%=cid%>); 
-		<%}%>
-
-		session_<%=cid%>.setUserInfo(defaultUserInfo_<%=cid%>); 
-		<%if (!useProxy) {%>
-			if(("true").equals(System.getProperty("http.proxySet")) ){
-				com.jcraft.jsch.ProxyHTTP proxy_<%=cid%> = new com.jcraft.jsch.ProxyHTTP(System.getProperty("http.proxyHost"),Integer.parseInt(System.getProperty("http.proxyPort")));
-				if(!"".equals(System.getProperty("http.proxyUser"))){
-					proxy_<%=cid%>.setUserPasswd(System.getProperty("http.proxyUser"),System.getProperty("http.proxyPassword"));
-				}
-			session_<%=cid%>.setProxy(proxy_<%=cid%>);
-				}
-		<%}%>
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" + <%=user%> + "'.");
-		<%}%>
-		session_<%=cid%>.connect();
-		com.jcraft.jsch. Channel channel_<%=cid%>=session_<%=cid%>.openChannel("sftp");
-		channel_<%=cid%>.connect();
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-		<%}%>
-    	com.jcraft.jsch.ChannelSftp c_<%=cid%>=(com.jcraft.jsch.ChannelSftp)channel_<%=cid%>;
-    	
-    	<%if(use_encoding) {%>
-    		c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
-    	<%}%>	
+  	<%if(use_encoding) {%>
+  		c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
+  	<%}%>	
     		
 <%
 	} else {

main/plugins/org.talend.designer.components.localprovider/components/tFTPTruncate/tFTPTruncate_begin.javajet

@@ -126,56 +126,16 @@ if (sftp) {// *** sftp *** //
 			}
 		}; 
 		final com.jcraft.jsch.UserInfo defaultUserInfo_<%=cid%> = new MyUserInfo_<%=cid%>();
-		com.jcraft.jsch.JSch jsch_<%=cid%>=new com.jcraft.jsch.JSch(); 
-
-		<%if (("PUBLICKEY").equals(authMethod)) {%>
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - SFTP authentication using a public key.");
-				log.debug("<%=cid%> - Private key: '" + <%=privateKey%> + "'.");
-			<%}%>
-			jsch_<%=cid%>.addIdentity(<%=privateKey %>, defaultUserInfo_<%=cid%>.getPassphrase());
-    	<%}%>
-    	
-		com.jcraft.jsch.Session session_<%=cid%>=jsch_<%=cid%>.getSession(<%=user%>, <%=host%>, <%=port%>);
-		session_<%=cid%>.setConfig("PreferredAuthentications", "publickey,password,keyboard-interactive,gssapi-with-mic");
-
-		<%if (("PASSWORD").equals(authMethod)) {%> 
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - SFTP authentication using a password.");
-			<%}%>
-			
-			<%
-			passwordFieldName = "__PASSWORD__";
-			%> 
-    	
-			<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-			
-      		session_<%=cid%>.setPassword(decryptedPassword_<%=cid%>); 
-    	<%}%>
-		session_<%=cid%>.setUserInfo(defaultUserInfo_<%=cid%>); 
-		<%if (!useProxy) {%>
-			if(("true").equals(System.getProperty("http.proxySet")) ){
-				com.jcraft.jsch.ProxyHTTP proxy_<%=cid%> = new com.jcraft.jsch.ProxyHTTP(System.getProperty("http.proxyHost"),Integer.parseInt(System.getProperty("http.proxyPort")));
-				if(!"".equals(System.getProperty("http.proxyUser"))){
-					proxy_<%=cid%>.setUserPasswd(System.getProperty("http.proxyUser"),System.getProperty("http.proxyPassword"));
-				}
-				session_<%=cid%>.setProxy(proxy_<%=cid%>);
-			}
-		<%}%>
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" + <%=user%> + "'.");
-		<%}%>
-	    session_<%=cid%>.connect();
-	    com.jcraft.jsch. Channel channel_<%=cid%>=session_<%=cid%>.openChannel("sftp");
-	    channel_<%=cid%>.connect();
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-		<%}%>
-	    com.jcraft.jsch.ChannelSftp c_<%=cid%>=(com.jcraft.jsch.ChannelSftp)channel_<%=cid%>;
+		
+		<%
+		passwordFieldName = "__PASSWORD__";
+		%>
+		
+		<%@ include file="../tFTPConnection/sftp_connect.javajet"%>
 	    
-	    <%if(use_encoding) {%>
-	    	c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
-	    <%}%>
+    <%if(use_encoding) {%>
+    	c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
+    <%}%>
 	<%
 	} else {
 	%>