Set version to 7.3.1 M1

doesn't throw any error.

i18n/plugins/org.talend.designer.abstractmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap.nl</artifactId>

i18n/plugins/org.talend.designer.alfrescooutput.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.alfrescooutput.nl</artifactId>

i18n/plugins/org.talend.designer.business.diagram.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram.nl</artifactId>

i18n/plugins/org.talend.designer.codegen.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen.nl</artifactId>

i18n/plugins/org.talend.designer.components.exchange.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange.nl</artifactId>

i18n/plugins/org.talend.designer.core.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.core.nl</artifactId>

i18n/plugins/org.talend.designer.dbmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.dbmap.nl</artifactId>

i18n/plugins/org.talend.designer.documentation.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.documentation.nl</artifactId>

i18n/plugins/org.talend.designer.fileoutputxml.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.fileoutputxml.nl</artifactId>

i18n/plugins/org.talend.designer.gefabstractmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.gefabstractmap.nl</artifactId>

i18n/plugins/org.talend.designer.mapper.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.mapper.nl</artifactId>

i18n/plugins/org.talend.designer.maven.job.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.job.nl</artifactId>

i18n/plugins/org.talend.designer.rowgenerator.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.rowgenerator.nl</artifactId>

i18n/plugins/org.talend.designer.runprocess.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.runprocess.nl</artifactId>

i18n/plugins/org.talend.designer.scd.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.scd.nl</artifactId>

i18n/plugins/org.talend.designer.webservice.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.webservice.nl</artifactId>

i18n/plugins/org.talend.designer.xmlmap.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.xmlmap.nl</artifactId>

i18n/plugins/org.talend.expressionbuilder.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.expressionbuilder.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.resource.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.resource.tos.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>

i18n/plugins/org.talend.repository.ftp.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.ftp.nl</artifactId>

i18n/plugins/org.talend.repository.json.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.json.nl</artifactId>

i18n/plugins/org.talend.repository.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.nl</artifactId>

i18n/plugins/org.talend.repository.view.di.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.view.di.nl</artifactId>

i18n/plugins/org.talend.sbi.engines.client.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.engines.client.nl</artifactId>

i18n/plugins/org.talend.spagic.engines.client.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.engines.client.nl</artifactId>

i18n/plugins/org.talend.sqlbuilder.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sqlbuilder.nl</artifactId>

main/features/org.talend.designer.business.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.feature</artifactId>

main/features/org.talend.designer.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.feature</artifactId>

main/features/org.talend.fragment.jars.di.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.fragment.jars.di.feature</artifactId>

main/features/org.talend.rcp.branding.tos.feature/feature.xml

@@ -11,7 +11,6 @@
     <import feature="org.talend.tos.feature" version="0.0.0" match="greaterOrEqual"/>
   </requires>
   <plugin id="org.talend.designer.maven.tos" download-size="0" install-size="0" version="0.0.0" fragment="true"/>
-  <plugin id="org.talend.libraries.mdm.webservice.ce" download-size="0" install-size="0" version="0.0.0" fragment="true"/>
   <plugin id="org.talend.presentation.onboarding" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.presentation.onboarding.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.presentation.onboarding.resource" download-size="0" install-size="0" version="0.0.0" unpack="false"/>

main/features/org.talend.rcp.branding.tos.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.feature</artifactId>

main/features/org.talend.rcp.branding.tos.test.feature/feature.xml

@@ -55,5 +55,6 @@
   <plugin id="org.talend.testutils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.updates.runtime.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.utils.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.sdk.component.studio-integration.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="test.all.test.suite" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>

main/features/org.talend.rcp.branding.tos.test.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

main/features/org.talend.repository.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.feature</artifactId>

main/features/org.talend.sbi.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.feature</artifactId>

main/features/org.talend.spagic.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.feature</artifactId>

main/features/org.talend.tos.components.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.components.feature</artifactId>

main/features/org.talend.tos.core.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.core.feature</artifactId>

main/features/org.talend.tos.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.feature</artifactId>

main/features/org.talend.tos.libraries.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.libraries.feature</artifactId>

main/plugins/org.talend.designer.abstractmap/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap</artifactId>

main/plugins/org.talend.designer.alfrescooutput/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.alfrescooutput</artifactId>

main/plugins/org.talend.designer.business.diagram/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram</artifactId>

main/plugins/org.talend.designer.codegen/META-INF/MANIFEST.MF

@@ -22,6 +22,7 @@ Require-Bundle: org.talend.core.repository,
  org.apache.log4j,
  org.talend.components.api,
  org.talend.daikon,
+ org.talend.daikon.crypto.utils,
  org.talend.designer.core.generic
 Eclipse-LazyStart: true
 Bundle-ClassPath: .

main/plugins/org.talend.designer.codegen/jet_stub/component_part_footer.javajet

@@ -59,88 +59,76 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
 		List<String> needToEndConnNames = new ArrayList<String>();
 		INode nextNode = node.getOutgoingConnections(EConnectionType.ITERATE).get(0).getTarget();
 		NodeUtil.fillConnectionsForStat(needToEndConnNames, nextNode);
-		%>
-		
-		<%if(stat) {%>
-		if(execStat){
-			<%
-			for(String connName : needToEndConnNames){
+		if(!needToEndConnNames.isEmpty()) {
+			if(stat && logstashCurrent) {
 			%>
-				runStat.updateStatOnConnection("<%=connName%>"+iterateId,2, 0);
+			runStat.updateStatAndLog(execStat,enableLogStash,iterateId,2,0<%for(String connName : needToEndConnNames){%>,"<%=connName%>"<%}%>);
 			<%
+			} else {
+				if(stat) {%>
+				if(execStat){
+					runStat.updateStatOnConnection(iterateId,2,0<%for(String connName : needToEndConnNames){%>,"<%=connName%>"<%}%>);
+				}
+				<%}%>
+				
+				<%if(logstashCurrent) {//now only finish the log, not send, TODO%>
+				if(enableLogStash){
+					runStat.log(iterateId,2,0<%for(String connName : needToEndConnNames){%>,"<%=connName%>"<%}%>);
+				}
+				<%
+				}
 			}
-			%>
 		}
-		<%}%>
-		
-		<%if(logstashCurrent) {//now only finish the log, not send, TODO%>
-		if(enableLogStash){
-			<%
-			for(String connName : needToEndConnNames){
-			%>
-				runStat.logStatOnConnection("<%=connName%>"+iterateId,2, 0);
-			<%
-			}
-			%>
-		}
-		<%
-		}
-		%>
-	<%
 	}
-	if(connSet.size()>0){
-	  	for(IConnection con:connSet){
-	  		INode source = con.getSource();
-			String sourceNodeId = source.getUniqueName();
-			String sourceNodeComponent = source.getComponent().getName();
-		%>
-			<%if(stat) {%>
-			if(execStat){
-				if(resourceMap.get("inIterateVComp") == null || !((Boolean)resourceMap.get("inIterateVComp"))){
-	 				runStat.updateStatOnConnection("<%=con.getUniqueName()%>"+iterateId,2, 0);
-			 	}
+	
+	if(connSet.size()>0) {
+		if(stat && logstashCurrent && (connSet.size()==1)) {//the most common case, write this ugly logic for 65535 issue
+			for(IConnection con:connSet){
+		  		INode source = con.getSource();
+				String sourceNodeId = source.getUniqueName();
+				String sourceNodeComponent = source.getComponent().getName();
+	 			for (INode jobStructureCatcher : jobCatcherNodes) {
+	 			%>
+			 		if(runStat.updateStatAndLog(execStat,enableLogStash,resourceMap,iterateId,"<%=con.getUniqueName()%>",2,0,
+			 			<%=jobStructureCatcher.getUniqueName()%>,"<%=sourceNodeId%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
+						<%=jobStructureCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
+					}
+				<%
+					break;
+				}
+		  	}
+		} else {
+			if(stat){
+				%>
+				if(execStat){
+			  		runStat.updateStat(resourceMap,iterateId,2,0<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+			  	}
+			  	<%
 			}
-			<%}%>
 			
-			<%if(logstashCurrent) {%>
-			if(enableLogStash){
-				if(resourceMap.get("inIterateVComp") == null || !((Boolean)resourceMap.get("inIterateVComp"))){
-			 		<%
+			if(logstashCurrent){
+				%>
+				if(enableLogStash) {
+				<%
+			  	for(IConnection con:connSet){
+			  		INode source = con.getSource();
+					String sourceNodeId = source.getUniqueName();
+					String sourceNodeComponent = source.getComponent().getName();
 		 			for (INode jobStructureCatcher : jobCatcherNodes) {
 		 			%>
-			 		RunStat.StatBean talend_statebean = runStat.logStatOnConnection("<%=con.getUniqueName()%>"+iterateId,2, 0);
-			 		
-			 		<%=jobStructureCatcher.getUniqueName() %>.addConnectionMessage(
-					    "<%=sourceNodeId%>", 
-					    "<%=sourceNodeComponent%>", 
-					    false,
-					    "<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>",
-					    "<%=con.getUniqueName()%>",
-					    talend_statebean.getNbLine(),
-					    talend_statebean.getStartTime(),
-					    talend_statebean.getEndTime()
-					);
-					
-			 		<%=jobStructureCatcher.getUniqueName() %>.addConnectionMessage(
-					    "<%=node.getUniqueName()%>", 
-					    "<%=node.getComponent().getName()%>", 
-					    true,
-					    "input",
-					    "<%=con.getUniqueName()%>",
-					    talend_statebean.getNbLine(),
-					    talend_statebean.getStartTime(),
-					    talend_statebean.getEndTime()
-					);
-					<%=jobStructureCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
+				 		if(runStat.log(resourceMap,iterateId,"<%=con.getUniqueName()%>",2,0,
+				 			<%=jobStructureCatcher.getUniqueName()%>,"<%=sourceNodeId%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
+							<%=jobStructureCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
+						}
 					<%
 						break;
 					}
-					%>
-			 	}
+			  	}
+			  	%>
+			  	}
+			  	<%
 			}
-			<%}%>
-		<%
-	  	}
+		}
 	}
 }
 %>

main/plugins/org.talend.designer.codegen/jet_stub/component_part_header.javajet

@@ -146,83 +146,82 @@
 	boolean logstashCurrent = !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend") && enableLogStash;
 	
 	if ((codePart.equals(ECodePart.BEGIN))&&(stat || logstashCurrent)&&connSet.size()>0) {
-		for(IConnection con:connSet){
-		%>
-			if (<%if(stat){%>execStat<%}%><%if(stat && logstashCurrent){%> || <%}%><%if(logstashCurrent){%>enableLogStash<%}%>) {
-				if(resourceMap.get("inIterateVComp") == null){
-					<%if(containsTPartitioner){%>
-					    java.util.concurrent.ConcurrentHashMap<Object, Object> concurrentHashMap_<%=con.getUniqueName() %> = (java.util.concurrent.ConcurrentHashMap) globalMap.get("concurrentHashMap");
-						concurrentHashMap_<%=con.getUniqueName() %>.putIfAbsent("<%=con.getUniqueName() %>" + iterateLoop,new java.util.concurrent.atomic.AtomicInteger(0));
-						java.util.concurrent.atomic.AtomicInteger stats_<%=con.getUniqueName() %> = (java.util.concurrent.atomic.AtomicInteger) concurrentHashMap_<%=con.getUniqueName() %>.get("<%=con.getUniqueName() %>" + iterateLoop);
-						int step_<%=con.getUniqueName() %> = stats_<%=con.getUniqueName() %>.incrementAndGet()<=1?0:1;
-						<%if(stat) {%>
-						if(execStat) {
-							runStat.updateStatOnConnection("<%=con.getUniqueName() %>"+iterateId, step_<%=con.getUniqueName()%>, 0);
-						}
-						<%}%>
-						
-						<%if(logstashCurrent) {%>
-						if(enableLogStash) {
-							runStat.logStatOnConnection("<%=con.getUniqueName()%>"+iterateId, step_<%=con.getUniqueName()%>, 0);
-						}
-						<%}%>
-					<%}else{%>
-						<%if(stat) {%>
-						if(execStat) {
-							runStat.updateStatOnConnection("<%=con.getUniqueName() %>"+iterateId, 0, 0);
-						}
-						<%}%>
-						
-						<%if(logstashCurrent) {%>
-						if(enableLogStash) {
-							runStat.logStatOnConnection("<%=con.getUniqueName()%>"+iterateId, 0, 0);
-						}
-						<%}%>
-					<%}%>
+		if(containsTPartitioner) {
+			%>
+			if(<%if(stat){%>execStat<%}%><%if(stat && logstashCurrent){%> || <%}%><%if(logstashCurrent){%>enableLogStash<%}%>) {
+				runStat.updateStatOnConnectionAndLog(resourceMap,globalMap,iterateLoop,iterateId,<%if(stat){%>execStat<%} else {%>false<%}%>,enableLogStash,0<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+			}
+			<%
+		} else {
+			if(stat && logstashCurrent) {
+			%>
+			runStat.updateStatAndLog(execStat,enableLogStash,resourceMap,iterateId,0,0<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+			<%
+			} else {
+				if(stat) {
+				%>
+					if(execStat) {
+						runStat.updateStatOnConnection(resourceMap,iterateId,0,0<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+					}
+				<%
 				}
-			} 
-
-		<%
+				
+				if(logstashCurrent) {
+				%>
+					if(enableLogStash) {
+						runStat.log(resourceMap,iterateId,0,0<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+					}
+				<%
+				}
+			}
 		}
 	}
 	
 	if((codePart.equals(ECodePart.MAIN))&&(stat || logstashCurrent)&&connSet.size()>0){
-		for(IConnection con:connSet){
-		%>
-
-			//<%=con.getUniqueName()%>
-			//<%=(String)codeGenArgument.getIncomingName()%>
-
-
-			<%if (!node.getComponent().useMerge()) {%>
-				<%if(stat) {%>
-				if(execStat){
-					runStat.updateStatOnConnection("<%=con.getUniqueName() %>"+iterateId,1, 1);
-				}
-				<%}%>
-				
-				<%if(logstashCurrent) {%>
-				if(enableLogStash) {
-					runStat.logStatOnConnection("<%=con.getUniqueName() %>"+iterateId,1, 1);
-				}
-				<%}%>
-			<%
-			} else if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){
+		if(!node.getComponent().useMerge()) {
+			if(stat && logstashCurrent) {
 			%>
-				<%if(stat) {%>
-				if(execStat){
-					runStat.updateStatOnConnection("<%=con.getUniqueName() %>"+iterateId,1, 1);
+			runStat.updateStatAndLog(execStat,enableLogStash,iterateId,1,1<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+			<%
+			} else {
+				if(stat) {
+					%>
+					if(execStat){
+						runStat.updateStatOnConnection(iterateId,1,1<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+					}
+					<%
 				}
-				<%}%>
 				
-				<%if(logstashCurrent) {%>
-				if(enableLogStash) {
-					runStat.logStatOnConnection("<%=con.getUniqueName() %>"+iterateId,1, 1);
+				if(logstashCurrent) {
+					%>
+					if(enableLogStash) {
+						runStat.log(iterateId,1,1<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+					}
+					<%
 				}
-				<%}%>
-			<%}%>
-
-		<%
+			}
+		} else {
+			for(IConnection connection:connSet){
+				if(connection.getUniqueName().equals((String)codeGenArgument.getIncomingName())){
+					if(stat && logstashCurrent) {
+					%>
+					runStat.updateStatAndLog(execStat,enableLogStash,iterateId,1,1<%for(IConnection con : connSet){if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>,"<%=con.getUniqueName()%>"<%}}%>);
+					<%
+					} else {
+						if(stat) {%>
+						if(execStat){
+							runStat.updateStatOnConnection(iterateId,1,1<%for(IConnection con : connSet){if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>,"<%=con.getUniqueName()%>"<%}}%>);
+						}
+						<%}
+						
+						if(logstashCurrent) {%>
+						if(enableLogStash) {
+							runStat.log(iterateId,1,1<%for(IConnection con : connSet){if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>,"<%=con.getUniqueName()%>"<%}}%>);
+						}
+						<%}
+					}
+				}
+			}
 		}
 	}
 	
@@ -251,7 +250,7 @@
 			for (INode jobStructureCatcher : jobCatcherNodes) {
 			%>
 			if(enableLogStash) {
-				<%=jobStructureCatcher.getUniqueName() %>.addComponentMessage("<%=node.getUniqueName()%>", "<%=node.getComponent().getName()%>");
+				<%=jobStructureCatcher.getUniqueName() %>.addCM("<%=node.getUniqueName()%>", "<%=node.getComponent().getName()%>");
 				<%=jobStructureCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 			}
 			<%
@@ -266,46 +265,37 @@
 				List<String> needToStartConnNames = new ArrayList<String>();
 				INode nextNode = node.getOutgoingConnections(EConnectionType.ITERATE).get(0).getTarget();
 				NodeUtil.fillConnectionsForStat(needToStartConnNames, nextNode);
+				if(needToStartConnNames.isEmpty()) {
+					//do nothing
+				} else if(containsTPartitioner){
 				%>
 				if(<%if(stat){%>execStat<%}%><%if(stat && logstashCurrent){%> || <%}%><%if(logstashCurrent){%>enableLogStash<%}%>){
-					<%
-					for(String connName : needToStartConnNames){
-					%>
-						<%if(containsTPartitioner){%>
-							java.util.concurrent.ConcurrentHashMap<Object, Object> concurrentHashMap_<%=connName%> = (java.util.concurrent.ConcurrentHashMap) globalMap.get("concurrentHashMap");
-							concurrentHashMap_<%=connName%>.putIfAbsent("<%=connName%>" + iterateLoop,new java.util.concurrent.atomic.AtomicInteger(0));
-							java.util.concurrent.atomic.AtomicInteger stats_<%=connName%> = (java.util.concurrent.atomic.AtomicInteger) concurrentHashMap_<%=connName%>.get("<%=connName%>" + iterateLoop);
-							
-							int step_<%=connName %> = stats_<%=connName%>.incrementAndGet()<=1?0:1;
-							<%if(stat) {%>
-							if(execStat) {
-								runStat.updateStatOnConnection("<%=connName%>"+iterateId, step_<%=connName%>, 0);
-							}
-							<%}%>
-							
-							<%if(logstashCurrent) {%>
-							if(enableLogStash) {
-								runStat.logStatOnConnection("<%=connName%>"+iterateId, step_<%=connName%>, 0);
-							}
-							<%}%>
-						<%}else{%>
-							<%if(stat) {%>
-							if(execStat) {
-								runStat.updateStatOnConnection("<%=connName%>"+iterateId, 0, 0);
-							}
-							<%}%>
-							
-							<%if(logstashCurrent) {%>
-							if(enableLogStash) {
-								runStat.logStatOnConnection("<%=connName%>"+iterateId, 0, 0);
-							}
-							<%}%>
-						<%}%>
-					<%	
-					}
-					%>
+					runStat.updateStatOnConnectionAndLog(globalMap,iterateLoop,iterateId,<%if(stat){%>execStat<%} else {%>false<%}%>,enableLogStash,0<%for(String connName : needToStartConnNames){%>,"<%=connName%>"<%}%>);
+				}
+				<%
+				} else {
+					if(stat && logstashCurrent) {
+					%>
+					runStat.updateStatAndLog(execStat,enableLogStash,iterateId,0,0<%for(String connName : needToStartConnNames){%>,"<%=connName%>"<%}%>);
+					<%
+					} else {
+						if(stat){
+						%>
+						if(execStat){
+							runStat.updateStatOnConnection(iterateId,0,0<%for(String connName : needToStartConnNames){%>,"<%=connName%>"<%}%>);
+						}
+						<%
+						}
+						%>
+						
+						<%if(logstashCurrent) {%>
+						if(enableLogStash){
+							runStat.log(iterateId,0,0<%for(String connName : needToStartConnNames){%>,"<%=connName%>"<%}%>);
+						}
+						<%
+						}
+					}
 				}
-			<%
 			}else if(codePart.equals(ECodePart.MAIN)){ 
 			%>
 				resourceMap.put("inIterateVComp", true);

main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet

@@ -445,6 +445,7 @@
                 lastStr = "";
             }
         }
+        enableLogStash = "true".equalsIgnoreCase(System.getProperty("monitoring"));
 
         <%if(isLog4jEnabled){%>
 	        if(!"".equals(log4jLevel)){
@@ -493,7 +494,11 @@
 				properties_<%=jobCatcherNode.getUniqueName()%>.setProperty("appender.file.maxsize", "52428800");
 				properties_<%=jobCatcherNode.getUniqueName()%>.setProperty("appender.file.maxbackup", "20");
 				properties_<%=jobCatcherNode.getUniqueName()%>.setProperty("host", "false");
-				
+
+				System.getProperties().stringPropertyNames().stream()
+					.filter(it -> it.startsWith("monitoring.audit.logger.properties."))
+					.forEach(key -> properties_<%=jobCatcherNode.getUniqueName()%>.setProperty(key.substring("monitoring.audit.logger.properties.".length()), System.getProperty(key)));
+
 				auditLogger_<%=jobCatcherNode.getUniqueName()%> = org.talend.job.audit.JobEventAuditLoggerFactory.createJobAuditLogger(properties_<%=jobCatcherNode.getUniqueName()%>);
 			}
 		<%
@@ -1509,12 +1514,10 @@ if (execStat) {
             }
         } else if (arg.startsWith("--log4jLevel=")) {
             log4jLevel = arg.substring(13);
-		} else if (arg.startsWith("--monitoring=")) {//for trunjob call
-			enableLogStash = "true".equalsIgnoreCase(arg.substring(13));
-		}
-		
-		if(!enableLogStash) {
-			enableLogStash = "true".equalsIgnoreCase(System.getProperty("monitoring"));
+		} else if (arg.startsWith("--monitoring") && arg.contains("=")) {//for trunjob call
+		    final int equal = arg.indexOf('=');
+			final String key = arg.substring("--".length(), equal);
+			System.setProperty(key, arg.substring(equal + 1));
 		}
     }
     

main/plugins/org.talend.designer.codegen/jet_stub/generic/component_main.javajet

@@ -69,145 +69,140 @@ if(hasInput){
 	    	}
 	   	}
    	}
-
+   	
    	boolean hasValidInput = inputConn!=null;
-
-   	IMetadataTable metadata = null;
-    List<IMetadataTable> metadatas = node.getMetadataList();
-    boolean haveValidNodeMetadata = ((metadatas != null) && (metadatas.size() > 0) && (metadata = metadatas.get(0)) != null);
-
-    if (hasValidInput && haveValidNodeMetadata) {
+    if (hasValidInput) {
         List<IMetadataColumn> input_columnList = inputConn.getMetadataTable().getListColumns();
+        if(input_columnList == null) {
+        	input_columnList = new ArrayList<IMetadataColumn>();
+        }
+        // add incoming (not present) columns to enforcer for this comps
+        if (cid.contains("tDataStewardship") || cid.contains("tMarkLogic")){
+            %>
+            boolean shouldCreateRuntimeSchemaForIncomingNode = false;
+            <%
+            for (int i = 0; i < input_columnList.size(); i++) {
+                if(!input_columnList.get(i).getTalendType().equals("id_Dynamic")) {
+                %>
+                    if (incomingEnforcer_<%=cid%>.getDesignSchema().getField("<%=input_columnList.get(i)%>") == null){
+                        incomingEnforcer_<%=cid%>.addIncomingNodeField("<%=input_columnList.get(i)%>", ((Object) <%=inputConn.getName()%>.<%=input_columnList.get(i)%>).getClass().getCanonicalName());
+                        shouldCreateRuntimeSchemaForIncomingNode = true;
+                    }
+                <%
+                }
+            }
+            %>
+            if (shouldCreateRuntimeSchemaForIncomingNode){
+                incomingEnforcer_<%=cid%>.createRuntimeSchema();
+            }
+            <%
+        }
+        // If there are dynamic columns in the schema, they need to be
+        // initialized into the runtime schema of the actual IndexedRecord
+        // provided to the component.
+
+        int dynamicPos = -1;
+        for (int i = 0; i < input_columnList.size(); i++) {
+            if (input_columnList.get(i).getTalendType().equals("id_Dynamic")) {
+                dynamicPos = i;
+                break;
+            }
+        }
+
+        if (dynamicPos != -1)  {
+            %>
+            if (!incomingEnforcer_<%=cid%>.areDynamicFieldsInitialized()) {
+                // Initialize the dynamic columns when they are first encountered.
+                for (routines.system.DynamicMetadata dm_<%=cid%> : <%=inputConn.getName()%>.<%=input_columnList.get(dynamicPos).getLabel()%>.metadatas) {
+                    incomingEnforcer_<%=cid%>.addDynamicField(
+                            dm_<%=cid%>.getName(),
+                            dm_<%=cid%>.getType(),
+                            dm_<%=cid%>.getLogicalType(),
+                            dm_<%=cid%>.getFormat(),
+                            dm_<%=cid%>.getDescription(),
+                            dm_<%=cid%>.isNullable());
+                }
+                incomingEnforcer_<%=cid%>.createRuntimeSchema();
+            }
+            <%
+        }
+
+        %>
+        incomingEnforcer_<%=cid%>.createNewRecord();
+        <%
+        for (int i = 0; i < input_columnList.size(); i++) { // column
+            IMetadataColumn column = input_columnList.get(i);
+            if (dynamicPos != i) {
+                %>
+                //skip the put action if the input column doesn't appear in component runtime schema
+                if (incomingEnforcer_<%=cid%>.getRuntimeSchema().getField("<%=input_columnList.get(i)%>") != null){
+                    incomingEnforcer_<%=cid%>.put("<%=column.getLabel()%>", <%=inputConn.getName()%>.<%=column.getLabel()%>);
+                }
+                <%
+            } else {
+                %>
+                for (int i = 0; i < <%=inputConn.getName()%>.<%=column.getLabel()%>.getColumnCount(); i++) {
+                    incomingEnforcer_<%=cid%>.put(<%=inputConn.getName()%>.<%=column.getLabel()%>.getColumnMetadata(i).getName(),
+                            <%=inputConn.getName()%>.<%=column.getLabel()%>.getColumnValue(i));
+                }
+                <%
+            }
+        } // column
+
+        // If necesary, generate the code to handle outgoing connections.
+        // TODO: For now, this can only handle one outgoing record for
+        // each incoming record.  To handle multiple outgoing records, code
+        // generation needs to occur in component_begin in order to open
+        // a for() loop.
+
+        // There will be a ClassCastException if the output component does
+        // not implement WriterWithFeedback, but permits outgoing
+        // connections.
         
-        if (input_columnList!=null && !input_columnList.isEmpty()) {
-            // add incoming (not present) columns to enforcer for this comps
-            if (cid.contains("tDataStewardship") || cid.contains("tMarkLogic")){
-                %>
-                boolean shouldCreateRuntimeSchemaForIncomingNode = false;
-                <%
-                for (int i = 0; i < input_columnList.size(); i++) {
-                    if(!input_columnList.get(i).getTalendType().equals("id_Dynamic")) {
-                    %>
-                        if (incomingEnforcer_<%=cid%>.getDesignSchema().getField("<%=input_columnList.get(i)%>") == null){
-                            incomingEnforcer_<%=cid%>.addIncomingNodeField("<%=input_columnList.get(i)%>", ((Object) <%=inputConn.getName()%>.<%=input_columnList.get(i)%>).getClass().getCanonicalName());
-                            shouldCreateRuntimeSchemaForIncomingNode = true;
-                        }
-                    <%
-                    }
-                }
-                %>
-                if (shouldCreateRuntimeSchemaForIncomingNode){
-                    incomingEnforcer_<%=cid%>.createRuntimeSchema();
-                }
-                <%
-            }
-            // If there are dynamic columns in the schema, they need to be
-            // initialized into the runtime schema of the actual IndexedRecord
-            // provided to the component.
-
-            int dynamicPos = -1;
-	        for (int i = 0; i < input_columnList.size(); i++) {
-	            if (input_columnList.get(i).getTalendType().equals("id_Dynamic")) {
-	                dynamicPos = i;
-	                break;
-	            }
-	        }
-
-            if (dynamicPos != -1)  {
-                %>
-                if (!incomingEnforcer_<%=cid%>.areDynamicFieldsInitialized()) {
-                    // Initialize the dynamic columns when they are first encountered.
-                    for (routines.system.DynamicMetadata dm_<%=cid%> : <%=inputConn.getName()%>.<%=input_columnList.get(dynamicPos).getLabel()%>.metadatas) {
-                        incomingEnforcer_<%=cid%>.addDynamicField(
-                                dm_<%=cid%>.getName(),
-                                dm_<%=cid%>.getType(),
-                                dm_<%=cid%>.getLogicalType(),
-                                dm_<%=cid%>.getFormat(),
-                                dm_<%=cid%>.getDescription(),
-                                dm_<%=cid%>.isNullable());
-                    }
-                    incomingEnforcer_<%=cid%>.createRuntimeSchema();
-                }
-                <%
-            }
-
-            %>
-            incomingEnforcer_<%=cid%>.createNewRecord();
-            <%
-            for (int i = 0; i < input_columnList.size(); i++) { // column
-                IMetadataColumn column = input_columnList.get(i);
-                if (dynamicPos != i) {
-                    %>
-                    //skip the put action if the input column doesn't appear in component runtime schema
-                    if (incomingEnforcer_<%=cid%>.getRuntimeSchema().getField("<%=input_columnList.get(i)%>") != null){
-                        incomingEnforcer_<%=cid%>.put("<%=column.getLabel()%>", <%=inputConn.getName()%>.<%=column.getLabel()%>);
-                    }
-                    <%
-                } else {
-                    %>
-                    for (int i = 0; i < <%=inputConn.getName()%>.<%=column.getLabel()%>.getColumnCount(); i++) {
-                        incomingEnforcer_<%=cid%>.put(<%=inputConn.getName()%>.<%=column.getLabel()%>.getColumnMetadata(i).getName(),
-                                <%=inputConn.getName()%>.<%=column.getLabel()%>.getColumnValue(i));
-                    }
-                    <%
-                }
-            } // column
-
-            // If necesary, generate the code to handle outgoing connections.
-            // TODO: For now, this can only handle one outgoing record for
-            // each incoming record.  To handle multiple outgoing records, code
-            // generation needs to occur in component_begin in order to open
-            // a for() loop.
-
-            // There will be a ClassCastException if the output component does
-            // not implement WriterWithFeedback, but permits outgoing
-            // connections.
-            
-            ComponentProperties componentProps = node.getComponentProperties();
-			ProcessPropertiesGenerator generator = new ProcessPropertiesGenerator(cid, component);
-            List<Component.CodegenPropInfo> propsToProcess = component.getCodegenPropInfos(componentProps);
-            for (Component.CodegenPropInfo propInfo : propsToProcess) { // propInfo
-    			List<NamedThing> properties = propInfo.props.getProperties();
-    			for (NamedThing prop : properties) { // property
-        			if (prop instanceof Property) { // if, only deal with valued Properties
-            			Property property = (Property)prop;
-            			if (property.getFlags() != null && (property.getFlags().contains(Property.Flags.DESIGN_TIME_ONLY) || property.getFlags().contains(Property.Flags.HIDDEN)))
- 		                	continue;
-            			if(property.getTaggedValue(IGenericConstants.DYNAMIC_PROPERTY_VALUE)!=null && Boolean.valueOf(String.valueOf(property.getTaggedValue(IGenericConstants.DYNAMIC_PROPERTY_VALUE)))) {
-            				generator.setPropertyValues(property, propInfo, null, false, false);
-            			}
+        ComponentProperties componentProps = node.getComponentProperties();
+		ProcessPropertiesGenerator generator = new ProcessPropertiesGenerator(cid, component);
+        List<Component.CodegenPropInfo> propsToProcess = component.getCodegenPropInfos(componentProps);
+        for (Component.CodegenPropInfo propInfo : propsToProcess) { // propInfo
+			List<NamedThing> properties = propInfo.props.getProperties();
+			for (NamedThing prop : properties) { // property
+    			if (prop instanceof Property) { // if, only deal with valued Properties
+        			Property property = (Property)prop;
+        			if (property.getFlags() != null && (property.getFlags().contains(Property.Flags.DESIGN_TIME_ONLY) || property.getFlags().contains(Property.Flags.HIDDEN)))
+	                	continue;
+        			if(property.getTaggedValue(IGenericConstants.DYNAMIC_PROPERTY_VALUE)!=null && Boolean.valueOf(String.valueOf(property.getTaggedValue(IGenericConstants.DYNAMIC_PROPERTY_VALUE)))) {
+        				generator.setPropertyValues(property, propInfo, null, false, false);
         			}
-    			} // property
-			} // propInfo
-            
-            %>
-            org.apache.avro.generic.IndexedRecord data_<%=cid%> = incomingEnforcer_<%=cid%>.getCurrentRecord();
-            
-            <%
-            boolean isParallelize ="true".equalsIgnoreCase(ElementParameterParser.getValue(node, "__PARALLELIZE__"));
-            if (isParallelize) {
-            	String sourceComponentId = inputConn.getSource().getUniqueName();
-            	if(sourceComponentId!=null && sourceComponentId.contains("tAsyncIn")) {
-            	%>
-            	globalMap.put(buffersSizeKey_<%=cid%>, buffersSize_<%=sourceComponentId%>);
-            	<%
-            	}
-            }
-            %>
+    			}
+			} // property
+		} // propInfo
+        
+        %>
+        org.apache.avro.generic.IndexedRecord data_<%=cid%> = incomingEnforcer_<%=cid%>.getCurrentRecord();
+        
+        <%
+        boolean isParallelize ="true".equalsIgnoreCase(ElementParameterParser.getValue(node, "__PARALLELIZE__"));
+        if (isParallelize) {
+        	String sourceComponentId = inputConn.getSource().getUniqueName();
+        	if(sourceComponentId!=null && sourceComponentId.contains("tAsyncIn")) {
+        	%>
+        	globalMap.put(buffersSizeKey_<%=cid%>, buffersSize_<%=sourceComponentId%>);
+        	<%
+        	}
+        }
+        %>
 
-            writer_<%=cid%>.write(data_<%=cid%>);
-            
-            nb_line_<%=cid %>++;
-            <%if(hasMainOutput){
-                %>
-            	if(!(writer_<%=cid%> instanceof org.talend.components.api.component.runtime.WriterWithFeedback)) {
-              		// For no feedback writer,just pass the input record to the output
-              		if (data_<%=cid%>!=null) {
-              			outgoingMainRecordsList_<%=cid%> = java.util.Arrays.asList(data_<%=cid%>);
-                  	}
-                    }
-            <%
-            }
+        writer_<%=cid%>.write(data_<%=cid%>);
+        
+        nb_line_<%=cid %>++;
+        <%if(hasMainOutput){
+            %>
+        	if(!(writer_<%=cid%> instanceof org.talend.components.api.component.runtime.WriterWithFeedback)) {
+          		// For no feedback writer,just pass the input record to the output
+          		if (data_<%=cid%>!=null) {
+          			outgoingMainRecordsList_<%=cid%> = java.util.Arrays.asList(data_<%=cid%>);
+              	}
+                }
+        <%
         }
     }
 } // canStart

main/plugins/org.talend.designer.codegen/jet_stub/header.javajet

@@ -139,7 +139,7 @@ for (INode node : process.getNodesOfType("tRESTClient")) {
 }
 
 boolean talendEsbJobFactory = actAsProvider || !process.getNodesOfType("tRouteInput").isEmpty();
-boolean talendEsbJob = talendEsbJobFactory || actAsConsumer || ProcessorUtilities.isEsbJob(process.getId(), process.getVersion());
+boolean talendEsbJob = talendEsbJobFactory || actAsConsumer || ProcessorUtilities.isEsbJob(process);
 
 boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));
 

main/plugins/org.talend.designer.codegen/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen</artifactId>

main/plugins/org.talend.designer.components.exchange/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange</artifactId>

main/plugins/org.talend.designer.components.libs/libs_src/commons-net-ftps-proxy/pom.xml

@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.talend.libraries</groupId>
+    <groupId>org.talend.components.lib</groupId>
     <artifactId>commons-net-ftps-proxy</artifactId>
-    <version>3.6.1-talend-20190128</version>
+    <version>3.6.1-talend-20190819</version>
 
     <name>commons-net-talend</name>
 

main/plugins/org.talend.designer.components.libs/libs_src/commons-net-ftps-proxy/src/main/java/org/talend/ftp/SSLSessionReuseFTPSClient.java

@@ -3,6 +3,7 @@ package org.talend.ftp;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.net.Socket;
+import java.net.InetAddress;
 import java.util.Locale;
 
 import javax.net.ssl.SSLContext;
@@ -29,11 +30,13 @@ public class SSLSessionReuseFTPSClient extends FTPSClient {
                 final Object cache = sessionHostPortCache.get(context);
                 final Method putMethod = cache.getClass().getDeclaredMethod("put", Object.class, Object.class);
                 putMethod.setAccessible(true);
-                final Method getHostMethod = socket.getClass().getDeclaredMethod("getHost");
-                getHostMethod.setAccessible(true);
-                Object host = getHostMethod.invoke(socket);
-                final String key =
-                        String.format("%s:%s", host, String.valueOf(socket.getPort())).toLowerCase(Locale.ROOT);
+                InetAddress address = socket.getInetAddress();
+                int port = socket.getPort();
+                
+                String key = String.format("%s:%s", address.getHostName(), String.valueOf(port)).toLowerCase(Locale.ROOT);
+                putMethod.invoke(cache, key, session);
+                
+                key = String.format("%s:%s", address.getHostAddress(), String.valueOf(port)).toLowerCase(Locale.ROOT);
                 putMethod.invoke(cache, key, session);
             } catch (Exception e) {
                 e.printStackTrace();

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/pom.xml

@@ -7,7 +7,7 @@
    <groupId>net.sf.json-lib</groupId>
    <artifactId>json-lib</artifactId>
    <packaging>jar</packaging>
-   <version>2.4.1-talend</version>
+   <version>2.4.2-talend</version>
    <name>json-lib</name>
 
 	<properties>

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/src/main/java/net/sf/json/util/JSONTokener.java

@@ -15,6 +15,7 @@
  */
 package net.sf.json.util;
 
+import java.math.BigDecimal;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONException;
 import net.sf.json.JSONNull;
@@ -414,7 +415,7 @@ public class JSONTokener {
          }
 
          try{
-            return NumberUtils.createNumber(s);
+            return  createNumber(s);
          }catch( Exception e ){
             return s;
          }
@@ -435,6 +436,26 @@ public class JSONTokener {
       return s;
    }
 
+   /**
+    * This method has been added to fix https://jira.talendforge.org/browse/TDI-42689
+    *
+    * @param s The String representation of the number
+    * @return The Number instance
+    */
+   private Number createNumber(String s){
+      boolean isDecimal = s.indexOf('.') != -1;
+
+      if(isDecimal){
+         Double d = Double.valueOf(s);
+         if(Double.POSITIVE_INFINITY == Math.abs(d)){
+            return new BigDecimal(s);
+         }
+         return d;
+      }
+
+      return NumberUtils.createNumber(s);
+   }
+
    /**
     * Look at the next character in the source string.
     *

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/src/main/java/net/sf/json/util/JSONUtils.java

@@ -184,14 +184,12 @@ public final class JSONUtils {
             return Integer.class;
          }else if( isLong( n ) ){
             return Long.class;
-         }else if( isFloat( n ) ){
-            return Float.class;
          }else if( isBigInteger( n ) ){
             return BigInteger.class;
-         }else if( isBigDecimal( n ) ){
-            return BigDecimal.class;
          }else if( isDouble( n ) ){
             return Double.class;
+         }else if( isBigDecimal( n ) ){
+            return BigDecimal.class;
          }else{
             throw new JSONException( "Unsupported type" );
          }

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/src/test/java/net/sf/json/TestJSONObject.java

@@ -27,6 +27,7 @@ import net.sf.json.processors.PropertyNameProcessor;
 import net.sf.json.sample.BeanA;
 import net.sf.json.sample.BeanB;
 import net.sf.json.sample.BeanC;
+import net.sf.json.sample.BeanD;
 import net.sf.json.sample.BeanFoo;
 import net.sf.json.sample.BeanWithFunc;
 import net.sf.json.sample.ChildBean;
@@ -1042,6 +1043,17 @@ public class TestJSONObject extends TestCase {
             JSONArray.toArray( jsonObject.getJSONArray( "intarray" ) ) );
    }
 
+   public void testToBean_BeanD() {
+      String json = "{bool:true,integer:1,string:\"json\",doublearray:[4.2424245783E7, 123456789.2424245783E7, 6.0]}";
+      JSONObject jsonObject = JSONObject.fromObject( json );
+      BeanD bean = (BeanD) JSONObject.toBean( jsonObject, BeanD.class );
+      assertEquals( jsonObject.get( "bool" ), Boolean.valueOf( bean.isBool() ) );
+      assertEquals( jsonObject.get( "integer" ), new Integer( bean.getInteger() ) );
+      assertEquals( jsonObject.get( "string" ), bean.getString() );
+      Assertions.assertEquals( bean.getDoublearray(),
+              JSONArray.toArray( jsonObject.getJSONArray( "doublearray" ) ) );
+   }
+
    public void testToBean_ClassBean() {
       JSONObject json = new JSONObject();
       json.element( "klass", "java.lang.Object" );
@@ -1050,9 +1062,29 @@ public class TestJSONObject extends TestCase {
       assertEquals( Object.class, bean.getKlass() );
    }
 
-   public void testToBean_DynaBean__BigInteger_BigDecimal() {
+   public void testToBean_DynaBean__BigInteger_Double() {
       BigInteger l = new BigDecimal( "1.7976931348623157E308" ).toBigInteger();
       BigDecimal m = new BigDecimal( "1.7976931348623157E307" ).add( new BigDecimal( "0.0001" ) );
+      JSONObject json = new JSONObject().element( "i", BigInteger.ZERO )
+              .element( "d", MorphUtils.BIGDECIMAL_ONE )
+              .element( "bi", l )
+              .element( "bd", m );
+      Object bean = JSONObject.toBean( json );
+      Object i = ((MorphDynaBean) bean).get( "i" );
+      Object d = ((MorphDynaBean) bean).get( "d" );
+      assertTrue( i instanceof Integer );
+      assertTrue( d instanceof Integer );
+
+      Object bi = ((MorphDynaBean) bean).get( "bi" );
+      Object bd = ((MorphDynaBean) bean).get( "bd" );
+      assertTrue( bi instanceof BigInteger );
+      assertTrue( bd instanceof Double );
+   }
+
+
+   public void testToBean_DynaBean__BigInteger_BigDecimal() {
+      BigInteger l = new BigDecimal( "1.7976931348623157E308" ).toBigInteger();
+      BigDecimal m = new BigDecimal( "-1.7976931348623157E309" ).add( new BigDecimal( "0.0001" ) );
       JSONObject json = new JSONObject().element( "i", BigInteger.ZERO )
             .element( "d", MorphUtils.BIGDECIMAL_ONE )
             .element( "bi", l )

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/src/test/java/net/sf/json/sample/BeanD.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.sf.json.sample;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Andres Almiray <aalmiray@users.sourceforge.net>
+ */
+public class BeanD extends BeanA {
+   private Double[] doublearray = new Double[3];
+
+   public Double[] getDoublearray() {
+      return doublearray;
+   }
+
+   public void setDoublearray(Double[] doublearray) {
+      this.doublearray = doublearray;
+   }
+
+   public String toString() {
+      return ToStringBuilder.reflectionToString( this, ToStringStyle.MULTI_LINE_STYLE );
+   }
+}

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/src/test/java/net/sf/json/util/TestJSONBuilder.java

@@ -17,6 +17,7 @@
 package net.sf.json.util;
 
 import java.io.StringWriter;
+import java.math.BigDecimal;
 
 import junit.framework.TestCase;
 import net.sf.json.JSONFunction;
@@ -93,7 +94,7 @@ public class TestJSONBuilder extends TestCase {
             .endObject();
       JSONObject jsonObj = JSONObject.fromObject( w.toString() );
       assertEquals( Boolean.TRUE, jsonObj.get( "bool" ) );
-      assertEquals( new Double( 1.1d ), jsonObj.get( "numDouble" ) );
+      assertEquals( Double.valueOf( "1.1" ), jsonObj.get( "numDouble" ) );
       assertEquals( new Long( 2 ).longValue(), ((Number) jsonObj.get( "numInt" )).longValue() );
       assertEquals( "text", jsonObj.get( "text" ) );
       assertTrue( JSONUtils.isFunction( jsonObj.get( "func" ) ) );

main/plugins/org.talend.designer.components.libs/libs_src/json-lib-talend/src/test/java/net/sf/json/util/TestJSONStringer.java

@@ -20,6 +20,8 @@ import junit.framework.TestCase;
 import net.sf.json.JSONFunction;
 import net.sf.json.JSONObject;
 
+import java.math.BigDecimal;
+
 /**
  * @author Andres Almiray <aalmiray@users.sourceforge.net>
  */
@@ -85,7 +87,7 @@ public class TestJSONStringer extends TestCase {
             .endObject();
       JSONObject jsonObj = JSONObject.fromObject( b.toString() );
       assertEquals( Boolean.TRUE, jsonObj.get( "bool" ) );
-      assertEquals( new Double( 1.1d ), jsonObj.get( "numDouble" ) );
+      assertEquals( Double.valueOf( "1.1" ), jsonObj.get( "numDouble" ) );
       assertEquals( new Long( 2 ).longValue(), ((Number) jsonObj.get( "numInt" )).longValue() );
       assertEquals( "text", jsonObj.get( "text" ) );
       assertTrue( JSONUtils.isFunction( jsonObj.get( "func" ) ) );

main/plugins/org.talend.designer.components.libs/libs_src/simpleexcel/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.talend.libraries</groupId>
-  <artifactId>simpleexcel-2.1-20190507</artifactId>
+  <artifactId>simpleexcel-2.2-20190722</artifactId>
   <version>6.0.0</version>
   <packaging>jar</packaging>
 

main/plugins/org.talend.designer.components.libs/libs_src/simpleexcel/src/main/java/com/talend/excel/xssf/event/ExcelReader.java

@@ -12,17 +12,21 @@
 // ============================================================================
 package com.talend.excel.xssf.event;
 
+import org.apache.poi.ooxml.util.PackageHelper;
 import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.poifs.crypt.Decryptor;
+import org.apache.poi.poifs.crypt.EncryptionInfo;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.DataFormatter;
 import org.apache.poi.xssf.eventusermodel.ReadOnlySharedStringsTable;
 import org.apache.poi.xssf.eventusermodel.XSSFReader;
 import org.apache.poi.xssf.model.StylesTable;
-import org.apache.poi.ooxml.util.PackageHelper;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
+import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -32,7 +36,6 @@ import java.util.concurrent.FutureTask;
 
 /**
  * created by wwang on 2012-9-27 Detailled comment
- *
  */
 public class ExcelReader implements Callable {
 
@@ -46,6 +49,8 @@ public class ExcelReader implements Callable {
 
     private String charset = "UTF-8";
 
+    private String password = null;
+
     private java.io.InputStream is;
 
     private List<String> sheetNames = new ArrayList<String>();
@@ -64,15 +69,17 @@ public class ExcelReader implements Callable {
         task = new Thread(futureTask);
     }
 
-    public void parse(String fileURL, String charset) {
+    public void parse(String fileURL, String charset, String password) {
         this.fileURL = fileURL;
         this.charset = charset;
+        this.password = password;
         task.start();
     }
 
-    public void parse(java.io.InputStream is, String charset) {
+    public void parse(java.io.InputStream is, String charset, String password) {
         this.is = is;
         this.charset = charset;
+        this.password = password;
         task.start();
     }
 
@@ -120,11 +127,25 @@ public class ExcelReader implements Callable {
 
     public Object call() throws Exception {
         OPCPackage pkg = null;
+        POIFSFileSystem fs = null;
         try {
-            if (fileURL != null) {
-                pkg = OPCPackage.open(fileURL);
+            if (password != null) {
+                if (fileURL != null) {
+                    fs = new POIFSFileSystem(new File(fileURL));
+                } else {
+                    fs = new POIFSFileSystem(is);
+                }
+                Decryptor d = Decryptor.getInstance(new EncryptionInfo(fs));
+                if (!d.verifyPassword(password)) {
+                    throw new RuntimeException("Error: Cannot decrypt Excel file. Invalid password.");
+                }
+                pkg = OPCPackage.open(d.getDataStream(fs));
             } else {
-                pkg = PackageHelper.open(is);
+                if (fileURL != null) {
+                    pkg = OPCPackage.open(fileURL);
+                } else {
+                    pkg = PackageHelper.open(is);
+                }
             }
             XSSFReader r = new XSSFReader(pkg);
 
@@ -204,6 +225,9 @@ public class ExcelReader implements Callable {
             if (pkg != null) {
                 pkg.revert();
             }
+            if (fs != null) {
+                fs.close();
+            }
             cache.notifyErrorOccurred();
         }
         return null;

main/plugins/org.talend.designer.components.libs/libs_src/soap/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.talend.libraries</groupId>
 	<artifactId>talend-soap</artifactId>
-	<version>2.1-20190513</version>
+	<version>2.1-20190716</version>
 	<packaging>jar</packaging>
 	
 	<name>talend-soap</name>

main/plugins/org.talend.designer.components.libs/libs_src/soap/src/main/java/org/talend/soap/SOAPUtil.java

@@ -124,7 +124,9 @@ public class SOAPUtil {
         }
         SOAPMessage message = messageFactory.createMessage();
         MimeHeaders mimeHeaders = message.getMimeHeaders();
-        mimeHeaders.setHeader("SOAPAction", soapAction);
+
+        setSoapAction(version, soapAction, mimeHeaders);
+
         if (basicAuth) {
             addBasicAuthHeader(mimeHeaders, username, password);
         }
@@ -263,8 +265,8 @@ public class SOAPUtil {
     	}
     	SOAPMessage message = messageFactory.createMessage();
     	MimeHeaders mimeHeaders = message.getMimeHeaders();
-    	mimeHeaders.setHeader("SOAPAction", soapAction);
-    	SOAPPart soapPart = message.getSOAPPart();
+        setSoapAction(version, soapAction, mimeHeaders);
+        SOAPPart soapPart = message.getSOAPPart();
     	
     	String encoding = getEncoding(soapMessage);
     	
@@ -291,8 +293,20 @@ public class SOAPUtil {
 			return null;
 		}
     }
-	
-	private String getEncoding(String text) {
+
+    /* https://jira.talendforge.org/browse/TDI-42581 skip add SOAPAction directly to header v1.2 */
+    private void setSoapAction(String version, String soapAction, MimeHeaders mimeHeaders) {
+        if (SOAP12.equals(version)) {
+            // in soap version 1.2 param 'action' optional and should not be empty
+            if( soapAction != null && !soapAction.trim().isEmpty()) {
+                mimeHeaders.setHeader("Content-Type", "application/soap+xml; charset=utf-8; action=\"" + soapAction + "\"");
+            }
+        } else {
+            mimeHeaders.setHeader("SOAPAction", soapAction);
+        }
+    }
+
+    private String getEncoding(String text) {
         String result = Charset.defaultCharset().name();
 
         if(text == null) {

main/plugins/org.talend.designer.components.libs/libs_src/talend-codegen-utils/pom.xml

@@ -7,7 +7,7 @@
 	<groupId>org.talend.libraries</groupId>
 	<artifactId>talend-codegen-utils</artifactId>
 	<!-- release for revert version of library -->
-	<version>0.25.4</version>
+	<version>0.28.0</version>
 	<packaging>jar</packaging>
 	
 	<properties>

main/plugins/org.talend.designer.components.libs/libs_src/talend-codegen-utils/src/main/java/org/talend/codegen/converter/TypeConverter.java

@@ -51,6 +51,8 @@ public final class TypeConverter {
 
     public static final String LIST = "id_List";
 
+    public static final String OBJECT = "id_Object";
+
     private TypeConverter() {
         // Class provides static utility methods and shouldn't be instantiated
     }
@@ -167,6 +169,8 @@ public final class TypeConverter {
             return SHORT;
         case "java.util.Date":
             return DATE;
+        case "java.lang.Object":
+            return OBJECT;
         default:
             throw new UnsupportedOperationException("Unrecognized java class " + javaClass);
         }

main/plugins/org.talend.designer.components.libs/libs_src/talend-db-exasol-util/pom.xml

@@ -5,9 +5,9 @@
 >
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.talend.libraries</groupId>
+	<groupId>org.talend.components.lib</groupId>
 	<artifactId>talend-db-exasol</artifactId>
-	<version>2.1.2</version>
+	<version>2.1.4</version>
 	<packaging>jar</packaging>
 
 	<name>talend-db-exasol</name>

main/plugins/org.talend.designer.components.libs/libs_src/talend-db-exasol-util/src/main/java/org/talend/database/exasol/imp/EXABulkUtil.java

@@ -94,12 +94,11 @@ public class EXABulkUtil {
 	private String createNumberFormat(Integer length, Integer precision, boolean hasGroups) {
         if (length != null && length.intValue() > 0) {
             StringBuilder sb = new StringBuilder();
-            int numGroups = (length.intValue() / 3) + 1;
-            for (int i = 0; i < numGroups; i++) {
-                if (i > 0 && hasGroups) {
-                    sb.append("G");
-                    }
-                sb.append("999");
+            for (int i = length - 1; i >= 0; i--) {
+            	if(hasGroups && i < length - 1 && i > 0 && (i % 3 == 2)) {
+            		sb.append("G");
+            	}
+            	sb.append("9");
             }
             if (precision != null && precision.intValue() > 0) {
                 sb.append("D");

main/plugins/org.talend.designer.components.libs/libs_src/talendExcel/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.talend.libraries</groupId>
-	<artifactId>talendExcel-1.4-20190531</artifactId>
+	<artifactId>talendExcel-1.5-20190731</artifactId>
 	<version>6.0.0</version>
 	<packaging>jar</packaging>
 

main/plugins/org.talend.designer.components.libs/libs_src/talendExcel/src/main/java/org/talend/ExcelTool.java

@@ -3,6 +3,7 @@ package org.talend;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Date;
@@ -10,17 +11,23 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.poifs.crypt.EncryptionInfo;
+import org.apache.poi.poifs.crypt.EncryptionMode;
+import org.apache.poi.poifs.crypt.Encryptor;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.FormulaEvaluator;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.ss.usermodel.FormulaEvaluator;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbookType;
 
 public class ExcelTool {
 
@@ -70,6 +77,8 @@ public class ExcelTool {
 
     private boolean isTrackAllColumns = false;
 
+    private String password = null;
+
     public ExcelTool() {
         cellStylesMapping = new HashMap<>();
     }
@@ -110,21 +119,7 @@ public class ExcelTool {
                 initPreXlsx(fileName);
             }
             if (appendWorkbook) {
-                InputStream inp = new FileInputStream(fileName);
-                wb = WorkbookFactory.create(inp);
-                sheet = wb.getSheet(sheetName);
-                if (sheet != null) {
-                    if (appendSheet) {
-                        if (sheet.getLastRowNum() != 0 || sheet.getRow(0) != null) {
-                            curY = sheet.getLastRowNum() + 1;
-                        }
-                    } else {
-                        wb.removeSheetAt(wb.getSheetIndex(sheetName));
-                        sheet = wb.createSheet(sheetName);
-                    }
-                } else {
-                    sheet = wb.createSheet(sheetName);
-                }
+                appendActionForFile(fileName);
             } else {
                 xlsxFile.delete();
                 wb = new SXSSFWorkbook(rowAccessWindowSize);
@@ -140,6 +135,47 @@ public class ExcelTool {
         }
     }
 
+    public void prepareXlsmFile(String fileName) throws Exception {
+        File xlsmFile = new File(fileName);
+        if (xlsmFile.exists()) {
+            if (isAbsY && keepCellFormat) {
+                initPreXlsx(fileName);
+            }
+            if (appendWorkbook) {
+                appendActionForFile(fileName);
+            } else {
+                xlsmFile.delete();
+                wb = new SXSSFWorkbook(new XSSFWorkbook(XSSFWorkbookType.XLSM), rowAccessWindowSize);
+                sheet = wb.createSheet(sheetName);
+            }
+        } else {
+            wb = new SXSSFWorkbook(new XSSFWorkbook(XSSFWorkbookType.XLSM), rowAccessWindowSize);
+            sheet = wb.createSheet(sheetName);
+        }
+        if (isAbsY) {
+            startX = absX;
+            curY = absY;
+        }
+    }
+
+    private void appendActionForFile(String fileName) throws IOException {
+        InputStream inp = new FileInputStream(fileName);
+        wb = WorkbookFactory.create(inp);
+        sheet = wb.getSheet(sheetName);
+        if (sheet != null) {
+            if (appendSheet) {
+                if (sheet.getLastRowNum() != 0 || sheet.getRow(0) != null) {
+                    curY = sheet.getLastRowNum() + 1;
+                }
+            } else {
+                wb.removeSheetAt(wb.getSheetIndex(sheetName));
+                sheet = wb.createSheet(sheetName);
+            }
+        } else {
+            sheet = wb.createSheet(sheetName);
+        }
+    }
+
     /**
      *
      * @return start insert row index.
@@ -302,13 +338,14 @@ public class ExcelTool {
     }
 
     public void writeExcel(OutputStream outputStream) throws Exception {
-    	try {
-    		wb.write(outputStream);
-    	} finally {
-    		if(outputStream != null) {
-    			outputStream.close();
-    		}
-    	}
+        try {
+            wb.write(outputStream);
+            wb.close();
+        } finally {
+            if (outputStream != null) {
+                outputStream.close();
+            }
+        }
     }
 
     public void writeExcel(String fileName, boolean createDir) throws Exception {
@@ -319,14 +356,29 @@ public class ExcelTool {
                 pFile.mkdirs();
             }
         }
-        FileOutputStream fileOutput = new FileOutputStream(fileName);
         if (appendWorkbook && appendSheet && recalculateFormula) {
             evaluateFormulaCell();
         }
+        FileOutputStream fileOutput = new FileOutputStream(fileName);
+        POIFSFileSystem fs = null;
         try {
-        	wb.write(fileOutput);
+            if (password == null) {
+                wb.write(fileOutput);
+            } else {
+                fs = new POIFSFileSystem();
+                Encryptor encryptor = new EncryptionInfo(EncryptionMode.agile).getEncryptor();
+                encryptor.confirmPassword(password);
+                OutputStream encryptedDataStream = encryptor.getDataStream(fs);
+                wb.write(encryptedDataStream);
+                encryptedDataStream.close(); // this is mandatory to do that at that point
+                fs.writeFilesystem(fileOutput);
+            }
         } finally {
-        	fileOutput.close();
+            wb.close();
+            fileOutput.close();
+            if (fs != null) {
+                fs.close();
+            }
         }
     }
 
@@ -349,4 +401,9 @@ public class ExcelTool {
             ((SXSSFSheet) sheet).flushRows();
         }
     }
+
+    public void setPasswordProtection(String password) {
+        this.password = password;
+    }
+
 }

main/plugins/org.talend.designer.components.libs/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
+    <version>7.3.1-M1</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.libs</artifactId>

main/plugins/org.talend.designer.components.localprovider/components/tAmazonRedshiftManage/tAmazonRedshiftManage_java.xml

@@ -7,6 +7,7 @@
 
   <FAMILIES>
 		<FAMILY>Databases/DB Specifics/Amazon/Redshift</FAMILY>
+		<FAMILY>Cloud/Amazon/Redshift</FAMILY>
   </FAMILIES>
 
 	<DOCUMENTATION>

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_begin.javajet

@@ -24,13 +24,15 @@
 	String dataset = ElementParameterParser.getValue(node, "__DATASET__");
 	String table = ElementParameterParser.getValue(node, "__TABLE__");
 	String gsFile = ElementParameterParser.getValue(node, "__GS_FILE__");
+	boolean setFieldDelimiter = ElementParameterParser.getBooleanValue(node, "__SET_FIELD_DELIMITER__");
 	String fieldDelimiter = ElementParameterParser.getValue(node, "__FIELD_DELIMITER__");
 	String actionOnData = ElementParameterParser.getValue(node, "__ACTION_ON_DATA__");
-	boolean dieOnError = "true".equals(ElementParameterParser.getValue(node, "__DIE_ON_ERROR__"));
-
+	boolean dieOnError = ElementParameterParser.getBooleanValue(node, "__DIE_ON_ERROR__");
+	boolean createTableIfNotExist = ElementParameterParser.getBooleanValue(node, "__CREATE_TABLE_IF_NOT_EXIST__");
+	String gsFileHeader = ElementParameterParser.getValue(node, "__GS_FILE_HEADER__");
     String tokenFile = ElementParameterParser.getValue(node,"__TOKEN_NAME__");
-	
-	boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
+	boolean isLog4jEnabled = ElementParameterParser.getBooleanValue(node.getProcess(), "__LOG4J_ACTIVATE__");
+	boolean dropTable = ElementParameterParser.getBooleanValue(node, "__DROP__");
 	
 	String passwordFieldName = "";
 	
@@ -201,7 +203,7 @@
 	} else {
 		throw new IllegalArgumentException("authentication mode should be either \"SERVICEACCOUNT\" or \"OAUTH\", but it is " + authMode);
 	}
-	boolean bulkFileAlreadyExists = "true".equals(ElementParameterParser.getValue(node, "__BULK_FILE_ALREADY_EXIST__"));
+	boolean bulkFileAlreadyExists = ElementParameterParser.getBooleanValue(node, "__BULK_FILE_ALREADY_EXIST__");
 	String accessKey = ElementParameterParser.getValue(node, "__GS_ACCESS_KEY__");
 	String secretKey = ElementParameterParser.getValue(node, "__GS_SECRET_KEY__");
 	String localFilename = ElementParameterParser.getValue(node, "__GS_LOCAL_FILE__");
@@ -234,6 +236,7 @@
 		}
 		%>
 		gsService_<%=cid%>.putObject(<%=bucketName%>, fileObject_<%=cid%>);
+		/* ----END-UPLOADING-FILE---- */
 		<%
 		if(isLog4jEnabled){
 		%>
@@ -242,7 +245,6 @@
 		}
 	}
 	%>
-	/* ----END-UPLOADING-FILE---- */
 
 	<%
     if (authMode.equals("OAUTH")) {
@@ -258,95 +260,131 @@
 	
 		com.google.api.services.bigquery.model.JobConfiguration config_<%=cid%> = new com.google.api.services.bigquery.model.JobConfiguration();
 		com.google.api.services.bigquery.model.JobConfigurationLoad queryLoad_<%=cid%> = new com.google.api.services.bigquery.model.JobConfigurationLoad();
-		com.google.api.services.bigquery.model.TableSchema schema_<%=cid%> = new com.google.api.services.bigquery.model.TableSchema();
-	
-		<%
-		if(isLog4jEnabled){
-		%>
-			log.info("<%=cid%> - Table field schema:");
-		<%
-		}
-		%>
-		java.util.List<com.google.api.services.bigquery.model.TableFieldSchema> fields_<%=cid%> = new java.util.ArrayList<com.google.api.services.bigquery.model.TableFieldSchema>();
-		<%
-		List<IMetadataTable> metadatas = node.getMetadataList();
-		if ((metadatas!=null) && (metadatas.size() > 0)) {
-			IMetadataTable metadata = metadatas.get(0);
-			if (metadata != null) {
-				List<IMetadataColumn> columns = metadata.getListColumns();
-				int nbColumns = columns.size();
-				for (int i = 0; i < nbColumns; i++ ) {
-					IMetadataColumn column = columns.get(i);
-					String columnName = column.getLabel();
-					String typeToGenerate = "string";
-					if("id_Float".equals(column.getTalendType()) || "id_Double".equals(column.getTalendType())) {
-						typeToGenerate = "float";
-					}else if("id_Integer".equals(column.getTalendType()) || "id_Long".equals(column.getTalendType()) || "id_Short".equals(column.getTalendType())) {
-						typeToGenerate = "integer";
-					} else if("id_Character".equals(column.getTalendType())) {
-						typeToGenerate = "string";
-					} else if("id_BigDecimal".equals(column.getTalendType())) {
-						typeToGenerate = "numeric";					
-					} else if("id_Boolean".equals(column.getTalendType())) {
-						typeToGenerate = "boolean";
-					} else if("id_Date".equals(column.getTalendType())) {
-						String pattern = column.getPattern();
-					    if(pattern.length() == 12 || pattern.isEmpty() || "\"\"".equals(pattern)) {
-					        typeToGenerate = "date";
-					    }else if(pattern.length() > 12){
-					        typeToGenerate = "timestamp";
-					    }else{
-					        typeToGenerate = "string";
-					    }
+		
+		<%if (dropTable) {%>
+			try {
+				bigqueryclient_<%=cid%>.tables().delete(PROJECT_ID_<%=cid%>, <%=dataset%>, <%=table%>).execute();
+			} catch (com.google.api.client.googleapis.json.GoogleJsonResponseException e_<%=cid%>) {
+				if (e_<%=cid%>.getDetails().getCode() != 404) {
+					<%
+					if(dieOnError) {
+					%>
+						throw e_<%=cid%>;
+					<%
+					} else {
+						if(isLog4jEnabled){
+						%>
+							log.error("<%=cid%> - "+ e_<%=cid%>.getDetails().getMessage());
+						<%
+						}
+						%>
+						System.err.println(e_<%=cid%>.getDetails().getMessage());
+					<%
 					}
 					%>
-					<%
-						String modeType = null;
-						if (!column.isNullable()) { 
-							modeType = "REQUIRED";
-						} else {
-							modeType = "NULLABLE";
-						}
-					%>
-					com.google.api.services.bigquery.model.TableFieldSchema <%=columnName%>_<%=cid%> = new com.google.api.services.bigquery.model.TableFieldSchema();
-					<%=columnName%>_<%=cid%>.setName("<%=columnName%>");
-					<%=columnName%>_<%=cid%>.setType("<%=typeToGenerate%>");
-					<%=columnName%>_<%=cid%>.setMode("<%=modeType%>");
-					fields_<%=cid%>.add(<%=columnName%>_<%=cid%>);		
+				}
+			}
+		<%}%>
+		
+		<%if (createTableIfNotExist) { %>
+			
+			try {
+				com.google.api.services.bigquery.model.Table getTable = bigqueryclient_<%=cid%>.tables().get(PROJECT_ID_<%=cid%>, <%=dataset%>, <%=table%>).execute();
+				queryLoad_<%=cid%>.setCreateDisposition("CREATE_NEVER");
+			} catch (com.google.api.client.googleapis.json.GoogleJsonResponseException e_<%=cid%>){
+				if (e_<%=cid%>.getDetails().getCode() == 404) {
+					com.google.api.services.bigquery.model.TableSchema schema_<%=cid%> = new com.google.api.services.bigquery.model.TableSchema();
 					<%
 					if(isLog4jEnabled){
 					%>
-						log.debug("<%=cid%> - Field index[<%=i%>] {\"name\":\"<%=columnName%>\",\"type\":\"<%=typeToGenerate%>\",\"mode\":\"<%=modeType%>\"}");
+						log.info("<%=cid%> - Table field schema:");
 					<%
 					}
+					%>
+					java.util.List<com.google.api.services.bigquery.model.TableFieldSchema> fields_<%=cid%> = new java.util.ArrayList<com.google.api.services.bigquery.model.TableFieldSchema>();
+					<%
+					List<IMetadataTable> metadatas = node.getMetadataList();
+					if ((metadatas!=null) && (metadatas.size() > 0)) {
+						IMetadataTable metadata = metadatas.get(0);
+						if (metadata != null) {
+							List<IMetadataColumn> columns = metadata.getListColumns();
+							int nbColumns = columns.size();
+							for (int i = 0; i < nbColumns; i++ ) {
+								IMetadataColumn column = columns.get(i);
+								String columnName = column.getLabel();
+								String typeToGenerate = "string";
+								if("id_Float".equals(column.getTalendType()) || "id_Double".equals(column.getTalendType())) {
+									typeToGenerate = "float";
+								}else if("id_Integer".equals(column.getTalendType()) || "id_Long".equals(column.getTalendType()) || "id_Short".equals(column.getTalendType())) {
+									typeToGenerate = "integer";
+								} else if("id_Character".equals(column.getTalendType())) {
+									typeToGenerate = "string";
+								} else if("id_BigDecimal".equals(column.getTalendType())) {
+									typeToGenerate = "numeric";
+								} else if("id_Boolean".equals(column.getTalendType())) {
+									typeToGenerate = "boolean";
+								} else if("id_Date".equals(column.getTalendType())) {
+									String pattern = column.getPattern();
+								    if(pattern.length() == 12 || pattern.isEmpty() || "\"\"".equals(pattern)) {
+								        typeToGenerate = "date";
+								    }else if(pattern.length() > 12){
+								        typeToGenerate = "timestamp";
+								    }else{
+								        typeToGenerate = "string";
+								    }
+								}
+								String modeType = (!column.isNullable()) ? "REQUIRED" : "NULLABLE";
+								%>
+								com.google.api.services.bigquery.model.TableFieldSchema <%=columnName%>_<%=cid%> = new com.google.api.services.bigquery.model.TableFieldSchema();
+								<%=columnName%>_<%=cid%>.setName("<%=columnName%>");
+								<%=columnName%>_<%=cid%>.setType("<%=typeToGenerate%>");
+								<%=columnName%>_<%=cid%>.setMode("<%=modeType%>");
+								fields_<%=cid%>.add(<%=columnName%>_<%=cid%>);
+								<%
+								if(isLog4jEnabled){
+								%>
+									log.debug("<%=cid%> - Field index[<%=i%>] {\"name\":\"<%=columnName%>\",\"type\":\"<%=typeToGenerate%>\",\"mode\":\"<%=modeType%>\"}");
+								<%
+								}
+							}
+						}
+					}
+					%>
+					schema_<%=cid%>.setFields(fields_<%=cid%>);
+					queryLoad_<%=cid%>.setSchema(schema_<%=cid%>);
+					queryLoad_<%=cid%>.setCreateDisposition("CREATE_IF_NEEDED");
+				} else {
+					<%
+					if(dieOnError) {
+					%>
+						throw e_<%=cid%>;
+					<%
+					} else {
+						if(isLog4jEnabled){
+						%>
+							log.error("<%=cid%> - "+ e_<%=cid%>.getDetails().getMessage());
+						<%
+						}
+						%>
+						System.err.println(e_<%=cid%>.getDetails().getMessage());
+					<%
+					}
+					%>
 				}
 			}
-		}
-		%>
-		
-	
-		schema_<%=cid%>.setFields(fields_<%=cid%>);
-	
-		queryLoad_<%=cid%>.setSchema(schema_<%=cid%>);
-		<%
-		if("true".equals(ElementParameterParser.getValue(node, "__CREATE_TABLE_IF_NOT_EXIST__"))) {
-		%>
-			queryLoad_<%=cid%>.setCreateDisposition("CREATE_IF_NEEDED");
 		<%
 		} else {
 		%>
 			queryLoad_<%=cid%>.setCreateDisposition("CREATE_NEVER");
 		<%
 		}
-	
-		if("true".equals(ElementParameterParser.getValue(node, "__SET_FIELD_DELIMITER__"))) {
+		if(setFieldDelimiter) {
 		%>
 			queryLoad_<%=cid%>.setFieldDelimiter(<%=fieldDelimiter%>);
 		<%
 		}
 		%>
 		queryLoad_<%=cid%>.setAllowQuotedNewlines(true);
-	
 		queryLoad_<%=cid%>.setWriteDisposition("WRITE_<%=actionOnData%>");
 		com.google.api.services.bigquery.model.TableReference destinationTable_<%=cid%> = new com.google.api.services.bigquery.model.TableReference();
 		destinationTable_<%=cid%>.setProjectId(PROJECT_ID_<%=cid%>);
@@ -354,8 +392,8 @@
 		destinationTable_<%=cid%>.setTableId(<%=table%>);
 	
 		queryLoad_<%=cid%>.setDestinationTable(destinationTable_<%=cid%>);
-		queryLoad_<%=cid%>.setSourceUris(java.util.Arrays.asList(<%=ElementParameterParser.getValue(node, "__GS_FILE__")%>));
-		queryLoad_<%=cid%>.setSkipLeadingRows(<%=ElementParameterParser.getValue(node, "__GS_FILE_HEADER__")%>);
+		queryLoad_<%=cid%>.setSourceUris(java.util.Arrays.asList(<%=gsFile%>));
+		queryLoad_<%=cid%>.setSkipLeadingRows(<%=gsFileHeader%>);
 		queryLoad_<%=cid%>.setNullMarker("\\N");
 		config_<%=cid%>.setLoad(queryLoad_<%=cid%>);
 		
@@ -459,9 +497,11 @@
 	%>
 		/* ----START-CREATING-JOB (Cloud API)---- */
 		com.google.cloud.bigquery.TableId tableId_<%=cid%> = com.google.cloud.bigquery.TableId.of(<%=projectId%>, <%=dataset%>, <%=table%>);
-		com.google.cloud.bigquery.Table table_<%=cid%> = bigquery_<%=cid%>.getTable(tableId_<%=cid%>);
 		com.google.cloud.bigquery.LoadJobConfiguration.Builder loadJobBuilder_<%=cid%> = com.google.cloud.bigquery.LoadJobConfiguration.newBuilder(tableId_<%=cid%>, <%=gsFile%>);
-		if (<%=ElementParameterParser.getBooleanValue(node, "__DROP__")%> && table_<%=cid%> != null) {
+		
+		boolean dropTable_<%=cid%> = <%=dropTable%>;
+
+		if (dropTable_<%=cid%> && bigquery_<%=cid%>.getTable(tableId_<%=cid%>) != null) {
 			boolean deleted = bigquery_<%=cid%>.delete(tableId_<%=cid%>);	
 			if (deleted) {
 				<%
@@ -475,123 +515,100 @@
 				throw new RuntimeException("Unable to delete table " + tableId_<%=cid%>);
 			}
 		}
-		if (<%=ElementParameterParser.getBooleanValue(node, "__DROP__")%> || <%=ElementParameterParser.getBooleanValue(node, "__CREATE_TABLE_IF_NOT_EXIST__")%>) {
-			java.util.List<com.google.cloud.bigquery.Field> fields_<%=cid%> = new java.util.ArrayList<>();
-			<%
-			List<IMetadataTable> metadatas = node.getMetadataList();
-			if ((metadatas!=null) && (metadatas.size() > 0)) {
-				IMetadataTable metadata = metadatas.get(0);
-				if (metadata != null) {
-					List<IMetadataColumn> columns = metadata.getListColumns();
-					int nbColumns = columns.size();
-					for (int i = 0; i < nbColumns; i++ ) {
-						IMetadataColumn column = columns.get(i);
-						String columnName = column.getLabel();
-						String typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.STRING";
-						if("id_String".equals(column.getTalendType()) || "id_Character".equals(column.getTalendType())) {
-							typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.STRING";
-						} else if ("id_Float".equals(column.getTalendType()) || "id_Double".equals(column.getTalendType())) {
-							typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.FLOAT";
-						} else if ("id_Short".equals(column.getTalendType()) || "id_Integer".equals(column.getTalendType()) || "id_Long".equals(column.getTalendType())) {
-							typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.INTEGER";
-						} else if ("id_BigDecimal".equals(column.getTalendType())) {
-							typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.NUMERIC";						
-						} else if ("id_Boolean".equals(column.getTalendType())) {
-							typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.BOOLEAN";
-						} else if ("id_Date".equals(column.getTalendType())) {							
-							String pattern = column.getPattern();
-						    if(pattern.length() == 12 || pattern.isEmpty() || "\"\"".equals(pattern)) {
-						        typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.DATE";
-						    }else if(pattern.length() > 12){
-						        typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.TIMESTAMP";
-						    }else{
-						        typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.STRING";
-						    }
-						}
-						
-						String modeType = "NULLABLE";
-						if (!column.isNullable()) { 
-							modeType = "REQUIRED";
-						}
+
+		<%if(createTableIfNotExist){%>
+			if(bigquery_<%=cid%>.getTable(tableId_<%=cid%>) == null){
+				java.util.List<com.google.cloud.bigquery.Field> fields_<%=cid%> = new java.util.ArrayList<>();
+				<%
+				List<IMetadataTable> metadatas = node.getMetadataList();
+				if ((metadatas!=null) && (metadatas.size() > 0)) {
+					IMetadataTable metadata = metadatas.get(0);
+					if (metadata != null) {
+						List<IMetadataColumn> columns = metadata.getListColumns();
+						int nbColumns = columns.size();
+						for (int i = 0; i < nbColumns; i++ ) {
+							IMetadataColumn column = columns.get(i);
+							String columnName = column.getLabel();
+							String typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.STRING";
+							if("id_String".equals(column.getTalendType()) || "id_Character".equals(column.getTalendType())) {
+								typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.STRING";
+							} else if ("id_Float".equals(column.getTalendType()) || "id_Double".equals(column.getTalendType())) {
+								typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.FLOAT";
+							} else if ("id_Short".equals(column.getTalendType()) || "id_Integer".equals(column.getTalendType()) || "id_Long".equals(column.getTalendType())) {
+								typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.INTEGER";
+							} else if ("id_BigDecimal".equals(column.getTalendType())) {
+								typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.NUMERIC";						
+							} else if ("id_Boolean".equals(column.getTalendType())) {
+								typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.BOOLEAN";
+							} else if ("id_Date".equals(column.getTalendType())) {							
+								String pattern = column.getPattern();
+							    if(pattern.length() == 12 || pattern.isEmpty() || "\"\"".equals(pattern)) {
+							        typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.DATE";
+							    }else if(pattern.length() > 12){
+							        typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.TIMESTAMP";
+							    }else{
+							        typeToGenerate = "com.google.cloud.bigquery.LegacySQLTypeName.STRING";
+							    }
+							}
+							String modeType = (!column.isNullable()) ? "REQUIRED" : "NULLABLE";
 						%>
 						
 						com.google.cloud.bigquery.Field field_<%=i%> = com.google.cloud.bigquery.Field.newBuilder("<%=columnName%>", <%=typeToGenerate%>)
 																									  .setMode(com.google.cloud.bigquery.Field.Mode.valueOf("<%=modeType%>"))
 																									  .build();
 						fields_<%=cid%>.add(field_<%=i%>);		
-						<%
-						if(isLog4jEnabled){
-						%>
-							log.debug("<%=cid%> - Field index[<%=i%>] {\"name\":\"<%=columnName%>\",\"type\":\"<%=typeToGenerate%>\"}");
-						<%
+							<%
+							if(isLog4jEnabled){
+							%>
+								log.debug("<%=cid%> - Field index[<%=i%>] {\"name\":\"<%=columnName%>\",\"type\":\"<%=typeToGenerate%>\"}");
+							<%
+							}
 						}
 					}
 				}
-			}
-			%>
+				%>
 			
-			com.google.cloud.bigquery.Schema schema_<%=cid%> = com.google.cloud.bigquery.Schema.of(fields_<%=cid%>);
-			com.google.cloud.bigquery.TableInfo tableInfo_<%=cid%> = com.google.cloud.bigquery.TableInfo.newBuilder(tableId_<%=cid%>, com.google.cloud.bigquery.StandardTableDefinition.of(schema_<%=cid%>)).build();
-			table_<%=cid%> = bigquery_<%=cid%>.create(tableInfo_<%=cid%>);
-			loadJobBuilder_<%=cid%>.setSchema(schema_<%=cid%>);
-		}
-		
-			<%
-				if("true".equals(ElementParameterParser.getValue(node, "__CREATE_TABLE_IF_NOT_EXIST__"))) {
-			%>
+				com.google.cloud.bigquery.Schema schema_<%=cid%> = com.google.cloud.bigquery.Schema.of(fields_<%=cid%>);
+				com.google.cloud.bigquery.TableInfo tableInfo_<%=cid%> = com.google.cloud.bigquery.TableInfo.newBuilder(tableId_<%=cid%>, com.google.cloud.bigquery.StandardTableDefinition.of(schema_<%=cid%>)).build();
+				com.google.cloud.bigquery.Table table_<%=cid%> = bigquery_<%=cid%>.create(tableInfo_<%=cid%>);
+				loadJobBuilder_<%=cid%>.setSchema(schema_<%=cid%>);
 				loadJobBuilder_<%=cid%>.setCreateDisposition(com.google.cloud.bigquery.JobInfo.CreateDisposition.CREATE_IF_NEEDED);
-			<%
+       
 			} else {
-			%>
 				loadJobBuilder_<%=cid%>.setCreateDisposition(com.google.cloud.bigquery.JobInfo.CreateDisposition.CREATE_NEVER);
-			<%
 			}
-			%>
+		<%} else {%>
+				loadJobBuilder_<%=cid%>.setCreateDisposition(com.google.cloud.bigquery.JobInfo.CreateDisposition.CREATE_NEVER);
+		<%}%>
 			
-			<%
-			if("APPEND".equals(actionOnData)) {
-			%>
-				loadJobBuilder_<%=cid%>.setWriteDisposition(com.google.cloud.bigquery.JobInfo.WriteDisposition.WRITE_APPEND);
-			<%
-			} else if("TRUNCATE".equals(actionOnData)) {
-			%>
-				loadJobBuilder_<%=cid%>.setWriteDisposition(com.google.cloud.bigquery.JobInfo.WriteDisposition.WRITE_TRUNCATE);
-				
-			<%
-			}
-		 	else {
-			%>
-				loadJobBuilder_<%=cid%>.setWriteDisposition(com.google.cloud.bigquery.JobInfo.WriteDisposition.WRITE_EMPTY);				
-			<%
-			}
-			%>
-		
-		loadJobBuilder_<%=cid%>.setDestinationTable(tableId_<%=cid%>);
-                com.google.cloud.bigquery.CsvOptions.Builder csvOptions_<%=cid%> = com.google.cloud.bigquery.CsvOptions.newBuilder();
-		csvOptions_<%=cid%>.setAllowQuotedNewLines(true);
+			loadJobBuilder_<%=cid%>.setWriteDisposition(com.google.cloud.bigquery.JobInfo.WriteDisposition.WRITE_<%=actionOnData%>);	
+			loadJobBuilder_<%=cid%>.setDestinationTable(tableId_<%=cid%>);
+	        com.google.cloud.bigquery.CsvOptions.Builder csvOptions_<%=cid%> = com.google.cloud.bigquery.CsvOptions.newBuilder();
+			csvOptions_<%=cid%>.setAllowQuotedNewLines(true);
+			csvOptions_<%=cid%>.setSkipLeadingRows(<%=gsFileHeader%>);
 																				
-		<%if("true".equals(ElementParameterParser.getValue(node, "__SET_FIELD_DELIMITER__"))) {
-        %>
-         	loadJobBuilder_<%=cid%>.setFormatOptions(csvOptions_<%=cid%>.setFieldDelimiter(<%=fieldDelimiter%>).build());
-        <%
-        }
-        %>		
+			<%if(setFieldDelimiter) {
+	        %>
+	         	loadJobBuilder_<%=cid%>.setFormatOptions(csvOptions_<%=cid%>.setFieldDelimiter(<%=fieldDelimiter%>).build());
+	        <%
+	        }
+	        %>		
 		
-		loadJobBuilder_<%=cid%>.setNullMarker("\\N");																
-		com.google.cloud.bigquery.Job job_<%=cid%> = bigquery_<%=cid%>.create(com.google.cloud.bigquery.JobInfo.of(loadJobBuilder_<%=cid%>.build()));
-		job_<%=cid%> = job_<%=cid%>.waitFor(com.google.cloud.RetryOption.initialRetryDelay(org.threeten.bp.Duration.ofSeconds(1)));
-		if (job_<%=cid%> != null && job_<%=cid%>.getStatus().getError() == null) {
-			<%
-			if(isLog4jEnabled){
-			%>
-				log.info("<%=cid%> - Job execution status: " + job_<%=cid%>.getStatus());
-			<%
+			loadJobBuilder_<%=cid%>.setNullMarker("\\N");																
+			com.google.cloud.bigquery.Job job_<%=cid%> = bigquery_<%=cid%>.create(com.google.cloud.bigquery.JobInfo.of(loadJobBuilder_<%=cid%>.build()));
+			job_<%=cid%> = job_<%=cid%>.waitFor(com.google.cloud.RetryOption.initialRetryDelay(org.threeten.bp.Duration.ofSeconds(1)));
+			if (job_<%=cid%> != null && job_<%=cid%>.getStatus().getError() == null) {
+				<%
+				if(isLog4jEnabled){
+				%>
+					log.info("<%=cid%> - Job execution status: " + job_<%=cid%>.getStatus());
+				<%
+				}
+				%>
+			} else {
+				List<com.google.cloud.bigquery.BigQueryError> errorList = job_<%=cid%>.getStatus().getExecutionErrors();
+				throw new RuntimeException("Job failed: " + errorList.get(errorList.size() - 1));
 			}
-			%>
-		} else {
-			List<com.google.cloud.bigquery.BigQueryError> errorList = job_<%=cid%>.getStatus().getExecutionErrors();
-			throw new RuntimeException("Job failed: " + errorList.get(errorList.size() - 1));
-		}
 		
 		/* ----END-CREATING-JOB (Cloud API)---- */
 	<%

main/plugins/org.talend.designer.components.localprovider/components/tBigQueryBulkExec/tBigQueryBulkExec_java.xml

@@ -173,7 +173,7 @@
 		SHOW_IF="(SET_FIELD_DELIMITER == 'true')">
 		<DEFAULT>","</DEFAULT>
 	</PARAMETER>
-    <PARAMETER NAME="DROP" FIELD="CHECK" REQUIRED="true" NUM_ROW="25" SHOW_IF="AUTH_MODE == 'SERVICEACCOUNT'">
+    <PARAMETER NAME="DROP" FIELD="CHECK" REQUIRED="true" NUM_ROW="25">
       <DEFAULT>false</DEFAULT>
     </PARAMETER>
 	<PARAMETER NAME="ENCODING" FIELD="ENCODING_TYPE" NUM_ROW="30"

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_java.xml

@@ -53,6 +53,7 @@
 
   <PARAMETER
       NAME="DBTYPE"
+      REPOSITORY_VALUE="DBTYPE"
       FIELD="CLOSED_LIST"
       NUM_ROW="10"
     >
@@ -897,7 +898,7 @@
 		<IMPORT NAME="Driver-VERTICA_7.0.1" MODULE="vertica-jdbc-7.0.1-0.jar" MVN="mvn:org.talend.libraries/vertica-jdbc-7.0.1-0/6.0.0"   REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_7_0_X')" />
   		<IMPORT NAME="Driver-VERTICA_7.1.2" MODULE="vertica-jdbc-7.1.2-0.jar" MVN="mvn:org.talend.libraries/vertica-jdbc-7.1.2-0/6.0.0" REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_7_1_X')" />
   		<IMPORT NAME="Driver-EXASolution" MODULE="exajdbc-6.0.9302.jar" MVN="mvn:org.talend.libraries/exajdbc-6.0.9302/6.3.0"  REQUIRED_IF="(DBTYPE=='EXASOL') and (USE_EXISTING_CONNECTION == 'false')" />
-		<IMPORT NAME="Driver-Redshift" MODULE="redshift-jdbc42-no-awssdk-1.2.20.1043.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.20.1043" REQUIRED_IF="(DBTYPE=='REDSHIFT') and (USE_EXISTING_CONNECTION == 'false')" />
+		<IMPORT NAME="Driver-Redshift" MODULE="redshift-jdbc42-no-awssdk-1.2.32.1056.jar" MVN="mvn:com.amazon.redshift/redshift-jdbc42-no-awssdk/1.2.32.1056" REQUIRED_IF="(DBTYPE=='REDSHIFT') and (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="Driver-Snowflake" MODULE="snowflake-jdbc-3.5.3.jar" MVN="mvn:net.snowflake/snowflake-jdbc/3.5.3"  REQUIRED_IF="(DBTYPE=='SNOWFLAKE') and (USE_EXISTING_CONNECTION == 'false')" />
 		<IMPORT NAME="Driver-VERTICA_9.0" MODULE="vertica-jdbc-9.0.0-0.jar" MVN="mvn:org.talend.libraries/vertica-jdbc-9.0.0-0/6.0.0"   REQUIRED_IF="(DBTYPE=='VERTICA') and (USE_EXISTING_CONNECTION == 'false') and (DB_VERTICA_VERSION=='VERTICA_9_0')"/>
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_main.javajet

@@ -1564,7 +1564,7 @@ class TeradataManager extends Manager {
     private boolean useExistingConnection;
 	private String connection;
     
-    private static final String SEPARATOR = ",";
+    private static final String SEPARATOR = "/";
     
     protected TeradataManager(String host, String port, String dbName, String tableName, 
     							String userName, String cid, boolean useExistingConnection, String connection, String additionalParams ) {

main/plugins/org.talend.designer.components.localprovider/components/tCreateTable/tCreateTable_messages.properties

@@ -118,7 +118,7 @@ DB_VERTICA_VERSION.ITEM.VERTICA_7_1_X=Vertica 7.1.X
 DB_VERTICA_VERSION.ITEM.VERTICA_9_0=Vertica 9
 
 DB_POSTGRE_VERSION.NAME=DB Version
-DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=Prior to v9
+DB_POSTGRE_VERSION.ITEM.PRIOR_TO_V9=v7.2 to v8.X
 DB_POSTGRE_VERSION.ITEM.V9_X=v9 and later
 QUERY.NAME=Query
 

main/plugins/org.talend.designer.components.localprovider/components/tDotNETInstantiate/tDotNETInstantiate_java.xml

@@ -40,8 +40,8 @@
 	</ADVANCED_PARAMETERS>
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT MODULE="janet-java-1.1.jar" MVN="mvn:org.talend.libraries/janet-java-1.1/6.0.0"  NAME="janet-java-1.1"
-				REQUIRED="true" />
+			<IMPORT MODULE="janet-java-1.2.jar" MVN="mvn:org.talend.libraries/janet-java-1.2/6.0.0"  NAME="janet-java-1.2"
+				 REQUIRED="true" />
 		</IMPORTS>
 	</CODEGENERATION>
 	<RETURNS>

main/plugins/org.talend.designer.components.localprovider/components/tDotNETRow/tDotNETRow_java.xml

@@ -94,7 +94,7 @@
 	</ADVANCED_PARAMETERS>
 	<CODEGENERATION>
 		<IMPORTS>
-			<IMPORT MODULE="janet-java-1.1.jar" MVN="mvn:org.talend.libraries/janet-java-1.1/6.0.0"  NAME="janet-java-1.1"
+			<IMPORT MODULE="janet-java-1.2.jar" MVN="mvn:org.talend.libraries/janet-java-1.2/6.0.0"  NAME="janet-java-1.2"
 				REQUIRED="true" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tEXABulkExec/tEXABulkExec_begin.javajet

@@ -36,6 +36,8 @@ skeleton="@{org.talend.designer.components.localprovider}/components/templates/d
 	String defaultDateFormat = ElementParameterParser.getValue(node, "__DEFAULT_DATE_FORMAT__");
 	String defaultTimestampFormat = ElementParameterParser.getValue(node, "__DEFAULT_TIMESTAMP_FORMAT__");
 	String numGroupSep = ElementParameterParser.getValue(node, "__THOUSANDS_SEPARATOR__");
+	boolean useLenPrecision = "true".equals(ElementParameterParser.getValue(node, "__USE_PRECISION_LENGTH_FROM_SCHEMA__"));
+	
 	if (numGroupSep == null|| numGroupSep.trim().isEmpty()) {
 		 numGroupSep = "null";
 	}
@@ -207,12 +209,24 @@ org.talend.database.exasol.imp.EXABulkUtil <%=cid%> = new org.talend.database.ex
                 String lengthStr = "null";
                 String precisionStr = "null";
                 Integer length = column.getLength();
-                if (length != null) {
-                    lengthStr = String.valueOf(length);
-                }
+                if(useLenPrecision) {
+	                if (length != null) {
+	                    lengthStr = String.valueOf(length);
+	                }
+	            } else {
+	            	if (length != null && hasGroupSep) {
+	                    lengthStr = String.valueOf(length);
+	                }
+	            }
                 Integer precision = column.getPrecision();
-                if (precision != null) {
-                    precisionStr = String.valueOf(precision);
+                if(useLenPrecision) {
+                	if (precision != null) {
+                    	precisionStr = String.valueOf(precision);
+                	}
+                } else {
+                	if (precision != null && hasGroupSep) {
+	                    precisionStr = String.valueOf(precision);
+	                }
                 }
                 String talendType = column.getTalendType();
                 if ("id_Date".equals(talendType)

main/plugins/org.talend.designer.components.localprovider/components/tEXABulkExec/tEXABulkExec_java.xml

@@ -635,14 +635,23 @@
 		>
 			<DEFAULT>false</DEFAULT>
 		</PARAMETER>
+		
+		<PARAMETER 
+			NAME="USE_PRECISION_LENGTH_FROM_SCHEMA"
+			FIELD="CHECK" 
+			NUM_ROW="115"
+			REQUIRED="true"
+		>
+			<DEFAULT>false</DEFAULT>
+		</PARAMETER>
 
 	</ADVANCED_PARAMETERS>
 
    <CODEGENERATION>
      <IMPORTS>
         <IMPORT NAME="Driver-EXASolution" MODULE="exajdbc-6.0.9302.jar" MVN="mvn:org.talend.libraries/exajdbc-6.0.9302/6.3.0"  REQUIRED="true" />
-		<IMPORT NAME="Talend-DB-Exasol-Util" MODULE="talend-db-exasol-2.1.2.jar" MVN="mvn:org.talend.libraries/talend-db-exasol-2.1.2/6.2.0" 
-			UrlPath="platform:/plugin/org.talend.libraries.jdbc.exasol/lib/talend-db-exasol-2.1.2.jar" REQUIRED="true" />
+		<IMPORT NAME="Talend-DB-Exasol-Util" MODULE="talend-db-exasol-2.1.4.jar" MVN="mvn:org.talend.components.lib/talend-db-exasol/2.1.4" 
+			UrlPath="platform:/plugin/org.talend.libraries.jdbc.exasol/lib/talend-db-exasol-2.1.4.jar" REQUIRED="true" />
      </IMPORTS>
    </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tEXABulkExec/tEXABulkExec_messages.properties

@@ -108,4 +108,6 @@ NB_LINE_INSERTED.NAME=Rows inserted
 NB_LINE_DELETED.NAME=Rows deleted
 SOURCE_QUERY.NAME=Source query
 
-TEST_MODE.NAME=Test mode (no statements are executed)
+TEST_MODE.NAME=Test mode (no statements are executed)
+
+USE_PRECISION_LENGTH_FROM_SCHEMA.NAME=Use precision and length from schema

main/plugins/org.talend.designer.components.localprovider/components/tExtractJSONFields/tExtractJSONFields_java.xml

@@ -178,7 +178,7 @@
     <IMPORTS>
     		<IMPORT NAME="Java_DOM4J1.6" MODULE="dom4j-1.6.1.jar" MVN="mvn:dom4j/dom4j/1.6.1"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
             <IMPORT NAME="Java_JAXEN1.1" MODULE="jaxen-1.1.1.jar" MVN="mvn:org.talend.libraries/jaxen-1.1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.dom4j-jaxen/lib/jaxen-1.1.1.jar" REQUIRED_IF="READ_BY == 'XPATH'" BundleID="" />
-            <IMPORT NAME="json-lib" MODULE="json-lib-2.4.1-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.1-talend" REQUIRED_IF="READ_BY == 'XPATH'" />
+            <IMPORT NAME="json-lib" MODULE="json-lib-2.4.2-talend.jar" MVN="mvn:net.sf.json-lib/json-lib/2.4.2-talend" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="commons_lang" MODULE="commons-lang-2.6.jar" MVN="mvn:commons-lang/commons-lang/2.6"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="commons_logging" MODULE="commons-logging-1.1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1.1/6.0.0"  UrlPath="platform:/base/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar" REQUIRED_IF="READ_BY == 'XPATH'" />
             <IMPORT NAME="ezmorph" MODULE="ezmorph-1.0.6.jar" MVN="mvn:org.talend.libraries/ezmorph-1.0.6/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jackson/lib/ezmorph-1.0.6.jar" REQUIRED_IF="READ_BY == 'XPATH'" />

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

@@ -1,88 +0,0 @@
-<%@ 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

@@ -28,10 +28,11 @@ String authMethod = ElementParameterParser.getValue(node, "__AUTH_METHOD__");
 String privateKey = ElementParameterParser.getValue(node, "__PRIVATEKEY__");
 boolean ftps = ("true").equals(ElementParameterParser.getValue(node, "__FTPS__"));
 String keystoreFile = ElementParameterParser.getValue(node, "__KEYSTORE_FILE__");
-String sEncoding = ElementParameterParser.getValue(node, "__ENCODING__");
+String encoding = ElementParameterParser.getValue(node, "__ENCODING__");
 String securityMode = ElementParameterParser.getValue(node, "__SECURITY_MODE__");
 String protectionLevel = ElementParameterParser.getValue(node, "__FTPS_PROT__");
 String protectionBufferSize = ElementParameterParser.getValue(node, "__FTPS_PROTECTION_BUFF_SIZE__");
+String timeoutValue = ElementParameterParser.getValue(node, "__CONNECTION_TIMEOUT__");
 boolean useRemoteVerification = ("true").equals(ElementParameterParser.getValue(node, "__REMOTE_VERIFICATION__"));
 boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
 String passwordFieldName = "";
@@ -60,37 +61,18 @@ if (ElementParameterParser.canEncrypt(node, passwordFieldName)) {
   });
 <%
 }
-
+%>
+int connectionTimeout_<%=cid %> = Integer.valueOf(<%=timeoutValue %>);
+<%
 if (!sftp && !ftps) { // *** ftp *** //
-  	if(isLog4jEnabled){%>
-		log.debug("<%=cid%> - " + <%=(("ACTIVE").equals(connectMode))?"\"Using the active mode.\"":"\"Using the passive mode.\""%>);
-	<%}%>
-	com.enterprisedt.net.ftp.FTPClient ftp_<%=cid %> = new com.enterprisedt.net.ftp.FTPClient();
-	ftp_<%=cid %>.setRemoteHost(<%=host %>);
-	ftp_<%=cid %>.setRemotePort(<%=port %>);
+%>
+    com.enterprisedt.net.ftp.FTPClient ftp_<%=cid %> = null;
+<%
+    passwordFieldName = "__PASS__";
+%>
+    <%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/ftp_connect.javajet"%>
 
-	<%if (("ACTIVE").equals(connectMode)) {%>
-    	ftp_<%=cid %>.setConnectMode(com.enterprisedt.net.ftp.FTPConnectMode.ACTIVE);
-	<%} else {%>
-    	ftp_<%=cid %>.setConnectMode(com.enterprisedt.net.ftp.FTPConnectMode.PASV);
-	<%}%>
-	ftp_<%=cid %>.setControlEncoding(<%=sEncoding%>);
-	<%if(isLog4jEnabled){%>
-		log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" +<%=user %>+ "'.");
-	<%}%>
-	ftp_<%=cid %>.connect();  
-	
-	<%
-	passwordFieldName = "__PASS__";
-	%> 
-		        
-	<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-   	
-	ftp_<%=cid %>.login(<%=user %>, decryptedPassword_<%=cid%>);  
-  	<%if(isLog4jEnabled){%>
-		log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-	<%}%>
-	globalMap.put("conn_<%=cid%>",ftp_<%=cid %>);
+    globalMap.put("conn_<%=cid%>",ftp_<%=cid %>);
 <%
 } else if (!ftps) { // *** sftp *** //
 %>
@@ -138,99 +120,20 @@ if (!sftp && !ftps) { // *** ftp *** //
 	passwordFieldName = "__PASS__";
 	%>
 	
-	<%@ include file="sftp_connect.javajet"%>
+	<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/sftp_connect.javajet"%>
 	
 	<%if(use_encoding) {%>
-		c_<%=cid%>.setFilenameEncoding(<%=sEncoding%>);
+		c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
 	<%}%>
 	
 	globalMap.put("conn_<%=cid%>", c_<%=cid%>);
 <%
 } else {  // *** ftps *** //
 %>
+    org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> = null;
 
-	<%@ include file="../templates/FTP/ftpsTrust.javajet"%>
-	javax.net.ssl.SSLContext sslContext_<%=cid %> = null;
-	javax.net.ssl.TrustManager[] trustManager_<%=cid %> = null;
-	javax.net.ssl.SSLSocketFactory sslSocketFactory_<%=cid %> = null;
-	org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> = null;
-	MyTrust_<%=cid%> myTrust_<%=cid%> = null;
-
-	try {
-		sslContext_<%=cid %> = javax.net.ssl.SSLContext.getInstance("SSL");
-		myTrust_<%=cid%> = new MyTrust_<%=cid%>();
-		trustManager_<%=cid %> = myTrust_<%=cid%>.getTrustManagers();
-		sslContext_<%=cid %>.init(null, trustManager_<%=cid %>, new java.security.SecureRandom());
-		sslSocketFactory_<%=cid %> = sslContext_<%=cid %>.getSocketFactory();
-		boolean isHTTPProxyUsed = "true".equals(System.getProperty("http.proxySet"));
-		if (isHTTPProxyUsed) {
-			String httpProxyHost = System.getProperty("http.proxyHost");
-			int httpProxyPort = Integer.getInteger("http.proxyPort");
-			String httpProxyUser = System.getProperty("http.proxyUser");
-			String httpProxyPass = System.getProperty("http.proxyPassword");
-
-			ftp_<%=cid %> = new org.talend.ftp.HTTPProxyFTPSClient(<%="IMPLICIT".equals(securityMode)%>, sslContext_<%=cid %>, httpProxyHost, httpProxyPort, httpProxyUser, httpProxyPass);
-		} else {
-			ftp_<%=cid %> = new  org.talend.ftp.SSLSessionReuseFTPSClient(<%="IMPLICIT".equals(securityMode)%>, sslContext_<%=cid %>);
-		}
-		ftp_<%=cid %>.setControlEncoding(<%=sEncoding %>);
-
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> -FTPS security Mode is <%=securityMode%>.");
-			log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" + <%=user %>+ "'.");
-		<%}%>
-		ftp_<%=cid %>.connect(<%=host %>,<%=ftpsPort%>);
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-		<%}%>
-		ftp_<%=cid %>.setRemoteVerificationEnabled(<%=useRemoteVerification %>);
-		<%
-		passwordFieldName = "__PASS__";
-		%>
-		
-		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-
-		boolean isLoginSuccessful_<%=cid %> = ftp_<%=cid %>.login(<%=user %>, decryptedPassword_<%=cid%>);
-
-		if (!isLoginSuccessful_<%=cid %>) {
-			throw new RuntimeException("Login failed");
-		}
-
-		ftp_<%=cid %>.setFileType(org.apache.commons.net.ftp.FTP.BINARY_FILE_TYPE);
-<%
-		if (protectionBufferSize != null && !protectionBufferSize.isEmpty() ) {
-%>
-			ftp_<%=cid %>.execPBSZ(<%=protectionBufferSize %>);
-<%
-		}
-
-		if (protectionLevel != null && !protectionLevel.isEmpty()) {
-%>
-			ftp_<%=cid %>.execPROT(<%=protectionLevel %>);
-<%
-		}
-%>
-	} catch (Exception e) {
-		<%if(isLog4jEnabled){%>
-			log.error("<%=cid%> - Can't create connection: " + e.getMessage());
-		<%}%>
-		throw e;
-	}
-
-<%
-	if ("PASSIVE".equals(connectMode)) {
-%>
-		ftp_<%=cid %>.enterLocalPassiveMode();
-<%
-		if (isLog4jEnabled) {
-%>
-			log.debug("<%=cid%> - Using the passive mode.");
-<%
-		}
-	}
-%>
-
-	globalMap.put("conn_<%=cid%>", ftp_<%=cid %>);
+    <%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/ftps_connect.javajet"%>
+    globalMap.put("conn_<%=cid%>", ftp_<%=cid %>);
 <%
 }
 %>

main/plugins/org.talend.designer.components.localprovider/components/tFTPConnection/tFTPConnection_java.xml

@@ -232,6 +232,11 @@
 			NUM_ROW="95" SHOW_IF="(FTPS=='true')" REPOSITORY_VALUE="REMOTE_VERIFICATION">
 			<DEFAULT>true</DEFAULT>
 		</PARAMETER>
+
+		<PARAMETER NAME="CONNECTION_TIMEOUT" FIELD="TEXT"
+			NUM_ROW="96" REPOSITORY_VALUE="CONNECTION_TIMEOUT">
+			<DEFAULT>0</DEFAULT>
+		</PARAMETER>
 	</ADVANCED_PARAMETERS>
 
   <CODEGENERATION>
@@ -239,7 +244,7 @@
        <IMPORT NAME="Java-FTP" MODULE="edtftpj-2.5.0.jar" MVN="mvn:com.enterprisedt/edtftpj/2.5.0"  UrlPath="platform:/plugin/org.talend.libraries.ftp/lib/edtftpj-2.5.0.jar" REQUIRED_IF="(SFTP == 'false') AND (FTPS == 'false')"/>
        <IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true')"/>
        <IMPORT NAME="Java-FTPS" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(FTPS == 'true')" />
-       <IMPORT NAME="Java-FTPS-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" MVN="mvn:org.talend.libraries/commons-net-ftps-proxy/3.6.1-talend-20190128" REQUIRED_IF="(FTPS == 'true')" />
+       <IMPORT NAME="Java-FTPS-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" REQUIRED_IF="(FTPS == 'true')" />
      </IMPORTS>
    </CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tFTPConnection/tFTPConnection_messages.properties

@@ -40,4 +40,5 @@ SECURITY_MODE.NAME=Security Mode
 SECURITY_MODE.ITEM.IMPLICIT=Implicit
 SECURITY_MODE.ITEM.EXPLICIT=Explicit
 
-USE_ENCODING.NAME=Filename encoding
+USE_ENCODING.NAME=Filename encoding
+CONNECTION_TIMEOUT.NAME=Connection timeout (milliseconds)

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

@@ -43,6 +43,7 @@ boolean sftp = false;
 boolean ftps = false;
 String protectionLevel = ElementParameterParser.getValue(node, "__FTPS_PROT__");
 String protectionBufferSize = ElementParameterParser.getValue(node, "__FTPS_PROTECTION_BUFF_SIZE__");
+String timeoutValue = ElementParameterParser.getValue(node, "__CONNECTION_TIMEOUT__");
 boolean useRemoteVerification = ("true").equals(ElementParameterParser.getValue(node, "__REMOTE_VERIFICATION__"));
 if (("true").equals(useExistingConn)) {
   List<? extends INode> nodeList = node.getProcess().getGeneratingNodes();
@@ -55,6 +56,9 @@ if (("true").equals(useExistingConn)) {
 } else {
   sftp = ("true").equals(ElementParameterParser.getValue(node, "__SFTP__"));
   ftps = ("true").equals(ElementParameterParser.getValue(node, "__FTPS__"));
+%>
+  int connectionTimeout_<%=cid %> = Integer.valueOf(<%=timeoutValue %>);
+<%
 }
 
 boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
@@ -129,7 +133,7 @@ int nb_file_<%=cid%> = 0;
   			passwordFieldName = "__PASSWORD__";
   			%>
 			
-			<%@ include file="../tFTPConnection/sftp_connect.javajet"%>
+			<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/sftp_connect.javajet"%>
 		    
 	    <%if(use_encoding) {%>
 	    	c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
@@ -167,101 +171,18 @@ int nb_file_<%=cid%> = 0;
 
 <%
 	} else if (ftps) { // *** ftps *** //
+%>
+		org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> = null;
+<%
 		if (("false").equals(useExistingConn)) {
 			String keystoreFile = ElementParameterParser.getValue(node, "__KEYSTORE_FILE__");
 			String securityMode = ElementParameterParser.getValue(node, "__SECURITY_MODE__");
 %>
-			<%@ include file="../templates/FTP/ftpsTrust.javajet"%>
-			javax.net.ssl.SSLContext sslContext_<%=cid %> = null;
-			javax.net.ssl.TrustManager[] trustManager_<%=cid %> = null;
-			javax.net.ssl.SSLSocketFactory sslSocketFactory_<%=cid %> = null;
-			org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> =null;
-			MyTrust_<%=cid %> myTrust_<%=cid%> = null;
-
-			try {
-				sslContext_<%=cid %> = javax.net.ssl.SSLContext.getInstance("SSL");
-				myTrust_<%=cid%> = new MyTrust_<%=cid%>();
-				trustManager_<%=cid %> = myTrust_<%=cid%>.getTrustManagers();
-				sslContext_<%=cid %>.init(null, trustManager_<%=cid %>, new java.security.SecureRandom());
-				sslSocketFactory_<%=cid %> = sslContext_<%=cid %>.getSocketFactory();
-				boolean isHTTPProxyUsed = "true".equals(System.getProperty("http.proxySet"));
-				if (isHTTPProxyUsed) {
-					String httpProxyHost = System.getProperty("http.proxyHost");
-					int httpProxyPort = Integer.getInteger("http.proxyPort");
-					String httpProxyUser = System.getProperty("http.proxyUser");
-					String httpProxyPass = System.getProperty("http.proxyPassword");
-
-					ftp_<%=cid %> = new org.talend.ftp.HTTPProxyFTPSClient(<%="IMPLICIT".equals(securityMode)%>, sslContext_<%=cid %>, httpProxyHost, httpProxyPort, httpProxyUser, httpProxyPass);
-				} else {
-					ftp_<%=cid %> = new org.talend.ftp.SSLSessionReuseFTPSClient(<%="IMPLICIT".equals(securityMode)%>, sslContext_<%=cid %>);
-				}
-				ftp_<%=cid %>.setControlEncoding(<%=encoding%>);
-
-				<%if(isLog4jEnabled){%>
-					log.info("<%=cid%> -FTPS security Mode is <%=securityMode%>.");
-					log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" + <%=user %>+ "'.");
-				<%}%>
-				ftp_<%=cid %>.connect(<%=host %>,<%=ftpsPort %>);
-				<%if(isLog4jEnabled){%>
-					log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-				<%}%>
-				ftp_<%=cid %>.setRemoteVerificationEnabled(<%=useRemoteVerification %>);
+			<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/ftps_connect.javajet"%>
 <%
-				passwordFieldName = "__PASSWORD__";
-%>
-				
-				<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-
-				boolean isLoginSuccessful_<%=cid %> = ftp_<%=cid %>.login(<%=user %>, decryptedPassword_<%=cid%>);
-
-				if (!isLoginSuccessful_<%=cid %>) {
-					throw new RuntimeException("Login failed");
-				}
-
-<%
-				if (protectionBufferSize != null && !protectionBufferSize.isEmpty() ) {
-%>
-					ftp_<%=cid %>.execPBSZ(<%=protectionBufferSize %>);
-<%
-				}
-
-				if (protectionLevel != null && !protectionLevel.isEmpty()) {
-%>
-					ftp_<%=cid %>.execPROT(<%=protectionLevel %>);
-<%
-				}
-%>
-			} catch (Exception e) {
-				<%if(isLog4jEnabled){%>
-					log.error("<%=cid%> - Can't create connection: " + e.getMessage());
-				<%}%>
-<%
-				if (dieOnError) {
-%>
-					throw e;
-<%
-				} else {
-%>
-					e.printStackTrace();
-<%
-				}
-%>
-			}
-
-<%
-			if ("PASSIVE".equals(connectMode)) {
-%>
-				ftp_<%=cid %>.enterLocalPassiveMode();
-<%
-				if (isLog4jEnabled) {
-%>
-					log.debug("<%=cid%> - Using the passive mode.");
-<%
-				}
-			}
 		} else {
 %>
-			org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> = (org.apache.commons.net.ftp.FTPSClient) globalMap.get("<%=conn %>");
+			ftp_<%=cid %> = (org.apache.commons.net.ftp.FTPSClient) globalMap.get("<%=conn %>");
 <%
 			if (moveToCurrentDir) {
 %>
@@ -303,36 +224,12 @@ int nb_file_<%=cid%> = 0;
 		  	<%if(!moveToCurrentDir){%>
 		  		String rootDir_<%=cid %> = ftp_<%=cid %>.pwd();
 		  	<%}%>
-  		<%} else {%>    
-		    ftp_<%=cid %> = new com.enterprisedt.net.ftp.FTPClient();
-		    ftp_<%=cid %>.setRemoteHost(<%=host %>);
-		    ftp_<%=cid %>.setRemotePort(<%=port %>);
-		    <%if(isLog4jEnabled){%>
-				log.debug("<%=cid%> - " + <%=(("ACTIVE").equals(connectMode))?"\"Using the active mode.\"":"\"Using the passive mode.\""%>);
-			<%}%>
-		    <%if (("ACTIVE").equals(connectMode)) {%>
-		      ftp_<%=cid %>.setConnectMode(com.enterprisedt.net.ftp.FTPConnectMode.ACTIVE);
-		    <%} else {%>
-		      ftp_<%=cid %>.setConnectMode(com.enterprisedt.net.ftp.FTPConnectMode.PASV);
-		    <%}%>
-		    ftp_<%=cid %>.setControlEncoding(<%=encoding%>);
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username: '" +<%=user %>+ "'.");
-			<%}%>
-		    ftp_<%=cid %>.connect();  
-		    
-		    <%
-			passwordFieldName = "__PASSWORD__";
-			%> 
-    	
-			<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-		    
-		    ftp_<%=cid %>.login(<%=user %>, decryptedPassword_<%=cid%>);
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-			<%}%>  
-  		<%}%>  
-  		java.util.List<java.util.Map<String,String>> list<%=cid %> = new java.util.ArrayList<java.util.Map<String,String>>();  
+  		<%} else {
+            passwordFieldName = "__PASSWORD__";
+%>
+            <%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/ftp_connect.javajet"%>
+        <%}%>
+        java.util.List<java.util.Map<String,String>> list<%=cid %> = new java.util.ArrayList<java.util.Map<String,String>>();
 
 		<%for (int i = 0; i < files.size(); i++) {
 			Map<String, String> line = files.get(i);

main/plugins/org.talend.designer.components.localprovider/components/tFTPDelete/tFTPDelete_java.xml

@@ -288,6 +288,11 @@
 			NUM_ROW="95" SHOW_IF="(FTPS=='true') AND (USE_EXISTING_CONNECTION == 'false')" REPOSITORY_VALUE="REMOTE_VERIFICATION">
 			<DEFAULT>true</DEFAULT>
 		</PARAMETER>
+
+		<PARAMETER NAME="CONNECTION_TIMEOUT" FIELD="TEXT"
+			NUM_ROW="96" SHOW_IF="USE_EXISTING_CONNECTION == 'false'" REPOSITORY_VALUE="CONNECTION_TIMEOUT">
+			<DEFAULT>0</DEFAULT>
+		</PARAMETER>
 	</ADVANCED_PARAMETERS>
 
   <CODEGENERATION>
@@ -296,8 +301,8 @@
 		<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="jakarta-oro" MODULE="jakarta-oro-2.0.8.jar" MVN="mvn:org.talend.libraries/jakarta-oro-2.0.8/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache/lib/jakarta-oro-2.0.8.jar" REQUIRED="true" />
 		<IMPORT NAME="Java-FTPS" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(FTPS == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-		<IMPORT NAME="Java-FTPS-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
-			MVN="mvn:org.talend.libraries/commons-net-ftps-proxy/3.6.1-talend-20190128" UrlPath="platform:/plugin/org.talend.designer.components.localprovider/components/tFTPConnection/commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
+		<IMPORT NAME="Java-FTPS-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" 
+			MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" 
 			REQUIRED_IF="(FTPS == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
      </IMPORTS>
    </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tFTPDelete/tFTPDelete_messages.properties

@@ -56,4 +56,5 @@ IGNORE_FAILURE_AT_QUIT.NAME=Ignore Failure At Quit
 PERL5_REGEX.NAME=Use Perl5 Regex Expressions as Filemask (Unchecked means Glob Expressions)
 MOVE_TO_THE_CURRENT_DIRECTORY.NAME=Move to the current directory
 
-USE_ENCODING.NAME=Filename encoding
+USE_ENCODING.NAME=Filename encoding
+CONNECTION_TIMEOUT.NAME=Connection timeout (milliseconds)

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

@@ -42,6 +42,7 @@ boolean ftps = false;
 
 String protectionLevel = ElementParameterParser.getValue(node, "__FTPS_PROT__");
 String protectionBufferSize = ElementParameterParser.getValue(node, "__FTPS_PROTECTION_BUFF_SIZE__");
+String timeoutValue = ElementParameterParser.getValue(node, "__CONNECTION_TIMEOUT__");
 boolean useRemoteVerification = ("true").equals(ElementParameterParser.getValue(node, "__REMOTE_VERIFICATION__"));
 
 boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
@@ -57,6 +58,9 @@ if (("true").equals(useExistingConn)) {
 } else {
   sftp = ("true").equals(ElementParameterParser.getValue(node, "__SFTP__"));
   ftps = ("true").equals(ElementParameterParser.getValue(node, "__FTPS__"));
+%>
+  int connectionTimeout_<%=cid %> = Integer.valueOf(<%=timeoutValue %>);
+<%
 }
 
 String passwordFieldName = "";
@@ -134,7 +138,7 @@ if (sftp) { // *** sftp *** //
 			passwordFieldName = "__PASSWORD__";
 			%>
 		
-		<%@ include file="../tFTPConnection/sftp_connect.javajet"%>
+		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/sftp_connect.javajet"%>
     	
   	<%if(use_encoding) {%>
   		c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
@@ -154,90 +158,18 @@ if (sftp) { // *** sftp *** //
 <%
 	}
 } else if (ftps) { // *** ftps *** //
+%>
+    org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> = null;
+<%
 	if (("false").equals(useExistingConn)) {
 		String keystoreFile = ElementParameterParser.getValue(node, "__KEYSTORE_FILE__");
 		String securityMode = ElementParameterParser.getValue(node, "__SECURITY_MODE__");
 %>
-		<%@ include file="../templates/FTP/ftpsTrust.javajet"%>
-		javax.net.ssl.SSLContext sslContext_<%=cid %> = null;
-		javax.net.ssl.TrustManager[] trustManager_<%=cid %> = null;
-		javax.net.ssl.SSLSocketFactory sslSocketFactory_<%=cid %> = null;
-		org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> =null;
-		MyTrust_<%=cid %> myTrust_<%=cid%> = null;
-
-		try {
-			sslContext_<%=cid %> = javax.net.ssl.SSLContext.getInstance("SSL");
-			myTrust_<%=cid%> = new MyTrust_<%=cid%>();
-			trustManager_<%=cid %> = myTrust_<%=cid%>.getTrustManagers();
-			sslContext_<%=cid %>.init(null, trustManager_<%=cid %>, new java.security.SecureRandom());
-			sslSocketFactory_<%=cid %> = sslContext_<%=cid %>.getSocketFactory();
-			boolean isHTTPProxyUsed = "true".equals(System.getProperty("http.proxySet"));
-			if (isHTTPProxyUsed) {
-				String httpProxyHost = System.getProperty("http.proxyHost");
-				int httpProxyPort = Integer.getInteger("http.proxyPort");
-				String httpProxyUser = System.getProperty("http.proxyUser");
-				String httpProxyPass = System.getProperty("http.proxyPassword");
-
-				ftp_<%=cid %> = new org.talend.ftp.HTTPProxyFTPSClient(<%="IMPLICIT".equals(securityMode)%>, sslContext_<%=cid %>, httpProxyHost, httpProxyPort, httpProxyUser, httpProxyPass);
-			} else {
-				ftp_<%=cid %> = new org.talend.ftp.SSLSessionReuseFTPSClient(<%="IMPLICIT".equals(securityMode)%>, sslContext_<%=cid %>);
-			}
-			ftp_<%=cid %>.setControlEncoding(<%=encoding%>);
-
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> -FTPS security Mode is <%=securityMode%>.");
-				log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" + <%=user %>+ "'.");
-			<%}%>
-			ftp_<%=cid %>.connect(<%=host %>,<%=ftpsPort %>);
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-			<%}%>
-			ftp_<%=cid %>.setRemoteVerificationEnabled(<%=useRemoteVerification %>);
+		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/ftps_connect.javajet"%>
 <%
-			passwordFieldName = "__PASSWORD__";
-%>
-
-			<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-
-			boolean isLoginSuccessful_<%=cid %> = ftp_<%=cid %>.login(<%=user %>, decryptedPassword_<%=cid%>);
-
-			if (!isLoginSuccessful_<%=cid %>) {
-				throw new RuntimeException("Login failed");
-			}
-
-<%
-			if (protectionBufferSize != null && !protectionBufferSize.isEmpty() ) {
-%>
-				ftp_<%=cid %>.execPBSZ(<%=protectionBufferSize %>);
-<%
-			}
-
-			if (protectionLevel != null && !protectionLevel.isEmpty()) {
-%>
-				ftp_<%=cid %>.execPROT(<%=protectionLevel %>);
-<%
-			}
-%>
-		} catch (Exception e) {
-			<%if(isLog4jEnabled){%>
-				log.error("<%=cid%> - Can't create connection: " + e.getMessage());
-			<%}%>
-			throw e;
-		}
-<%
-		if ("PASSIVE".equals(connectMode)) {
-%>
-			ftp_<%=cid %>.enterLocalPassiveMode();
-<%
-			if (isLog4jEnabled) {
-%>
-				log.debug("<%=cid%> - Using the passive mode.");
-<%
-			}
-		}
 	} else {
 %>
-		org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> = (org.apache.commons.net.ftp.FTPSClient) globalMap.get("<%=conn %>");
+		ftp_<%=cid %> = (org.apache.commons.net.ftp.FTPSClient) globalMap.get("<%=conn %>");
 <%
 	}
 } else { // *** ftp *** //
@@ -251,36 +183,10 @@ if (sftp) { // *** sftp *** //
 				log.info("<%=cid%> - Use an existing connection. Connection hostname: " + ftp_<%=cid %>.getRemoteHost() + ", Connection port: " + ftp_<%=cid %>.getRemotePort() + "."); 
 			}
 		<%}%>
-  	<%} else {%>    
-	   	ftp_<%=cid %> = new com.enterprisedt.net.ftp.FTPClient();
-	   	ftp_<%=cid %>.setRemoteHost(<%=host %>);
-	   	ftp_<%=cid %>.setRemotePort(<%=port %>);
-	
-		<%if(isLog4jEnabled){%>
-			log.debug("<%=cid%> - " + <%=(("ACTIVE").equals(connectMode))?"\"Using the active mode.\"":"\"Using the passive mode.\""%>);
-		<%}%>
-
-	    <%if (("ACTIVE").equals(connectMode)) {%>
-	      ftp_<%=cid %>.setConnectMode(com.enterprisedt.net.ftp.FTPConnectMode.ACTIVE);
-	    <%} else {%>
-	      ftp_<%=cid %>.setConnectMode(com.enterprisedt.net.ftp.FTPConnectMode.PASV);
-	    <%}%>
-	    ftp_<%=cid %>.setControlEncoding(<%=encoding%>);
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username: '" +<%=username %>+ "'.");
-		<%}%>
-	    ftp_<%=cid %>.connect();  
-	    
-		<%
-		passwordFieldName = "__PASSWORD__";
-		%> 
-	
-		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-
-	    ftp_<%=cid %>.login(<%=username %>, decryptedPassword_<%=cid%>);
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Connect to '" + <%=host%>  + "' has succeeded.");
-		<%}%>
-	  <%  
+  	<%} else {
+        passwordFieldName = "__PASSWORD__";
+%>
+        <%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/ftp_connect.javajet"%>
+<%
 	}
 }%>

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileExist/tFTPFileExist_java.xml

@@ -276,6 +276,11 @@ COMPATIBILITY="ALL"
 			NUM_ROW="95" SHOW_IF="(FTPS=='true') AND (USE_EXISTING_CONNECTION == 'false')" REPOSITORY_VALUE="REMOTE_VERIFICATION">
 			<DEFAULT>true</DEFAULT>
 		</PARAMETER>
+
+		<PARAMETER NAME="CONNECTION_TIMEOUT" FIELD="TEXT"
+			NUM_ROW="96" SHOW_IF="USE_EXISTING_CONNECTION == 'false'" REPOSITORY_VALUE="CONNECTION_TIMEOUT">
+			<DEFAULT>0</DEFAULT>
+		</PARAMETER>
   </ADVANCED_PARAMETERS>
 
   <CODEGENERATION>
@@ -283,8 +288,8 @@ COMPATIBILITY="ALL"
 		<IMPORT NAME="Java-FTP" MODULE="edtftpj-2.5.0.jar" MVN="mvn:com.enterprisedt/edtftpj/2.5.0"  UrlPath="platform:/plugin/org.talend.libraries.ftp/lib/edtftpj-2.5.0.jar" REQUIRED_IF="(SFTP == 'false') AND (FTPS == 'false') AND (USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
 		<IMPORT NAME="Java-FTPS" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(FTPS == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-		<IMPORT NAME="Java-FTPS-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
-			MVN="mvn:org.talend.libraries/commons-net-ftps-proxy/3.6.1-talend-20190128" UrlPath="platform:/plugin/org.talend.designer.components.localprovider/components/tFTPConnection/commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
+		<IMPORT NAME="Java-FTPS-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" 
+			MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" 
 			REQUIRED_IF="(FTPS == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 	 </IMPORTS>
   </CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileExist/tFTPFileExist_messages.properties

@@ -56,4 +56,5 @@ CONNECT_MODE.ITEM.PASSIVE=Passive
 
 IGNORE_FAILURE_AT_QUIT.NAME=Ignore Failure At Quit
 
-USE_ENCODING.NAME=Filename encoding
+USE_ENCODING.NAME=Filename encoding
+CONNECTION_TIMEOUT.NAME=Connection timeout (milliseconds)

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

@@ -42,6 +42,7 @@ boolean sftp = false;
 boolean ftps = false;
 String protectionLevel = ElementParameterParser.getValue(node, "__FTPS_PROT__");
 String protectionBufferSize = ElementParameterParser.getValue(node, "__FTPS_PROTECTION_BUFF_SIZE__");
+String timeoutValue = ElementParameterParser.getValue(node, "__CONNECTION_TIMEOUT__");
 boolean useRemoteVerification = ("true").equals(ElementParameterParser.getValue(node, "__REMOTE_VERIFICATION__"));
 
 if (("true").equals(useExistingConn)) {
@@ -56,6 +57,9 @@ if (("true").equals(useExistingConn)) {
 } else {
   sftp = ("true").equals(ElementParameterParser.getValue(node, "__SFTP__"));
   ftps = ("true").equals(ElementParameterParser.getValue(node, "__FTPS__"));
+%>
+  int connectionTimeout_<%=cid %> = Integer.valueOf(<%=timeoutValue %>);
+<%
 }
 boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
 String passwordFieldName = "";
@@ -151,7 +155,7 @@ if (sftp) {// *** sftp *** //
 		passwordFieldName = "__PASSWORD__";
 		%>
 		
-		<%@ include file="../tFTPConnection/sftp_connect.javajet"%>
+		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/sftp_connect.javajet"%>
 		
 		<%if(use_encoding) {%>
 			c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
@@ -233,93 +237,18 @@ if (sftp) {// *** sftp *** //
 		nb_file_<%=cid%>++;
 <%
 } else if (ftps) { // *** ftps *** //
+%>
+    org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> = null;
+<%
 	if (("false").equals(useExistingConn)) {
 		String keystoreFile = ElementParameterParser.getValue(node, "__KEYSTORE_FILE__");
 		String securityMode = ElementParameterParser.getValue(node, "__SECURITY_MODE__");
 %>
-		<%@ include file="../templates/FTP/ftpsTrust.javajet"%>
-		javax.net.ssl.SSLContext sslContext_<%=cid %> = null;
-		javax.net.ssl.TrustManager[] trustManager_<%=cid %> = null;
-		javax.net.ssl.SSLSocketFactory sslSocketFactory_<%=cid %> = null;
-		org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> =null;
-		MyTrust_<%=cid %> myTrust_<%=cid%> = null;
-
-		try {
-			sslContext_<%=cid %> = javax.net.ssl.SSLContext.getInstance("SSL");
-			myTrust_<%=cid%> = new MyTrust_<%=cid%>();
-			trustManager_<%=cid %> = myTrust_<%=cid%>.getTrustManagers();
-			sslContext_<%=cid %>.init(null, trustManager_<%=cid %>, new java.security.SecureRandom());
-			sslSocketFactory_<%=cid %> = sslContext_<%=cid %>.getSocketFactory();
-			boolean isHTTPProxyUsed = "true".equals(System.getProperty("http.proxySet"));
-			if (isHTTPProxyUsed) {
-				String httpProxyHost = System.getProperty("http.proxyHost");
-				int httpProxyPort = Integer.getInteger("http.proxyPort");
-				String httpProxyUser = System.getProperty("http.proxyUser");
-				String httpProxyPass = System.getProperty("http.proxyPassword");
-
-				ftp_<%=cid %> = new org.talend.ftp.HTTPProxyFTPSClient(<%="IMPLICIT".equals(securityMode)%>, sslContext_<%=cid %>, httpProxyHost, httpProxyPort, httpProxyUser, httpProxyPass);
-			} else {
-				ftp_<%=cid %> = new org.talend.ftp.SSLSessionReuseFTPSClient(<%="IMPLICIT".equals(securityMode)%>, sslContext_<%=cid %>);
-			}
-			ftp_<%=cid %>.setControlEncoding(<%=encoding%>);
-
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> -FTPS security Mode is <%=securityMode%>.");
-				log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" + <%=user %>+ "'.");
-			<%}%>
-			ftp_<%=cid %>.connect(<%=host %>,<%=ftpsPort %>);
+		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/ftps_connect.javajet"%>
 <%
-			if(isLog4jEnabled){
-%>
-				log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-<%
-			}
-
-			passwordFieldName = "__PASSWORD__";
-%>
-			ftp_<%=cid %>.setRemoteVerificationEnabled(<%=useRemoteVerification %>);
-
-			<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-
-			boolean isLoginSuccessful_<%=cid %> = ftp_<%=cid %>.login(<%=user %>, decryptedPassword_<%=cid%>);
-
-			if (!isLoginSuccessful_<%=cid %>) {
-				throw new RuntimeException("Login failed");
-			}
-
-<%
-			if (protectionBufferSize != null && !protectionBufferSize.isEmpty() ) {
-%>
-				ftp_<%=cid %>.execPBSZ(<%=protectionBufferSize %>);
-<%
-			}
-
-			if (protectionLevel != null && !protectionLevel.isEmpty()) {
-%>
-				ftp_<%=cid %>.execPROT(<%=protectionLevel %>);
-<%
-			}
-%>
-		} catch (Exception e) {
-			<%if(isLog4jEnabled){%>
-				log.error("<%=cid%> - Can't create connection: " + e.getMessage());
-			<%}%>
-			throw e;
-		}
-<%
-		if ("PASSIVE".equals(connectMode)) {
-%>
-			ftp_<%=cid %>.enterLocalPassiveMode();
-<%
-			if (isLog4jEnabled) {
-%>
-				log.debug("<%=cid%> - Using the passive mode.");
-<%
-			}
-		}
 	} else {
 %>
-		org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> = (org.apache.commons.net.ftp.FTPSClient) globalMap.get("<%=conn %>");
+		ftp_<%=cid %> = (org.apache.commons.net.ftp.FTPSClient) globalMap.get("<%=conn %>");
 		String rootDir_<%=cid %> = ftp_<%=cid %>.printWorkingDirectory();
 <%
 	}
@@ -401,35 +330,10 @@ if (sftp) {// *** sftp *** //
 		<%if(!moveToCurrentDir){%>
 			String rootDir_<%=cid %> = ftp_<%=cid %>.pwd();
 		<%}%>
-	<%} else {%>	
-		ftp_<%=cid %> = new com.enterprisedt.net.ftp.FTPClient();
-		ftp_<%=cid %>.setRemoteHost(<%=host %>);
-		ftp_<%=cid %>.setRemotePort(<%=port %>);
-	
-		<%if(isLog4jEnabled){%>
-			log.debug("<%=cid%> - " + <%=(("ACTIVE").equals(connectMode))?"\"Using the active mode.\"":"\"Using the passive mode.\""%>);
-		<%}%>
-		<%if (("ACTIVE").equals(connectMode)) {%>
-		  ftp_<%=cid %>.setConnectMode(com.enterprisedt.net.ftp.FTPConnectMode.ACTIVE);
-		<%} else {%>
-		  ftp_<%=cid %>.setConnectMode(com.enterprisedt.net.ftp.FTPConnectMode.PASV);
-		<%}%>
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" +<%=user %>+ "'.");
-		<%}%>
-		ftp_<%=cid %>.setControlEncoding(<%=encoding%>);
-		ftp_<%=cid %>.connect();  
-		
-		<%
-		passwordFieldName = "__PASSWORD__";
-		%> 
-		
-		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-		
-		ftp_<%=cid %>.login(<%=user %>, decryptedPassword_<%=cid%>); 
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-		<%}%>
+	<%} else {
+        passwordFieldName = "__PASSWORD__";
+%>
+		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/ftp_connect.javajet"%>
 	<%}%>
 	String remotedir_<%=cid %> = (<%=remotedir%>).replaceAll("\\\\","/");
 	ftp_<%=cid %>.chdir(remotedir_<%=cid %>);

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileList/tFTPFileList_java.xml

@@ -254,6 +254,11 @@
 			NUM_ROW="95" SHOW_IF="(FTPS=='true') AND (USE_EXISTING_CONNECTION == 'false')" REPOSITORY_VALUE="REMOTE_VERIFICATION">
 			<DEFAULT>true</DEFAULT>
 		</PARAMETER>
+
+		<PARAMETER NAME="CONNECTION_TIMEOUT" FIELD="TEXT"
+			NUM_ROW="96" SHOW_IF="USE_EXISTING_CONNECTION == 'false'" REPOSITORY_VALUE="CONNECTION_TIMEOUT">
+			<DEFAULT>0</DEFAULT>
+		</PARAMETER>
 	</ADVANCED_PARAMETERS>
 
 	<CODEGENERATION>
@@ -261,8 +266,8 @@
 			<IMPORT NAME="Java-FTP" MODULE="edtftpj-2.5.0.jar" MVN="mvn:com.enterprisedt/edtftpj/2.5.0" REQUIRED_IF="(SFTP == 'false') AND (FTPS == 'false') AND (USE_EXISTING_CONNECTION == 'false')"/>
 			<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
 			<IMPORT NAME="Java-FTPS" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(FTPS == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="Java-FTPS-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
-				MVN="mvn:org.talend.libraries/commons-net-ftps-proxy/3.6.1-talend-20190128" UrlPath="platform:/plugin/org.talend.designer.components.localprovider/components/tFTPConnection/commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
+			<IMPORT NAME="Java-FTPS-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" 
+				MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" 
 				REQUIRED_IF="(FTPS == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileList/tFTPFileList_messages.properties

@@ -51,4 +51,5 @@ FILES.NAME=Files
 FILES.ITEM.FILEMASK=Filemask
 MOVE_TO_THE_CURRENT_DIRECTORY.NAME=Move to the current directory
 
-USE_ENCODING.NAME=Filename encoding
+USE_ENCODING.NAME=Filename encoding
+CONNECTION_TIMEOUT.NAME=Connection timeout (milliseconds)

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

@@ -46,6 +46,7 @@ boolean ftps = false;
 
 String protectionLevel = ElementParameterParser.getValue(node, "__FTPS_PROT__");
 String protectionBufferSize = ElementParameterParser.getValue(node, "__FTPS_PROTECTION_BUFF_SIZE__");
+String timeoutValue = ElementParameterParser.getValue(node, "__CONNECTION_TIMEOUT__");
 boolean useRemoteVerification = ("true").equals(ElementParameterParser.getValue(node, "__REMOTE_VERIFICATION__"));
 
 log4jFileUtil.componentStartInfo(node);
@@ -62,6 +63,9 @@ if (("true").equals(useExistingConn)) {
 } else {
   sftp = ("true").equals(ElementParameterParser.getValue(node, "__SFTP__"));
   ftps = ("true").equals(ElementParameterParser.getValue(node, "__FTPS__"));
+%>
+  int connectionTimeout_<%=cid %> = Integer.valueOf(<%=timeoutValue %>);
+<%
 }
 
 boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
@@ -153,9 +157,9 @@ if (sftp) {  // *** sftp *** //
     	<%
 			passwordFieldName = "__PASSWORD__";
 			%>
-		
-		<%@ include file="../tFTPConnection/sftp_connect.javajet"%>
-	    
+
+		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/sftp_connect.javajet"%>
+
     <%if(use_encoding) {%>
     	c_<%=cid%>.setFilenameEncoding(<%=encoding%>);
     <%}%>
@@ -203,90 +207,18 @@ if (sftp) {  // *** sftp *** //
 	}  
 <%
 } else if (ftps) {  // *** ftps *** //
+%>
+    org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> = null;
+<%
 	if (("false").equals(useExistingConn)) {
 		String keystoreFile = ElementParameterParser.getValue(node, "__KEYSTORE_FILE__");
 		String securityMode = ElementParameterParser.getValue(node, "__SECURITY_MODE__");
 %>
-		<%@ include file="../templates/FTP/ftpsTrust.javajet"%>
-		javax.net.ssl.SSLContext sslContext_<%=cid %> = null;
-		javax.net.ssl.TrustManager[] trustManager_<%=cid %> = null;
-		javax.net.ssl.SSLSocketFactory sslSocketFactory_<%=cid %> = null;
-		org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> =null;
-		MyTrust_<%=cid %> myTrust_<%=cid%> = null;
-		try {
-			sslContext_<%=cid %> = javax.net.ssl.SSLContext.getInstance("SSL");
-			myTrust_<%=cid%> = new MyTrust_<%=cid%>();
-			trustManager_<%=cid %> = myTrust_<%=cid%>.getTrustManagers();
-			sslContext_<%=cid %>.init(null, trustManager_<%=cid %>, new java.security.SecureRandom());
-			sslSocketFactory_<%=cid %> = sslContext_<%=cid %>.getSocketFactory();
-			boolean isHTTPProxyUsed = "true".equals(System.getProperty("http.proxySet"));
-			if (isHTTPProxyUsed) {
-				String httpProxyHost = System.getProperty("http.proxyHost");
-				int httpProxyPort = Integer.getInteger("http.proxyPort");
-				String httpProxyUser = System.getProperty("http.proxyUser");
-				String httpProxyPass = System.getProperty("http.proxyPassword");
-
-				ftp_<%=cid %> = new org.talend.ftp.HTTPProxyFTPSClient(<%="IMPLICIT".equals(securityMode)%>, sslContext_<%=cid %>, httpProxyHost, httpProxyPort, httpProxyUser, httpProxyPass);
-			} else {
-				ftp_<%=cid %> = new org.talend.ftp.SSLSessionReuseFTPSClient(<%="IMPLICIT".equals(securityMode)%>, sslContext_<%=cid %>);
-			}
-			ftp_<%=cid %>.setControlEncoding(<%=encoding%>);
-
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> -FTPS security Mode is <%=securityMode%>.");
-				log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" + <%=user %>+ "'.");
-			<%}%>
-			ftp_<%=cid %>.connect(<%=host %>,<%=ftpsPort %>);
-			<%if(isLog4jEnabled){%>
-				log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-			<%}%>
-			ftp_<%=cid %>.setRemoteVerificationEnabled(<%=useRemoteVerification %>);
+		<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/ftps_connect.javajet"%>
 <%
-			passwordFieldName = "__PASSWORD__";
-%>
-
-			<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-
-			boolean isLoginSuccessful_<%=cid %> = ftp_<%=cid %>.login(<%=user %>, decryptedPassword_<%=cid%>);
-
-			if (!isLoginSuccessful_<%=cid %>) {
-				throw new RuntimeException("Login failed");
-			}
-
-			ftp_<%=cid %>.setFileType(org.apache.commons.net.ftp.FTP.BINARY_FILE_TYPE); //to calculate md5 for binary files correctly
-<%
-			if (protectionBufferSize != null && !protectionBufferSize.isEmpty() ) {
-%>
-				ftp_<%=cid %>.execPBSZ(<%=protectionBufferSize %>);
-<%
-			}
-
-			if (protectionLevel != null && !protectionLevel.isEmpty()) {
-%>
-				ftp_<%=cid %>.execPROT(<%=protectionLevel %>);
-<%
-			}
-%>
-		} catch (Exception e) {
-			<%if(isLog4jEnabled){%>
-				log.error("<%=cid%> - Can't create connection: " + e.getMessage());
-			<%}%>
-			throw e;
-		}
-<%
-		if ("PASSIVE".equals(connectMode)) {
-%>
-			ftp_<%=cid %>.enterLocalPassiveMode();
-<%
-			if (isLog4jEnabled) {
-%>
-				log.debug("<%=cid%> - Using the passive mode.");
-<%
-			}
-		}
 	} else {
 %>
-		org.apache.commons.net.ftp.FTPSClient ftp_<%=cid %> = (org.apache.commons.net.ftp.FTPSClient) globalMap.get("<%=conn %>");
+		ftp_<%=cid %> = (org.apache.commons.net.ftp.FTPSClient) globalMap.get("<%=conn %>");
 <%
 	}
 %>
@@ -341,36 +273,11 @@ if (sftp) {  // *** sftp *** //
 				log.info("<%=cid%> - Use an existing connection. Connection hostname: " + ftp_<%=cid %>.getRemoteHost() + ", Connection port: " + ftp_<%=cid %>.getRemotePort() + "."); 
 			}
 		<%}%>
-	<%} else {%>
-	    ftp_<%=cid %> = new com.enterprisedt.net.ftp.FTPClient();
-	    ftp_<%=cid %>.setRemoteHost(<%=host %>);
-	    ftp_<%=cid %>.setRemotePort(<%=port %>);
-
-		<%if(isLog4jEnabled){%>
-			log.debug("<%=cid%> - " + <%=(("ACTIVE").equals(connectMode))?"\"Using the active mode.\"":"\"Using the passive mode.\""%>);
-		<%}%>
-		<%if (("ACTIVE").equals(connectMode)) {%>
-	    	ftp_<%=cid %>.setConnectMode(com.enterprisedt.net.ftp.FTPConnectMode.ACTIVE);
-		<%} else {%>
-	    	ftp_<%=cid %>.setConnectMode(com.enterprisedt.net.ftp.FTPConnectMode.PASV);
-	    <%}%>
-		ftp_<%=cid %>.setControlEncoding(<%=encoding%>);
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Attempt to connect to '" + <%=host %> + "' with username '" +<%=user %>+ "'.");
-		<%}%>
-	    ftp_<%=cid %>.connect();
-	    
-		<%
-    	passwordFieldName = "__PASSWORD__";
-    	%> 
-    
-    	<%@ include file="@{org.talend.designer.components.localprovider}/components/templates/password.javajet"%>
-    		
-	    ftp_<%=cid %>.login(<%=username %>, decryptedPassword_<%=cid%>);
-		<%if(isLog4jEnabled){%>
-			log.info("<%=cid%> - Connect to '" + <%=host %> + "' has succeeded.");
-		<%}%>  
-	<%}%>
+    <%} else {
+        passwordFieldName = "__PASSWORD__";
+%>
+        <%@ include file="@{org.talend.designer.components.localprovider}/components/templates/FTP/ftp_connect.javajet"%>
+    <%}%>
 	<%
   //add feature 19709,add the "Transfer mode" option,
   //the default transfer mode is ASCII,we don't change the mode when ascii is choosed.

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileProperties/tFTPFileProperties_java.xml

@@ -251,6 +251,11 @@
 			NUM_ROW="95" SHOW_IF="(FTPS=='true') AND (USE_EXISTING_CONNECTION == 'false')" REPOSITORY_VALUE="REMOTE_VERIFICATION">
 			<DEFAULT>true</DEFAULT>
 		</PARAMETER>
+
+		<PARAMETER NAME="CONNECTION_TIMEOUT" FIELD="TEXT"
+			NUM_ROW="96" SHOW_IF="USE_EXISTING_CONNECTION == 'false'" REPOSITORY_VALUE="CONNECTION_TIMEOUT">
+			<DEFAULT>0</DEFAULT>
+		</PARAMETER>
 	</ADVANCED_PARAMETERS>
 
 	<CODEGENERATION>
@@ -258,8 +263,8 @@
 			<IMPORT NAME="Java-FTP" MODULE="edtftpj-2.5.0.jar" MVN="mvn:com.enterprisedt/edtftpj/2.5.0"  UrlPath="platform:/plugin/org.talend.libraries.ftp/lib/edtftpj-2.5.0.jar" REQUIRED_IF="(SFTP == 'false') AND (FTPS == 'false') AND (USE_EXISTING_CONNECTION == 'false')"/>
 			<IMPORT NAME="Java-SFTP" MODULE="jsch-0.1.55.jar" MVN="mvn:com.jcraft/jsch/0.1.55" REQUIRED_IF="(SFTP == 'true') AND (USE_EXISTING_CONNECTION == 'false')"/>
 			<IMPORT NAME="Java-FTPS" MODULE="commons-net-3.6.jar" MVN="mvn:commons-net/commons-net/3.6" REQUIRED_IF="(FTPS == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
-			<IMPORT NAME="Java-FTPS-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
-				MVN="mvn:org.talend.libraries/commons-net-ftps-proxy/3.6.1-talend-20190128" UrlPath="platform:/plugin/org.talend.designer.components.localprovider/components/tFTPConnection/commons-net-ftps-proxy-3.6.1-talend-20190128.jar" 
+			<IMPORT NAME="Java-FTPS-talend" MODULE="commons-net-ftps-proxy-3.6.1-talend-20190819.jar" 
+				MVN="mvn:org.talend.components.lib/commons-net-ftps-proxy/3.6.1-talend-20190819" 
 				REQUIRED_IF="(FTPS == 'true') AND (USE_EXISTING_CONNECTION == 'false')" />
 		</IMPORTS>
 	</CODEGENERATION>

main/plugins/org.talend.designer.components.localprovider/components/tFTPFileProperties/tFTPFileProperties_messages.properties

@@ -50,4 +50,5 @@ MODE.ITEM.ASCII=ascii
 MODE.ITEM.BINARY=binary
 MODE.NAME=Transfer mode
 
-USE_ENCODING.NAME=Filename encoding
+USE_ENCODING.NAME=Filename encoding
+CONNECTION_TIMEOUT.NAME=Connection timeout (milliseconds)