fix(TDI-41404): Avoid 64kb method issue when too many context paramet… (#3025)

* fix(TDI-41404): Avoid 64kb method issue when too many context parameter exists

* fix(TDI-41404): Regain missing warnings

PATCH_RELEASE_NOTE.md

@@ -1,64 +0,0 @@
----
-version: 7.1.1
-module: https://talend.poolparty.biz/coretaxonomy/42
-product:
-- https://talend.poolparty.biz/coretaxonomy/23
----
-
-# TPS-4399
-
-| Info             | Value |
-| ---------------- | ---------------- |
-| Patch Name       | Patch\_20201023\_TPS-4399\_v1-7.1.1 |
-| Release Date     | 2020-10-23 |
-| Target Version   | 20181026\_1147-V7.1.1 |
-| Product affected | Talend Studio |
-
-## Introduction
-
-This is a self-contained patch.
-
-**NOTE**: For information on how to obtain this patch, reach out to your Support contact at Talend.
-
-## Fixed issues
-
-This patch contains the following fixes:
-
-- TPS-4399 [7.1.1] tBigQueryInput cannot execute query within public dataset (TDI-43025)
-- TPS-4434 [7.1.1] Unable to write into Bigquery table when user defined delimiter is used
-- TBD-9137 tBigQueryInput does not support backtick in query
-
-## Prerequisites
-
-Consider the following requirements for your system:
-
-- Talend Studio 7.1.1 must be installed.
-
-## Installation
-- From the Talend Studio 7.1.1 installation folder, make a copy of the following files somewhere safe:
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryBulkExec/tBigQueryBulkExec_begin.javajet
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryBulkExec/tBigQueryBulkExec_java.xml
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/BigQueryInputQueryHelper.javajet
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/tBigQueryInput_begin.javajet
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/tBigQueryInput_end.javajet
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/tBigQueryInput_java.xml
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryOutput/tBigQueryOutput_java.xml
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryOutputBulk/tBigQueryOutputBulk_main.javajet
-- Unzip content of the patch zip onto your Talend Studio 7.1.1 folder.
-
-## Uninstallation
-
-- Replace the files overridden by the patch by the copy you made before unzipping.
-
-## Affected files for this patch
-
-The following files are installed by this patch:
-
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryBulkExec/tBigQueryBulkExec_begin.javajet
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryBulkExec/tBigQueryBulkExec_java.xml
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/BigQueryInputQueryHelper.javajet
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/tBigQueryInput_begin.javajet
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/tBigQueryInput_end.javajet
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryInput/tBigQueryInput_java.xml
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryOutput/tBigQueryOutput_java.xml
-- {Talend_Studio_path}/plugins/org.talend.designer.components.localprovider_7.1.1.20181026_1147/components/tBigQueryOutputBulk/tBigQueryOutputBulk_main.javajet

i18n/plugins/org.talend.designer.abstractmap.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.abstractmap.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.abstractmap

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap.nl</artifactId>

i18n/plugins/org.talend.designer.alfrescooutput.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.alfrescooutput.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.alfrescooutput

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.alfrescooutput.nl</artifactId>

i18n/plugins/org.talend.designer.business.diagram.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.business.diagram.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.business.diagram
 Bundle-Localization: plugin

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram.nl</artifactId>

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.designer.codegen Nl Fragment
 Bundle-SymbolicName: org.talend.designer.codegen.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.codegen
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen.nl</artifactId>

i18n/plugins/org.talend.designer.components.exchange.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.components.exchange.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.components.exchange

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange.nl</artifactId>

i18n/plugins/org.talend.designer.core.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Designer Plug-in Nl Fragment
 Bundle-SymbolicName: org.talend.designer.core.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.core
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.core.nl</artifactId>

i18n/plugins/org.talend.designer.dbmap.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.dbmap.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.dbmap

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.dbmap.nl</artifactId>

i18n/plugins/org.talend.designer.documentation.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.documentation.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.documentation

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.documentation.nl</artifactId>

i18n/plugins/org.talend.designer.fileoutputxml.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.fileoutputxml.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.fileoutputxml

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.fileoutputxml.nl</artifactId>

i18n/plugins/org.talend.designer.gefabstractmap.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.gefabstractmap.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.gefabstractmap

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.gefabstractmap.nl</artifactId>

i18n/plugins/org.talend.designer.mapper.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapper component Plug-in Nl Fragment
 Bundle-SymbolicName: org.talend.designer.mapper.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.mapper
 Bundle-Vendor: .Talend SA.

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.mapper.nl</artifactId>

i18n/plugins/org.talend.designer.maven.job.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Maven Job NL
 Bundle-SymbolicName: org.talend.designer.maven.job.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.maven.job
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.job.nl</artifactId>

i18n/plugins/org.talend.designer.rowgenerator.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rowgenerator Nl Fragment
 Bundle-SymbolicName: org.talend.designer.rowgenerator.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.rowgenerator
 Bundle-Vendor: .Talend SA.

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.rowgenerator.nl</artifactId>

i18n/plugins/org.talend.designer.runprocess.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.designer.runprocess.nl fragment
 Bundle-SymbolicName: org.talend.designer.runprocess.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.runprocess
 Bundle-Localization: plugin

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.runprocess.nl</artifactId>

i18n/plugins/org.talend.designer.scd.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.scd.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.scd

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.scd.nl</artifactId>

i18n/plugins/org.talend.designer.webservice.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.webservice.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.webservice

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.webservice.nl</artifactId>

i18n/plugins/org.talend.designer.xmlmap.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.xmlmap.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.designer.xmlmap

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.xmlmap.nl</artifactId>

i18n/plugins/org.talend.expressionbuilder.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Expression Builder Nl Fragment
 Bundle-SymbolicName: org.talend.expressionbuilder.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.expressionbuilder
 Bundle-Vendor: .Talend SA.

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.expressionbuilder.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.resource.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NL
 Bundle-SymbolicName: org.talend.presentation.onboarding.resource.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.presentation.onboarding.resource
 Bundle-Vendor: .Talend SA.

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.resource.tos.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NL
 Bundle-SymbolicName: org.talend.presentation.onboarding.resource.tos.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.presentation.onboarding.resource.tos
 Bundle-Vendor: .Talend SA.

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>

i18n/plugins/org.talend.repository.ftp.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.ftp.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.repository.ftp

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.ftp.nl</artifactId>

i18n/plugins/org.talend.repository.json.nl/META-INF/MANIFEST.MF

@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.repository.json.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.repository.json
 Bundle-Vendor: .Talend SA.

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.json.nl</artifactId>

i18n/plugins/org.talend.repository.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.repository.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.repository
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.nl</artifactId>

i18n/plugins/org.talend.repository.view.di.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.view.di.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.repository.view.di

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.view.di.nl</artifactId>

i18n/plugins/org.talend.sbi.engines.client.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.sbi.engines.client.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.sbi.engines.client

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.engines.client.nl</artifactId>

i18n/plugins/org.talend.spagic.engines.client.nl/META-INF/MANIFEST.MF

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.spagic.engines.client.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Fragment-Host: org.talend.spagic.engines.client

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.engines.client.nl</artifactId>

i18n/plugins/org.talend.sqlbuilder.nl/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.sqlbuilder Nl Fragment
 Bundle-SymbolicName: org.talend.sqlbuilder.nl
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.sqlbuilder
 Bundle-Localization: plugin

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sqlbuilder.nl</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.designer.business.feature"
       label="Business Feature"
-      version="7.1.2.qualifier"
+      version="7.2.1.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.talend.com/online/featuresdescription.html#business-feature">

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.designer.feature"
       label="Designer Feature"
-      version="7.1.2.qualifier"
+      version="7.2.1.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.talend.com/online/featuresdescription.html#designer-feature">

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.rcp.branding.tos.feature"
       label="Tos branding feature"
-      version="7.1.2.qualifier"
+      version="7.2.1.qualifier"
       provider-name=".Talend SA."
       plugin="org.talend.rcp.branding.tos">
 

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.rcp.branding.tos.test.feature"
       label="Test feature for TOS"
-      version="7.1.2.qualifier">
+      version="7.2.1.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.repository.feature"
       label="Repository Feature"
-      version="7.1.2.qualifier"
+      version="7.2.1.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.talend.com/online/featuresdescription.html#repository-feature">
@@ -109,12 +109,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="org.talend.libraries.jdbc.jtds"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="org.talend.libraries.jdbc.mysql"
          download-size="0"

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.sbi.feature"
       label="SBI Feature"
-      version="7.1.2.qualifier"
+      version="7.2.1.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.talend.com/online/featuresdescription.html#sbi-feature">

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.spagic.feature"
       label="SPAGIC Feature"
-      version="7.1.2.qualifier"
+      version="7.2.1.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.talend.com/online/featuresdescription.html#spagic-feature">

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.tos.components.feature"
       label="Components-feature"
-      version="7.1.2.qualifier">
+      version="7.2.1.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.components.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.tos.core.feature"
       label="Feature"
-      version="7.1.2.qualifier">
+      version="7.2.1.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.core.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.tos.feature"
       label="Tos feature"
-      version="7.1.2.qualifier"
+      version="7.2.1.qualifier"
       provider-name=".Talend SA.">
 
    <description url="http://www.example.com/description">

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.tos.libraries.feature"
       label="Libraries_feature"
-      version="7.1.2.qualifier">
+      version="7.2.1.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.libraries.feature</artifactId>

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract Map Plug-in
 Bundle-SymbolicName: org.talend.designer.abstractmap;singleton:=true
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-Activator: org.talend.designer.abstractmap.MapPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.talend.core,

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap</artifactId>

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Alfresco Output Component Plug-in
 Bundle-SymbolicName: org.talend.designer.alfrescooutput;singleton:=true
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-Vendor: .Talend SA.
 Require-Bundle: org.eclipse.core.runtime,
  org.talend.core,

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.alfrescooutput</artifactId>

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.talend.designer.business.diagram; singleton:=true
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.talend.designer.business.model.business.diagram.part.BusinessDiagramEditorPlugin
 Bundle-Vendor: %providerName

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram</artifactId>

main/plugins/org.talend.designer.business.diagram/src/org/talend/designer/business/diagram/views/link/BusinessModelsRepoViewLinker.java

@@ -45,8 +45,8 @@ public class BusinessModelsRepoViewLinker extends AbstractRepositoryEditorInputL
      * java.lang.String)
      */
     @Override
-    public boolean isRelation(IEditorInput editorInput, String repoNodeId) {
-        return super.isRelation(getRealEditorInput(editorInput), repoNodeId);
+    public boolean isRelation(IEditorInput editorInput, String repoNodeProjectTechLabel, String repoNodeId) {
+        return super.isRelation(getRealEditorInput(editorInput), repoNodeProjectTechLabel, repoNodeId);
     }
 
     private RepositoryEditorInput getRealEditorInput(IEditorInput editorInput) {

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CodeGen Plug-in
 Bundle-SymbolicName: org.talend.designer.codegen;singleton:=true
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.talend.core.repository,
  org.eclipse.emf.codegen,

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

@@ -506,14 +506,11 @@
             if (inContext == null) {
                 inContext = <%=className%>.class.getClassLoader().getResourceAsStream("config/contexts/" + contextStr + ".properties");
             }
-            if (inContext != null) {
+            if (inContext != null && context != null && context.isEmpty()) {
                 //defaultProps is in order to keep the original context value
-                if(context != null && context.isEmpty()) {
-	                defaultProps.load(inContext);
-	                context = new ContextProperties(defaultProps);
-                }
-                
+                defaultProps.load(inContext);
                 inContext.close();
+                context = new ContextProperties(defaultProps);
             } else if (!isDefaultContext) {
                 //print info and job continue to run, for case: context_param is not empty.
                 System.err.println("Could not find the context " + contextStr);
@@ -537,7 +534,7 @@
             class ContextProcessing {
                 private void processContext_0() {
 <%
-                    for (int i = 1; i <= params.size(); i++) {
+                    for (int i = 1; i < params.size(); i++) {
                         IContextParameter ctxParam = params.get(i-1);
                         if (i % maxContextInOneMethodToProcess == 0) {
                             /* close previous method and declare new */
@@ -1195,11 +1192,13 @@ if (execStat) {
             } else {
                 type = "ftp";
             }
-            if ("sftp".equals(type)) { %>
+            if ("ftp".equals(type)) { %>
+                ((com.enterprisedt.net.ftp.FTPClient) obj_conn).quit();
+        <%} else if ("sftp".equals(type)) { %>
                 ((com.jcraft.jsch.ChannelSftp) obj_conn).quit();
-            <%} else { %>
-                ((org.apache.commons.net.ftp.FTPClient) obj_conn).disconnect();
-            <%}%>
+        <%} else { %>
+                ((org.apache.commons.net.ftp.FTPSClient) obj_conn).disconnect();
+        <%}%>
             }
 <%  } %>
         } catch (java.lang.Exception e) {

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

@@ -69,140 +69,145 @@ if(hasInput){
 	    	}
 	   	}
    	}
-   	
+
    	boolean hasValidInput = inputConn!=null;
-    if (hasValidInput) {
+
+   	IMetadataTable metadata = null;
+    List<IMetadataTable> metadatas = node.getMetadataList();
+    boolean haveValidNodeMetadata = ((metadatas != null) && (metadatas.size() > 0) && (metadata = metadatas.get(0)) != null);
+
+    if (hasValidInput && haveValidNodeMetadata) {
         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 (input_columnList!=null && !input_columnList.isEmpty()) {
+            // add incoming (not present) columns to enforcer for this comps
+            if (cid.contains("tDataStewardship") || cid.contains("tMarkLogic")){
                 %>
-                    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;
+                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));
+                if (shouldCreateRuntimeSchemaForIncomingNode){
+                    incomingEnforcer_<%=cid%>.createRuntimeSchema();
                 }
                 <%
             }
-        } // column
+            // 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.
 
-        // 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.
+            int dynamicPos = -1;
+	        for (int i = 0; i < input_columnList.size(); i++) {
+	            if (input_columnList.get(i).getTalendType().equals("id_Dynamic")) {
+	                dynamicPos = i;
+	                break;
+	            }
+	        }
 
-        // 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);
+            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);
+            			}
         			}
-    			}
-			} // 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){
+    			} // property
+			} // propInfo
+            
             %>
-        	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%>);
-              	}
-                }
-        <%
+            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%>);
+                  	}
+                    }
+            <%
+            }
         }
     }
 } // canStart

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

@@ -62,8 +62,6 @@ class IndexedRecordToRowStructGenerator {
             %>
             boolean <%=codeVarIsDynamicInitialized%> = false;
             routines.system.Dynamic <%=codeVarDynamic%> = new routines.system.Dynamic();
-			//Workaround for TDI-44051, TcimpV0 do not need DbmsID
-			<%=codeVarDynamic%>.setDbmsId("<%=cid%>");
             <%
         }
 
@@ -117,11 +115,10 @@ class IndexedRecordToRowStructGenerator {
                 for (org.apache.avro.Schema.Field dynamicField_<%=cid%> : dynSchema_<%=cid%>.getFields()){
                     routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = new routines.system.DynamicMetadata();
                     org.apache.avro.Schema dynamicFieldSchema_<%=cid%> = dynamicField_<%=cid%>.schema();
-					String dbName = dynamicField_<%=cid%>.getProp("talend.field.dbColumnName");
                     // set name
                     dynamicMetadata_<%=cid%>.setName(dynamicField_<%=cid%>.name());
                     // set db name
-                    dynamicMetadata_<%=cid%>.setDbName(dbName==null?dynamicField_<%=cid%>.name():dbName);
+                    dynamicMetadata_<%=cid%>.setDbName(dynamicField_<%=cid%>.name());
                     // set nullable
                     if (org.talend.daikon.avro.AvroUtils.isNullable(dynamicFieldSchema_<%=cid%>)) {
                         dynamicMetadata_<%=cid%>.setNullable(true);

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);
+boolean talendEsbJob = talendEsbJobFactory || actAsConsumer || ProcessorUtilities.isEsbJob(process.getId(), process.getVersion());
 
 boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));
 
@@ -512,8 +512,6 @@ private class TalendException extends Exception {
 
 			if(!(e instanceof TDieException)){
 <%
-		boolean needCatchTalendException = false;
-		
 		if (process.getNodesOfType("tLogCatcher").size() > 0) {
 			List<INode> logCatchers = (List<INode>)process.getNodesOfType("tLogCatcher");
 			for (INode logCatcher : logCatchers) {
@@ -545,7 +543,6 @@ private class TalendException extends Exception {
 				if (ElementParameterParser.getValue(logCatcher, "__CATCH_JAVA_EXCEPTION__").equals("true")) {
 					if(logCatcher!=virtualNCatchNode){
 					// 2) launch logCatcher subProcess
-					needCatchTalendException =  true;
 %>
 				<%=logCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 <%
@@ -558,7 +555,6 @@ private class TalendException extends Exception {
 <%
 			}
 			if(virtualNCatchNode!=null){
-				needCatchTalendException =  true;
 %>
 				<%=virtualNCatchNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 <%
@@ -572,12 +568,31 @@ private class TalendException extends Exception {
 %>
 			}
 <%
+		boolean needCatchTalendException = false;
+		if (process.getNodesOfType("tLogCatcher").size() > 0) {
+			for(INode node:process.getNodesOfType("tLogCatcher")){
+				if(ElementParameterParser.getValue(node, "__CATCH_JAVA_EXCEPTION__").equals("true")){
+					needCatchTalendException = true;
+					break;
+				}
+			}
+		}
+
+		if ((!needCatchTalendException) && (process.getNodesOfType("tAssertCatcher").size() > 0)) {
+			for(INode node:process.getNodesOfType("tAssertCatcher")){
+				if(ElementParameterParser.getValue(node, "__CATCH_JAVA_EXCEPTION__").equals("true")){
+					needCatchTalendException = true;
+					break;
+				}
+			}
+		}
 		if(needCatchTalendException) {
-			//TODO should catch the TalendException in assertcatcher process? but before should not work too as use java reflect, this exception can't catch
-			%>
-			} catch (TalendException e) {
-				// do nothing
-			<%
+			if (process.getNodesOfType("tLogCatcher").size() > 0) {
+				%>
+				} catch (TalendException e) {
+					// do nothing
+				<%
+			}
 		}
 %>
 		} catch (Exception e) {

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen</artifactId>

main/plugins/org.talend.designer.codegen/src/main/java/messages.properties

@@ -48,7 +48,6 @@ ComponentsFactory.componentNotFound=Component folder not found\:
 ComponentsFactory.load.components=Load Components...
 ComponentsFactory.parentNotRecompiled=Warning\: parents of *.inc.javajet are not recompiled \!
 ComponentsFactory.loadComponents.missingFolder=The folder "{0}" is missing in the plugin "{1}".
-ComponentsFactory.init.waitForFinish.timeout=Can't initialise ComponentsFactory, please try again.
 ComponentsLocalProviderService.componentLoadError=Component load error
 ComponentsLocalProviderService.talendExchangeError=Talend Exchange Error
 ComponentsPreferencePage.ButtonLabel0=Ok 

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/components/model/ComponentsFactory.java

@@ -30,11 +30,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
 import java.util.Set;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Level;
@@ -144,119 +139,66 @@ public class ComponentsFactory implements IComponentsFactory {
     private static boolean cleanDone = false;
 
     protected static Map<String, Map<String, Set<IComponent>>> componentNameMap;
-    
-    private AtomicBoolean isInitialising;
-    
-    private volatile Lock initialiseLock;
 
     public ComponentsFactory() {
-        isInitialising = new AtomicBoolean(false);
-        initialiseLock = new ReentrantLock();
     }
 
     private void init(boolean duringLogon) {
-        if (wait4InitialiseFinish()) {
-            return;
-        }
+        removeOldComponentsUserFolder(); // not used anymore
+        long startTime = System.currentTimeMillis();
+
+        // TimeMeasure.display = true;
+        // TimeMeasure.displaySteps = true;
+        // TimeMeasure.measureActive = true;
+        // TimeMeasure.begin("initComponents");
+        componentList = Collections.synchronizedSet(new HashSet<IComponent>());
+        customComponentList = new HashSet<IComponent>();
+        skeletonList = new ArrayList<String>();
+        userComponentList = new HashSet<IComponent>();
+        String installLocation = new Path(Platform.getConfigurationLocation().getURL().getPath()).toFile().getAbsolutePath();
+        componentToProviderMap = new HashMap<IComponent, AbstractComponentsProvider>();
+        boolean isNeedClean = !cleanDone && TalendCacheUtils.isSetCleanComponentCache();
+        cleanDone = true; // only check this parameter one time, or it will reinitialize things all the time...
+        isCreated = hasComponentFile(installLocation) && !isNeedClean;
+        ComponentsCache cache = ComponentManager.getComponentCache();
         try {
-            try {
-                initialiseLock.lock();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-            isInitialising.set(true);
-            removeOldComponentsUserFolder(); // not used anymore
-            long startTime = System.currentTimeMillis();
-
-            // TimeMeasure.display = true;
-            // TimeMeasure.displaySteps = true;
-            // TimeMeasure.measureActive = true;
-            // TimeMeasure.begin("initComponents");
-            componentList = Collections.synchronizedSet(new HashSet<IComponent>());
-            customComponentList = new HashSet<IComponent>();
-            skeletonList = new ArrayList<String>();
-            userComponentList = new HashSet<IComponent>();
-            String installLocation = new Path(Platform.getConfigurationLocation().getURL().getPath()).toFile().getAbsolutePath();
-            componentToProviderMap = new HashMap<IComponent, AbstractComponentsProvider>();
-            boolean isNeedClean = !cleanDone && TalendCacheUtils.isSetCleanComponentCache();
-            cleanDone = true; // only check this parameter one time, or it will reinitialize things all the time...
-            isCreated = hasComponentFile(installLocation) && !isNeedClean;
-            ComponentsCache cache = ComponentManager.getComponentCache();
-            try {
-                if (isCreated) {
-                    // if cache is created and empty, means we never loaded it before.
-                    // if it was already loaded, then no need to go again, since it's a static variable, it's still in
-                    // memory.
-                    // it avoids to reload from disk again even more for commandline at each logon, since it's no use.
-                    if (cache.getComponentEntryMap().isEmpty()) {
-                        ComponentsCache loadCache = loadComponentResource(installLocation);
-                        cache.getComponentEntryMap().putAll(loadCache.getComponentEntryMap());
-                    }
-                } else {
-                    cache.getComponentEntryMap().clear();
+            if (isCreated) {
+                // if cache is created and empty, means we never loaded it before.
+                // if it was already loaded, then no need to go again, since it's a static variable, it's still in
+                // memory.
+                // it avoids to reload from disk again even more for commandline at each logon, since it's no use.
+                if (cache.getComponentEntryMap().isEmpty()) {
+                    ComponentsCache loadCache = loadComponentResource(installLocation);
+                    cache.getComponentEntryMap().putAll(loadCache.getComponentEntryMap());
                 }
-            } catch (IOException e) {
-                ExceptionHandler.process(e);
+            } else {
                 cache.getComponentEntryMap().clear();
-                isCreated = false;
             }
-
-            loadComponentsFromComponentsProviderExtension();
-
-            // TimeMeasure.step("initComponents", "loadComponentsFromProvider");
-            // 2.Load Component from extension point: component_definition
-            loadComponentsFromExtensions();
-            // TimeMeasure.step("initComponents", "loadComponentsFromExtension[joblets?]");
-
-            ComponentManager.saveResource(); // will save only if needed.
-
-            // init component name map, used to pick specified component immediately
-            initComponentNameMap();
-
-            // TimeMeasure.step("initComponents", "createCache");
-            log.debug(componentList.size() + " components loaded in " + (System.currentTimeMillis() - startTime) + " ms"); //$NON-NLS-1$ //$NON-NLS-2$
-
-            // TimeMeasure.end("initComponents");
-            // TimeMeasure.display = false;
-            // TimeMeasure.displaySteps = false;
-            // TimeMeasure.measureActive = false;
-        } finally {
-            isInitialising.set(false);
-            initialiseLock.unlock();
+        } catch (IOException e) {
+            ExceptionHandler.process(e);
+            cache.getComponentEntryMap().clear();
+            isCreated = false;
         }
-    }
 
-    private boolean wait4InitialiseFinish() {
-        if (isInitialising.get()) {
-            try {
-                // wait for 10 min (10 * 60 seconds) by default
-                long timeout = 600L;
-                String timeoutStr = System.getProperty("studio.componentsFactory.init.timeout"); //$NON-NLS-1$
-                if (!StringUtils.isBlank(timeoutStr)) {
-                    try {
-                        timeout = Long.valueOf(timeoutStr);
-                    } catch (Exception e) {
-                        ExceptionHandler.process(e);
-                    }
-                }
-                if (initialiseLock.tryLock(timeout, TimeUnit.SECONDS)) {
-                    initialiseLock.unlock();
-                } else {
-                    // may be track in dead lock, throw exception to try to break dead lock
-                    throw new RuntimeException(Messages.getString("ComponentsFactory.init.waitForFinish.timeout")); //$NON-NLS-1$
-                }
-                // initialise successfully or not
-                return !isInitialising.get();
-            } catch (RuntimeException e) {
-                throw e;
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
-            }
-        }
-        // initialise failed, still need to initialise
-        return false;
+        loadComponentsFromComponentsProviderExtension();
+
+        // TimeMeasure.step("initComponents", "loadComponentsFromProvider");
+        // 2.Load Component from extension point: component_definition
+        loadComponentsFromExtensions();
+        // TimeMeasure.step("initComponents", "loadComponentsFromExtension[joblets?]");
+
+        ComponentManager.saveResource(); // will save only if needed.
+
+        // init component name map, used to pick specified component immediately
+        initComponentNameMap();
+
+        // TimeMeasure.step("initComponents", "createCache");
+        log.debug(componentList.size() + " components loaded in " + (System.currentTimeMillis() - startTime) + " ms"); //$NON-NLS-1$ //$NON-NLS-2$
+
+        // TimeMeasure.end("initComponents");
+        // TimeMeasure.display = false;
+        // TimeMeasure.displaySteps = false;
+        // TimeMeasure.measureActive = false;
     }
 
     protected void initComponentNameMap() {
@@ -787,8 +729,7 @@ public class ComponentsFactory implements IComponentsFactory {
     }
 
     @Override
-    public int size() {
-        wait4InitialiseFinish();
+    public synchronized int size() {
         if (componentList == null) {
             init(false);
         }
@@ -796,8 +737,7 @@ public class ComponentsFactory implements IComponentsFactory {
     }
 
     @Override
-    public IComponent get(String name) {
-        wait4InitialiseFinish();
+    public synchronized IComponent get(String name) {
         if (componentList == null) {
             init(false);
         }
@@ -817,8 +757,7 @@ public class ComponentsFactory implements IComponentsFactory {
      * @see org.talend.core.model.components.IComponentsFactory#get(java.lang.String, java.lang.String)
      */
     @Override
-    public IComponent get(String name, String paletteType) {
-        wait4InitialiseFinish();
+    public synchronized IComponent get(String name, String paletteType) {
         if (componentList == null) {
             init(false);
         }
@@ -833,7 +772,6 @@ public class ComponentsFactory implements IComponentsFactory {
 
     @Override
     public IComponent getJobletComponent(String name, String paletteType) {
-        wait4InitialiseFinish();
         if (componentList == null) {
             init(false);
         }
@@ -861,7 +799,6 @@ public class ComponentsFactory implements IComponentsFactory {
     @Override
     public void initializeComponents(IProgressMonitor monitor) {
         this.monitor = monitor;
-        wait4InitialiseFinish();
         if (componentList == null) {
             init(false);
         }
@@ -872,7 +809,6 @@ public class ComponentsFactory implements IComponentsFactory {
     @Override
     public void initializeComponents(IProgressMonitor monitor, boolean duringLogon) {
         this.monitor = monitor;
-        wait4InitialiseFinish();
         if (componentList == null) {
             init(duringLogon);
         }
@@ -886,18 +822,12 @@ public class ComponentsFactory implements IComponentsFactory {
      * @see org.talend.core.model.components.IComponentsFactory#getComponents()
      */
     @Override
-    public Set<IComponent> getComponents() {
-        wait4InitialiseFinish();
+    public synchronized Set<IComponent> getComponents() {
         if (componentList == null) {
             init(false);
         }
         return componentList;
     }
-    
-    @Override
-    public boolean isInitialising() {
-        return isInitialising.get();
-    }
 
     @Override
     public Collection<IComponent> readComponents() {
@@ -910,8 +840,7 @@ public class ComponentsFactory implements IComponentsFactory {
     }
 
     @Override
-    public Map<String, Map<String, Set<IComponent>>> getComponentNameMap() {
-        wait4InitialiseFinish();
+    public synchronized Map<String, Map<String, Set<IComponent>>> getComponentNameMap() {
         if (componentNameMap == null) {
             init(false);
         }
@@ -919,8 +848,7 @@ public class ComponentsFactory implements IComponentsFactory {
     }
 
     @Override
-    public List<IComponent> getCustomComponents() {
-        wait4InitialiseFinish();
+    public synchronized List<IComponent> getCustomComponents() {
         if (customComponentList == null) {
             init(false);
         }
@@ -934,7 +862,6 @@ public class ComponentsFactory implements IComponentsFactory {
      */
     @Override
     public List<String> getSkeletons() {
-        wait4InitialiseFinish();
         if (skeletonList == null) {
             init(false);
         }
@@ -973,7 +900,6 @@ public class ComponentsFactory implements IComponentsFactory {
                 jobletService.clearSparkStreamingJobletComponent();
             }
         }
-        isInitialising.set(false);
     }
 
     @Override

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Exchange Plug-in
 Bundle-SymbolicName: org.talend.designer.components.exchange;singleton:=true
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Bundle-Activator: org.talend.designer.components.exchange.ExchangePlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,

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.1.2-SNAPSHOT</version>
+    <version>7.2.1-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange</artifactId>

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Components Libs Plug-in
 Bundle-SymbolicName: org.talend.designer.components.libs
-Bundle-Version: 7.1.2.qualifier
+Bundle-Version: 7.2.1.qualifier
 Require-Bundle: org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: .Talend SA.

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

@@ -1,50 +0,0 @@
-<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>
-    <artifactId>commons-net-ftps-proxy</artifactId>
-    <version>3.6.1-talend-20190128</version>
-
-    <name>commons-net-talend</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>commons-net</groupId>
-            <artifactId>commons-net</artifactId>
-            <version>3.6</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
-    </properties>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>talend_nexus_deployment</id>
-            <url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-            <snapshots><enabled>true</enabled></snapshots>
-            <releases><enabled>false</enabled></releases>
-        </snapshotRepository>
-        <repository>
-            <id>talend_nexus_deployment</id>
-            <url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
-            <snapshots><enabled>false</enabled></snapshots>
-            <releases><enabled>true</enabled></releases>
-        </repository>
-    </distributionManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-</project>

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

@@ -1,309 +0,0 @@
-package org.talend.ftp;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Inet6Address;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSocket;
-
-import org.apache.commons.net.ftp.FTPCmd;
-import org.apache.commons.net.ftp.FTPReply;
-import org.apache.commons.net.util.Base64;
-
-public class HTTPProxyFTPSClient extends SSLSessionReuseFTPSClient {
-
-    /** Default PROT Command */
-    private static final String DEFAULT_PROT = "C";
-
-    private final String proxyHost;
-
-    private final int proxyPort;
-
-    private final String proxyUsername;
-
-    private final String proxyPassword;
-
-    private SSLContext context;
-
-    private String protectionLevel;
-
-    private String tunnelHost; // Save the host when setting up a tunnel (needed for EPSV)
-
-    private static final byte[] CRLF = { '\r', '\n' };
-
-    private final Base64 base64 = new Base64();
-
-    public HTTPProxyFTPSClient(boolean isImplicit, SSLContext context, String proxyHost, int proxyPort, String proxyUser,
-            String proxyPass) {
-        super(isImplicit, context);
-        this.proxyHost = proxyHost;
-        this.proxyPort = proxyPort;
-        this.proxyUsername = proxyUser;
-        this.proxyPassword = proxyPass;
-        this.tunnelHost = null;
-        this.context = context;
-        this.protectionLevel = DEFAULT_PROT;
-    }
-
-    /**
-     * Call execPROT from Parent class and stores current protection level
-     *
-     * @see org.apache.commons.net.ftp.FTPSClient#execPROT(String)
-     */
-    @Override
-    public void execPROT(String prot) throws SSLException, IOException {
-        super.execPROT(prot);
-        this.protectionLevel = prot;
-    }
-
-    /**
-     * @see org.apache.commons.net.SocketClient#connect(java.lang.String, int)
-     */
-    @Override
-    public void connect(String host, int port) throws IOException {
-
-        _socket_ = new Socket(proxyHost, proxyPort);
-        _input_ = _socket_.getInputStream();
-        _output_ = _socket_.getOutputStream();
-
-        try {
-            tunnelHandshake(host, port, _input_, _output_);
-        } catch (Exception e) {
-            throw new IOException("Could not connect to " + host + " using port " + port, e);
-        }
-
-        super._connectAction_();
-    }
-
-    /**
-     * Open ssl socket (if private protection level selected) using tunnel socket
-     *
-     * @see org.apache.commons.net.ftp.FTPSClient#_openDataConnection_(java.lang.String, java.lang.String)
-     */
-    @Override
-    protected Socket _openDataConnection_(String command, String arg) throws IOException {
-        //Force local passive mode, active mode not supported by through proxy
-        if (getDataConnectionMode() != PASSIVE_LOCAL_DATA_CONNECTION_MODE) {
-            throw new IllegalStateException("Only passive connection mode supported using proxy");
-        }
-
-        final boolean isInet6Address = getRemoteAddress() instanceof Inet6Address;
-        String passiveHost;
-
-        // Try EPSV command first on IPv6 - and IPv4 if enabled.
-        // When using IPv4 with NAT it has the advantage
-        // to work with more rare configurations.
-        // E.g. if FTP server has a static PASV address (external network)
-        // and the client is coming from another internal network.
-        // In that case the data connection after PASV command would fail,
-        // while EPSV would make the client succeed by taking just the port.
-        boolean attemptEPSV = isUseEPSVwithIPv4() || isInet6Address;
-
-        if (attemptEPSV && epsv() == FTPReply.ENTERING_EPSV_MODE) {
-            _parseExtendedPassiveModeReply(_replyLines.get(0));
-            passiveHost = this.tunnelHost;
-        } else {
-            if (isInet6Address) {
-                return null; // Must use EPSV for IPV6
-            }
-
-            // If EPSV failed on IPV4, revert to PASV
-            if (pasv() != FTPReply.ENTERING_PASSIVE_MODE) {
-                return null;
-            }
-
-            _parsePassiveModeReply(_replyLines.get(0));
-            passiveHost = this.getPassiveHost();
-        }
-
-        return DEFAULT_PROT.equals(protectionLevel) ?
-                openPlainDataConnection(passiveHost, command, arg) : openEncryptedDataConnection(passiveHost, command, arg);
-    }
-
-    /**
-     * Create, configure and open SSLSocket via plain tunnel Socket
-     * @param passiveHost host returned from ftp server after sending PASV command
-     * @param command to execute
-     * @param arg for command
-     * @return SSLSocket using to Data transmit
-     * @throws IOException
-     */
-    private Socket openEncryptedDataConnection(String passiveHost, String command, String arg) throws IOException {
-        Socket proxySocket = createTunnelSocket();
-
-        proxySocket.connect(new InetSocketAddress(proxyHost, proxyPort), getConnectTimeout());
-
-        tunnelHandshake(passiveHost, this.getPassivePort(), proxySocket.getInputStream(),
-                proxySocket.getOutputStream());
-        Socket socket = context.getSocketFactory().createSocket(proxySocket, passiveHost, this.getPassivePort(), true);
-        _prepareDataSocket_(socket);
-
-        configureDataSocket(socket);
-
-        if (isRestartOffsetIncorrect()) {
-            proxySocket.close();
-            socket.close();
-            return null;
-        }
-
-        if (!FTPReply.isPositivePreliminary(sendCommand(command, arg))) {
-            proxySocket.close();
-            socket.close();
-            return null;
-        }
-
-        if (socket instanceof SSLSocket) {
-            SSLSocket sslSocket = (SSLSocket) socket;
-            configureSSLDataSocket(sslSocket);
-            sslSocket.startHandshake();
-        }
-
-        return socket;
-    }
-
-    private Socket createTunnelSocket() throws IOException {
-        Socket proxySocket = new Socket();
-
-        configureDataSocket(proxySocket);
-
-        return proxySocket;
-    }
-
-    private void configureSSLDataSocket(SSLSocket sslSocket) {
-        sslSocket.setUseClientMode(getUseClientMode());
-        sslSocket.setEnableSessionCreation(getEnableSessionCreation());
-
-        // server mode
-        if (!getUseClientMode()) {
-            sslSocket.setNeedClientAuth(getNeedClientAuth());
-            sslSocket.setWantClientAuth(getWantClientAuth());
-        }
-
-        if (getEnabledCipherSuites() != null) {
-            sslSocket.setEnabledCipherSuites(getEnabledCipherSuites());
-        }
-
-        if (getEnabledProtocols() != null) {
-            sslSocket.setEnabledProtocols(getEnabledProtocols());
-        }
-    }
-
-    private void configureDataSocket(Socket socket) throws IOException {
-        if (getReceiveDataSocketBufferSize() > 0) {
-            socket.setReceiveBufferSize(getReceiveDataSocketBufferSize());
-        }
-
-        if (getSendDataSocketBufferSize() > 0) {
-            socket.setSendBufferSize(getSendDataSocketBufferSize());
-        }
-
-        if (getPassiveLocalIPAddress() != null) {
-            socket.bind(new InetSocketAddress(getPassiveLocalIPAddress(), 0));
-        }
-    }
-
-    /**
-     * @see org.apache.commons.net.ftp.FTPHTTPClient#_openDataConnection_(FTPCmd, String)
-     * @return Plain Socket using HTTP proxy
-     */
-    private Socket openPlainDataConnection(String passiveHost, String command, String arg) throws IOException {
-        Socket socket = preparePlainDataTunnelSocket(passiveHost);
-
-        if (isRestartOffsetIncorrect()) {
-            socket.close();
-            return null;
-        }
-
-        if (!FTPReply.isPositivePreliminary(sendCommand(command, arg))) {
-            socket.close();
-            return null;
-        }
-
-        return socket;
-    }
-
-    /**
-     * Create, prepare and connect plain data transmit socket via tunnel proxy
-     */
-    private Socket preparePlainDataTunnelSocket(String passiveHost) throws IOException {
-        Socket socket = _socketFactory_.createSocket(proxyHost, proxyPort);
-        InputStream is = socket.getInputStream();
-        OutputStream os = socket.getOutputStream();
-        tunnelHandshake(passiveHost, this.getPassivePort(), is, os);
-
-        return socket;
-    }
-
-    /**
-     * HTTP handshake for proxy
-     */
-    private void tunnelHandshake(String host, int port, InputStream input, OutputStream output) throws IOException {
-        final String connectString = "CONNECT " + host + ":" + port + " HTTP/1.1";
-        final String hostString = "Host: " + host + ":" + port;
-
-        this.tunnelHost = host;
-        output.write(connectString.getBytes(StandardCharsets.UTF_8));
-        output.write(CRLF);
-        output.write(hostString.getBytes(StandardCharsets.UTF_8));
-        output.write(CRLF);
-
-        if (proxyUsername != null && proxyPassword != null) {
-            final String auth = proxyUsername + ":" + proxyPassword;
-            final String header =
-                    "Proxy-Authorization: Basic " + base64.encodeToString(auth.getBytes(StandardCharsets.UTF_8));
-            output.write(header.getBytes(StandardCharsets.UTF_8));
-        }
-
-        output.write(CRLF);
-        output.flush();
-
-        List<String> response = new ArrayList<>();
-        BufferedReader reader = new BufferedReader(new InputStreamReader(input, getCharset()));
-        String responseLine;
-        while ((responseLine = reader.readLine()) != null && responseLine.length() > 0) {
-            response.add(responseLine);
-        }
-
-        int size = response.size();
-
-        if (size == 0) {
-            throw new IOException("No response from proxy");
-        }
-
-        String code;
-        String resp = response.get(0);
-
-        if (resp.startsWith("HTTP/") && resp.length() >= 12) {
-            code = resp.substring(9, 12);
-        } else {
-            throw new IOException("Invalid response from proxy: " + resp);
-        }
-
-        if (!"200".equals(code)) {
-            StringBuilder msg = new StringBuilder();
-            msg.append("HTTPTunnelConnector: connection failed\r\n");
-            msg.append("Response received from the proxy:\r\n");
-
-            for (String line : response) {
-                msg.append(line);
-                msg.append("\r\n");
-            }
-
-            throw new IOException(msg.toString());
-        }
-    }
-
-    private boolean isRestartOffsetIncorrect() throws IOException {
-        return (getRestartOffset() > 0) && !restart(getRestartOffset());
-    }
-}

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

@@ -1,43 +0,0 @@
-package org.talend.ftp;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.Socket;
-import java.util.Locale;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSessionContext;
-import javax.net.ssl.SSLSocket;
-
-import org.apache.commons.net.ftp.FTPSClient;
-
-public class SSLSessionReuseFTPSClient extends FTPSClient {
-
-    public SSLSessionReuseFTPSClient(boolean isImplicit, SSLContext context) {
-        super(isImplicit, context);
-    }
-
-    @Override
-    protected void _prepareDataSocket_(final Socket socket) {
-        if (socket instanceof SSLSocket) {
-            final SSLSession session = ((SSLSocket) _socket_).getSession();
-            final SSLSessionContext context = session.getSessionContext();
-            try {
-                final Field sessionHostPortCache = context.getClass().getDeclaredField("sessionHostPortCache");
-                sessionHostPortCache.setAccessible(true);
-                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);
-                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.5-talend</version>
+   <version>2.4.1-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,7 +15,6 @@
  */
 package net.sf.json.util;
 
-import java.math.BigDecimal;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONException;
 import net.sf.json.JSONNull;
@@ -415,7 +414,7 @@ public class JSONTokener {
          }
 
          try{
-            return  createNumber(s);
+            return NumberUtils.createNumber(s);
          }catch( Exception e ){
             return s;
          }
@@ -436,26 +435,6 @@ 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.
     *