fix(TDI-47230): avoid create thread for every task for twritexmlfield/twritejsonfield in loop (#7235)

fix bug TUP-33497

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

@@ -9,4 +9,4 @@
   </parent>
   <artifactId>org.talend.gmf.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-</project>
+</project>

main/features/org.talend.studio.components.tcompv0.azurestorage.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.azurestorage.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.azurestorage.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.googledrive.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.googledrive.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.googledrive.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.jira.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.jira.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.jira.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.marketo.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.marketo.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.marketo.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.marklogic.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.marklogic.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.marklogic.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.netsuite.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.netsuite.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.netsuite.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.salesforce.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.salesforce.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.salesforce.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.snowflake.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.snowflake.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.snowflake.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.studio.components.tcompv0.splunk.feature/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tdi-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.studio.components.tcompv0.splunk.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tdi-studio-se</artifactId>
+    <version>8.0.1-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.studio.components.tcompv0.splunk.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -43,7 +43,6 @@
   <plugin id="org.talend.libraries.palo" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.persist.lookup" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.libraries.salesforce" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.servlet" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.slf4j" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.xml" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.zmq" download-size="0" install-size="0" version="0.0.0"/>

main/plugins/org.talend.designer.abstractmap/src/java/main/messages_en.properties

@@ -1,20 +0,0 @@
-prefs.configuration.LINK_STYLE.AUTO=Auto
-prefs.configuration.title=Map components preferences :
-prefs.configuration.LINK_STYLE.LINE=Lines (fast)
-prefs.configuration.LINK_STYLE.BEZIER_CURVE=Curves
-prefs.configuration.LINK_STYLE=Default mapping links display as :
-DraggingInfosPopup.draggingEntry=Dragging {0} entry.
-DraggingInfosPopup.dropInvalid=\n<< Drop invalid >>\n
-DraggingInfosPopup.draggingEntries=Dragging {0} entries.
-DraggingInfosPopup.dropInvalidWithKey=\n<< Drop invalid >>\nPress both Shift and Ctrl keys to map one to one and overwrite
-DraggingInfosPopup.overwriteMode=\ > Overwrite mode
-DraggingInfosPopup.appendMode=\ > Append mode
-DraggingInfosPopup.appendModeToOverwrite=\ > Append mode (Ctrl key to overwrite)
-DraggingInfosPopup.insertAllSelectedEntries=\ > Insert all selected entries
-DraggingInfosPopup.insertRemainingEntries=\ > Insert remaining entries
-DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> Each source entry expression to each target expression
-DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> Each source entry to each target expression
-DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> All source entries expression to a single one target expression (Shift key to change mapping)
-DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpression=> All source entries expression to a single one target expression
-DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpressionShiftKey=> All source entries to a single one target expression (Shift key to change mapping)
-DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpression=> All source entries to a single one target expression

main/plugins/org.talend.designer.abstractmap/src/java/main/messages_ja.properties

@@ -3,18 +3,18 @@ prefs.configuration.LINK_STYLE=\u30C7\u30D5\u30A9\u30EB\u30C8\u30DE\u30C3\u30D4\
 prefs.configuration.LINK_STYLE.AUTO=\u81EA\u52D5
 prefs.configuration.LINK_STYLE.BEZIER_CURVE=\u66F2\u7DDA
 prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA\uFF08\u9AD8\u901F\uFF09
-DraggingInfosPopup.draggingEntry={0}\u30A8\u30F3\u30C8\u30EA\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
+DraggingInfosPopup.draggingEntry={0}\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
 DraggingInfosPopup.dropInvalid=\n<< \u7121\u52B9\u306A\u30C9\u30ED\u30C3\u30D7 >>\n
-DraggingInfosPopup.draggingEntries={0}\u30A8\u30F3\u30C8\u30EA\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
+DraggingInfosPopup.draggingEntries={0}\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
 DraggingInfosPopup.dropInvalidWithKey=\n<< \u7121\u52B9\u306A\u30C9\u30ED\u30C3\u30D7 >>\n\u4E00\u5BFE\u4E00\u30DE\u30C3\u30D4\u30F3\u30B0\u3057\u3001\u4E0A\u66F8\u304D\u3059\u308B\u5834\u5408\u306F\u3001Shift\u30AD\u30FC\u3068Ctrl\u30AD\u30FC\u3092\u540C\u6642\u306B\u62BC\u3057\u307E\u3059
 DraggingInfosPopup.overwriteMode= > \u4E0A\u66F8\u304D\u30E2\u30FC\u30C9
 DraggingInfosPopup.appendMode= > \u8FFD\u52A0\u30E2\u30FC\u30C9
 DraggingInfosPopup.appendModeToOverwrite= > \u8FFD\u52A0\u30E2\u30FC\u30C9(\u4E0A\u66F8\u304D\u3059\u308B\u306B\u306F[Ctrl]\u30AD\u30FC)
-DraggingInfosPopup.insertAllSelectedEntries= > \u9078\u629E\u3057\u305F\u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u633F\u5165\u3057\u307E\u3059
-DraggingInfosPopup.insertRemainingEntries= > \u6B8B\u308A\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u633F\u5165\u3057\u307E\u3059
-DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F
-DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA
-DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
-DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F
-DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
-DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA
+DraggingInfosPopup.insertAllSelectedEntries= > \u9078\u629E\u3057\u305F\u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u633F\u5165\u3057\u307E\u3059
+DraggingInfosPopup.insertRemainingEntries= > \u6B8B\u308A\u306E\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u633F\u5165\u3057\u307E\u3059
+DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F
+DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC

main/plugins/org.talend.designer.alfrescooutput/src/main/java/messages_en.properties

@@ -1,20 +0,0 @@
-AlfrescoModelDialog.missingAspectDefinitions.msg=The chosen aspects refer to unknown Alfresco aspect(s) : ${0}.\nPlease provide the alfresco model files that define them.
-AlfrescoModelDialog.modelTable.title=Title
-AlfrescoModelDialog.availableAspects=Available Aspects
-AlfrescoModelDialog.missingAspectDefinitions.title=Missing aspect definitions
-AlfrescoOutputManager.schemaError.title=Error in schema
-AlfrescoModelDialog.missingTypeDefinitions.msg=The chosen type refers to unknown Alfresco type(s) or aspect(s) : ${0}.\nPlease provide the alfresco model files that define them.
-AlfrescoModelDialog.missingTypeDefinitions.title=Missing type definitions
-AlfrescoModelDialog.add=Add...
-AlfrescoOutputModelManager.errorReadingModel=Error reading Alfresco model file
-AlfrescoModelDialog.aspects=Aspects
-AlfrescoOutputManager.schemaError.msg=Please synchronize schema first
-AlfrescoOutputModelManager.alreadyAdded=This model has already been added
-AlfrescoModelDialog.removeModelFailed=Failed to remove model
-AlfrescoOutputModelManager.prefixConflict=Unable to add the model, prefix conflict with previously added model for
-AlfrescoOutputModelManager.notYetAdded=This model has not yet been added
-AlfrescoModelDialog.type=Type
-AlfrescoModelDialog.addModelFailed=Failed to add model
-AlfrescoModelDialog.modelTable.name=Name
-AlfrescoModelDialog.remove=Remove
-AlfrescoOutputManager.failedLoadModel=Failed to load model from component metadata, reinitializing

main/plugins/org.talend.designer.alfrescooutput/src/main/java/messages_ja.properties

@@ -4,7 +4,7 @@ AlfrescoOutputManager.schemaError.msg=\u6700\u521D\u306B\u30B9\u30AD\u30FC\u30DE
 AlfrescoOutputModelManager.alreadyAdded=\u3053\u306E\u30E2\u30C7\u30EB\u306F\u65E2\u306B\u8FFD\u52A0\u6E08\u307F\u3067\u3059\u3002
 AlfrescoOutputModelManager.errorReadingModel=Alfresco\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u8FBC\u307F\u30A8\u30E9\u30FC
 AlfrescoOutputModelManager.notYetAdded=\u3053\u306E\u30E2\u30C7\u30EB\u306F\u307E\u3060\u8FFD\u52A0\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-AlfrescoOutputModelManager.prefixConflict=\u5148\u306B\u8FFD\u52A0\u3055\u308C\u305F\u30E2\u30C7\u30EB\u306E\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u306E\u885D\u7A81\u306E\u305F\u3081\u3001\u30E2\u30C7\u30EB\u306E\u8FFD\u52A0\u304C\u51FA\u6765\u307E\u305B\u3093\u3002
+AlfrescoOutputModelManager.prefixConflict=\u5148\u306B\u8FFD\u52A0\u3055\u308C\u305F\u30E2\u30C7\u30EB\u306E\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u306E\u885D\u7A81\u306E\u305F\u3081\u3001\u30E2\u30C7\u30EB\u306E\u8FFD\u52A0\u304C\u3067\u304D\u307E\u305B\u3093\u3002
 AlfrescoModelDialog.type=\u30BF\u30A4\u30D7
 AlfrescoModelDialog.aspects=\u30A2\u30B9\u30DA\u30AF\u30C8
 AlfrescoModelDialog.availableAspects=\u53EF\u80FD\u306A\u30A2\u30B9\u30DA\u30AF\u30C8

main/plugins/org.talend.designer.codegen/build.properties

@@ -7,7 +7,6 @@ bin.includes = plugin.xml,\
                jet_stub/,\
                plugin.properties,\
                plugin_de.properties,\
-               plugin_en.properties,\
                plugin_es.properties,\
                plugin_fr.properties,\
                plugin_ja.properties,\

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

@@ -514,17 +514,29 @@
 				}
 				org.apache.logging.log4j.core.config.Configurator.setLevel(org.apache.logging.log4j.LogManager.getRootLogger().getName(), log.getLevel());
 				<%}%>
-    	    }
-        	log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Start.");
-    	<%}%>
-    	
-    	<%
-    	INode jobCatcherNode = null;
+			}
+			log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Start.");
+		<%}%>
+		
+		<%
+		INode jobCatcherNode = null;
+		
+		int threadPoolSize = 0;
 		for (INode nodeInProcess : process.getGeneratingNodes()) {
 			String componentName = nodeInProcess.getComponent().getName();
-			if("tJobStructureCatcher".equals(componentName)) {
+
+			if(jobCatcherNode==null && "tJobStructureCatcher".equals(componentName)) {
 				jobCatcherNode = nodeInProcess;
-				break;
+				continue;
+			}
+
+			if(!nodeInProcess.isActivate()) continue;
+			
+			if("tWriteXMLFieldOut".equals(componentName)) {
+				IConnection nextMergeConn = NodeUtil.getNextMergeConnection(nodeInProcess);
+				if(nextMergeConn == null || nextMergeConn.getInputId()==1){
+					threadPoolSize++;
+				}
 			}
 		}
 		
@@ -651,15 +663,15 @@
 %>
         boolean inOSGi = routines.system.BundleUtils.inOSGi();
 
-        if (inOSGi) {
-            java.util.Dictionary<String, Object> jobProperties = routines.system.BundleUtils.getJobProperties(jobName);
-
-            if (jobProperties != null && jobProperties.get("context") != null) {
-                contextStr = (String)jobProperties.get("context");
-            }
-        }
-
         try {
+            java.util.Dictionary<String, Object> jobProperties = null;
+            if (inOSGi) {
+                jobProperties = routines.system.BundleUtils.getJobProperties(jobName);
+    
+                if (jobProperties != null && jobProperties.get("context") != null) {
+                    contextStr = (String)jobProperties.get("context");
+                }
+            }
             //call job/subjob with an existing context, like: --context=production. if without this parameter, there will use the default context instead.
             java.io.InputStream inContext = <%=className%>.class.getClassLoader().getResourceAsStream("<%=jobClassPackageFolder%>/contexts/" + contextStr + ".properties");
             if (inContext == null) {
@@ -669,8 +681,17 @@
                 try {
                     //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);
+    	                if (inOSGi && jobProperties != null) {
+                             java.util.Enumeration<String> keys = jobProperties.keys();
+                             while (keys.hasMoreElements()) {
+                                 String propKey = keys.nextElement();
+                                 if (defaultProps.containsKey(propKey)) {
+                                     defaultProps.put(propKey, (String) jobProperties.get(propKey));
+                                 }
+                             }
+    	                }
+    	                context = new ContextProperties(defaultProps);
                     }
                 } finally {
                     inContext.close();
@@ -1189,6 +1210,25 @@ this.globalResumeTicket = true;//to run tPostJob
 	            e.printStackTrace();
 	        }
         }
+<%
+    }
+
+    if(threadPoolSize>0) {
+%>
+        es.shutdown();
+        <%//shutdownNow should never be executed, only for safe%>
+        try {
+            if(!es.awaitTermination(60, java.util.concurrent.TimeUnit.SECONDS)) {
+                es.shutdownNow();
+                if(!es.awaitTermination(60, java.util.concurrent.TimeUnit.SECONDS)) {
+
+                }
+            }
+        } catch (java.lang.InterruptedException ie) {
+            es.shutdownNow();
+        } catch (java.lang.Exception e) {
+
+        }
 <%
     }
 %>

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

@@ -385,12 +385,40 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
 
 <%
 	INode jobCatcherNode = null;
+
+	//one matched component or part, one thread
+	//why not computed by cpu or resource : please image this case : 
+	//loop==>(input==>(twritexmlfield A)==>(twritexmlfield B)==>(twritexmlfield C)==>output), dead lock as cycle dependency and only one thead in thread pool
+	//maybe newCachedThreadPool is a better idea,  but that have risk for creating more threads, then more memory for TDI-47230
+	//why not generate thread pool object in subprocess scope : 
+	// 1: major reason : difficult to control the var scope, somewhere can't access it, then compiler issue
+	// 2: we may need this thread pool for bigger scope, not only for twritexmlfield/twritejsonfield in future
+	// 3: we don't suppose this thread pool cost big resource after all tasks done, so we can shutdown it more later,
+	//		for example, most time, user will use less than 3 twritexmlfield in one job, then 3 threads thread pool, we can close them in job finish code part, 
+	//		not a big cost to keep that. And of course, we best to start&clean it in subprocess finish, but that's risk of 1 above.
+	int threadPoolSize = 0;
 	for (INode nodeInProcess : processNodes) {
 		String componentName = nodeInProcess.getComponent().getName();
-		if("tJobStructureCatcher".equals(componentName)) {
+
+		if(jobCatcherNode==null && "tJobStructureCatcher".equals(componentName)) {
 			jobCatcherNode = nodeInProcess;
-			break;
+			continue;
 		}
+
+		if(!nodeInProcess.isActivate()) continue;
+		
+		if("tWriteXMLFieldOut".equals(componentName)) {
+			IConnection nextMergeConn = NodeUtil.getNextMergeConnection(nodeInProcess);
+			if(nextMergeConn == null || nextMergeConn.getInputId()==1){
+				threadPoolSize++;
+			}
+		}
+	}
+
+	if(threadPoolSize>0) {
+%>
+private final java.util.concurrent.ExecutorService es = java.util.concurrent.Executors.newCachedThreadPool();
+<%
 	}
 	
 	boolean enableLogStash = !Boolean.getBoolean("deactivate_extended_component_log") && (jobCatcherNode!=null);

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

@@ -20,6 +20,7 @@
 		org.talend.core.model.process.IHashConfiguration
 		org.talend.core.model.process.IHashableColumn
 		org.talend.core.model.utils.NodeUtil
+		org.talend.core.model.utils.TalendTextUtils
 	"
 	class="SubProcessHeader"
 	skeleton="subprocess_header_java.skeleton"
@@ -183,6 +184,48 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 				public <%= typeToGenerate %> get<%=column.getLabel().substring(0, 1).toUpperCase()%><%=column.getLabel().substring(1)%> () {
 					return this.<%=column.getLabel()%>;
 				}
+
+				public Boolean <%=column.getLabel()%>IsNullable(){
+				    return <%=column.isNullable()%>;
+				}
+				public Boolean <%=column.getLabel()%>IsKey(){
+				    return <%=column.isKey()%>;
+				}
+				public Integer <%=column.getLabel()%>Length(){
+				    return <%=column.getLength()%>;
+				}
+				public Integer <%=column.getLabel()%>Precision(){
+				    return <%=column.getPrecision()%>;
+				}
+				public String <%=column.getLabel()%>Default(){
+				<% if (column.getDefault() == null) { %>
+					return null;
+				<% } else { %>
+					return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getDefault()))%>";
+				<% } %>
+				}
+				public String <%=column.getLabel()%>Comment(){
+				<% if (column.getComment() == null) { %>
+				    return null;
+				<% } else { %>
+				    return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getComment()))%>";
+				<% } %>
+				}
+				public String <%=column.getLabel()%>Pattern(){
+				<% if (column.getPattern() == null) { %>
+				    return null;
+				<% } else { %>
+					return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getPattern()))%>";
+				<% } %>
+				}
+				public String <%=column.getLabel()%>OriginalDbColumnName(){
+				<% if (column.getOriginalDbColumnName() == null) { %>
+				    return null;
+				<% } else { %>
+					return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getOriginalDbColumnName()))%>";
+				<% } %>
+				}
+
 				<%
 				if((conn.getLineStyle() == EConnectionType.FLOW_REF) && conn.getTarget().getUniqueName().startsWith("tXMLMap") && "id_Document".equals(javaType.getId())) {
 				%>

main/plugins/org.talend.designer.codegen/plugin_en.properties

@@ -1,5 +0,0 @@
-providerName=www.example.org
-pluginName=EmittersPool Model
-components=Components
-trunjob=tRunJob
-format=Format

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

@@ -1,148 +0,0 @@
-JavaRoutineSynchronizer.UnsupportedOperation.Exception1=method not implemented: org.talend.designer.codegen.JavaRoutineSynchronizer line:49
-CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=JETEmitters Project not present, full reinitialize is needed
-generatedcode.footerprocess.nbcharsgenerated={0} characters generated by {1}
-CodeGeneratorEmittersPoolFactory.Class.NotFound=Template still present, but class {0} has disapeared from workspace. This unit needs to be recompiled.
-CodeGeneratorEmittersPoolFactory.PersitentData.Error=Persitent data cannot be saved :
-generatedcode.copyright.title=Copyright (c) 2005-2011, Talend Inc.
-CodeGeneratorEmittersPoolFactory.initMessage=Generation Engine Initialization in progress...
-generatedcode.copyright.body5=(http://www.gnu.org/licenses/lgpl.html).
-EmfEmittersPersistence.CodeGen.DataMissing=Missing code generation data. Starting full code generation.
-CodeGenerator.JET.TimeOut=JET initialisation Time Out
-generatedcode.copyright.body4=You may distribute this code under the terms of the GNU LGPL license
-CodeGenerator.Node.NotFound=Node not found in current process
-generatedcode.copyright.body3=You can find more information about Talend products at www.talend.com.
-EmittersPoolFactoryImpl.Class.IllegalArg=The class ' {0}' is not a valid classifier
-generatedcode.copyright.body2=/ JobDesigner (CodeGenerator version {0}).
-JavaRoutineSynchronizer.UnsupportedOperation.Exception2=method not implemented: org.talend.designer.codegen.JavaRoutineSynchronizer line:58
-CodeGenerator.getGraphicalNode1=------process.getGraphicalNodes()------
-CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
-CodeGenerator.newLine=\n\n\n\n
-JetSkeletonManager.unableLoad=unable to load skeleton update cache file
-JetSkeletonManager.unableSave=unable to save skeleton update cache file
-JetSkeletonManager.updateProblem=when update skeleton persistence data, there have some problems
-CodeGeneratorEmittersPoolFactory.codeThread=Code generation background thread
-CodeGeneratorEmittersPoolFactory.componentCompiled=Components compiled in {0} ms
-CodeGeneratorEmittersPoolFactory.failCompail=Components compile fail : \r\n
-CodeGeneratorEmittersPoolFactory.initialException=Exception during Initialization
-CodeGeneratorEmittersPoolFactory.jetEmitterInitialException=Error during JetEmitter initalization
-CodeGeneratorService.invalidLanguage1=invalid language type.
-CodeGeneratorService.invalidLanguage2=invalid language type.
-CodeGenInit.addMarkers=Adding markers to workspace
-CodeGenInit.createProject=create {0} project
-CodeGenInit.deleteProject=delete {0} project
-CodeGenInit.initTemplate=init Templates
-CodeGenInit.removeLink=Remove linked resources
-CodeGenInit.saveWorkspace=Saving workspace
-DocumentRootImpl.mixed=\ (mixed:
-NodesSubTree.enableParallel=__ENABLE_PARALLEL__
-PoolTypeImpl.persistentPool= \ (persistentPool:
-TalendJetEmitter.compileFail=\ compile fail : {0} : {1}
-TalendJetEmitter.exception=Exception on
-JetFilesProviderManager.unableLoad=Unable to load {0}JetFilesProviderManager.unableLoad
-CodeGeneratorEmittersPoolFactory.dialogContent=JetEmitter Generation is canceled,to avoid problems cause by this, please press Ctrl+Shift+F3 to generate again\!
-CodeGeneratorEmittersPoolFactory.operationCanceled=Operation Canceled
-ComponentsFactory.afterSystemComponent=after system component
-ComponentsFactory.componentNotFound=Component folder not found\:
-ComponentsFactory.load.components=Load Components...
-ComponentsFactory.parentNotRecompiled=Warning\: parents of *.inc.javajet are not recompiled \!
-ComponentsLocalProviderService.componentLoadError=Component load error
-ComponentsLocalProviderService.talendExchangeError=Talend Exchange Error
-ComponentsPreferencePage.ButtonLabel0=Ok
-ComponentsPreferencePage.configuration.LINK_STYLE=Default mapping links display as :
-ComponentsPreferencePage.rowLimit=Row limit
-ComponentsPreferencePage.WarningMsg=You need to restart Talend Open Studio to load extra components.
-ComponentsPreferencePage.WarningTitle=Warning
-ComponentsPreferencePage.directoryFieldLabel=User component folder\:
-ComponentsProviderManager.unableLoad=unable to load component provider
-ComponenttRunJobPreferencePage.label=Don't show corresponding job after double click on a tRunJob Component.
-ComponentJobletPreferencePage.label=Don't show corresponding job after double click on a Joblet Component.
-ComponenttRunJobPreferencePage.showCorrespondingJob=Show corresponding job after double click on a tRunJob Component.
-XsdValidationCacheManager.unableLoadxsd=unable to load xsd validation cache file
-XsdValidationCacheManager.unableSavexsd=unable to save xsd validation cache file
-prefs.configuration.LINK_STYLE.AUTO=Auto
-prefs.configuration.LINK_STYLE.BEZIER_CURVE=Curves
-prefs.configuration.LINK_STYLE.LINE=Lines (fast)
-FAMILY.AS400=AS400
-FAMILY.Access=Access
-FAMILY.Alfresco=Alfresco
-FAMILY.Business=Business
-FAMILY.Business_Intelligence=Business Intelligence
-FAMILY.CentricCRM=CentricCRM
-FAMILY.Charts=Charts
-FAMILY.Connections=Connections
-FAMILY.Custom_Code=Custom Code
-FAMILY.DB2=DB2
-FAMILY.DB_Generic=DB Generic
-FAMILY.DB_JDBC=DB JDBC
-FAMILY.DB_SCD=DB SCD
-FAMILY.Data_Quality=Data Quality
-FAMILY.Databases=Databases
-FAMILY.ELT=ELT
-FAMILY.ESB=ESB
-FAMILY.EXASolution=EXASolution
-FAMILY.eXist=eXist
-FAMILY.FTP=FTP
-FAMILY.Fields=Fields
-FAMILY.File=File
-FAMILY.FireBird=FireBird
-FAMILY.Greenplum=Greenplum
-FAMILY.HSQLDb=HSQLDb
-FAMILY.Healthcare=Healthcare
-FAMILY.Hive=Hive
-FAMILY.Informix=Informix
-FAMILY.Ingres=Ingres
-FAMILY.Input=Input
-FAMILY.Interbase=Interbase
-FAMILY.Internet=Internet
-FAMILY.Jasper=Jasper
-FAMILY.JavaDB=JavaDB
-FAMILY.JDBC=JDBC
-FAMILY.LDAP=LDAP
-FAMILY.Logs_Errors=Logs & Errors
-FAMILY.MS_SQL_Server=MS SQL Server
-FAMILY.MSSql=MSSql
-FAMILY.Management=Management
-FAMILY.MaxDB=MaxDB
-FAMILY.Microsoft_AX=Microsoft AX
-FAMILY.Microsoft_CRM=Microsoft CRM
-FAMILY.Misc=Misc
-FAMILY.MySQL=MySQL
-FAMILY.Netezza=Netezza
-FAMILY.OLAP_Cube=OLAP Cube
-FAMILY.Oracle=Oracle
-FAMILY.Orchestration=Orchestration
-FAMILY.Output=Output
-FAMILY.ParAccel=ParAccel
-FAMILY.PostgreSQL=PostgreSQL
-FAMILY.PostgresPlus=PostgresPlus
-FAMILY.Processing=Processing
-FAMILY.SAP=SAP
-FAMILY.Sas=Sas
-FAMILY.SCD=SCD
-FAMILY.SCP=SCP
-FAMILY.SPSS=SPSS
-FAMILY.SQLite=SQLite
-FAMILY.Salesforce=Salesforce
-FAMILY.SugarCRM=SugarCRM
-FAMILY.Sybase=Sybase
-FAMILY.System=System
-FAMILY.Technical=Technical
-FAMILY.Teradata=Teradata
-FAMILY.Vertica=Vertica
-FAMILY.VtigerCRM=VtigerCRM
-FAMILY.XML=XML
-CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=Update the palette for editors
-ComponentsPreferencePage.componentAssist=Enable Component Creation Assistant
-ComponentsPreferencePage.notValidDirectory=Your selection will result in folder nesting, which is not recommended. Do you want to continue anyway?
-ComponentsFactory.loadComponents.missingFolder=The folder "{0}" is missing in the plugin "{1}".
-ComponentsPreferencePage_SuccessTitle=Success
-ComponentsPreferencePage_SuccessMessage1=Need restart studio to load the new components. Else, will be loaded in next time when start.
-ComponentsPreferencePage_SuccessMessage2=Do you want to restart right now?
-ComponentsPreferencePage.installComponentsFailure=Install components failure
-generatedcode.copyright.body1=This source code has been automatically generated by {0}
-ComponentsFactory.init.waitForFinish.timeout=Can't initialise ComponentsFactory, please try again.
-FAMILY.Data_Privacy=Data Privacy
-ComponentsPreferencePage.enableOnLineHelp=Enable online help for components
-ComponentsPreferencePage.titleInstallHelp=Install offline help feature?
-ComponentsPreferencePage.msgInstallHelp=This will open additional packages dialog to install offline help feature, do you want to continue?
-ComponentsPreferencePage.grpHelp=Help

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

@@ -48,7 +48,7 @@ ComponentsFactory.componentNotFound=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u
 ComponentsFactory.load.components=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9...
 ComponentsFactory.parentNotRecompiled=\u8B66\u544A: *.inc.javajet\u306E\u89AA\u306F\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 ComponentsFactory.loadComponents.missingFolder=\u30D7\u30E9\u30B0\u30A4\u30F3"{1}"\u306B\u30D5\u30A9\u30EB\u30C0\u30FC"{0}"\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-ComponentsFactory.init.waitForFinish.timeout=ComponentsFactory\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\u3002\u3082\u3046\u4E00\u5EA6\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ComponentsFactory.init.waitForFinish.timeout=ComponentsFactory\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\u3002\u3084\u308A\u76F4\u3057\u3066\u307F\u3066\u304F\u3060\u3055\u3044\u3002
 ComponentsLocalProviderService.componentLoadError=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30ED\u30FC\u30C9\u30A8\u30E9\u30FC
 ComponentsLocalProviderService.talendExchangeError=Talend Exchange \u30A8\u30E9\u30FC
 ComponentsPreferencePage.ButtonLabel0=OK

main/plugins/org.talend.designer.components.exchange/build.properties

@@ -8,7 +8,6 @@ bin.includes = META-INF/,\
                model/,\
                content/,\
                plugin_de.properties,\
-               plugin_en.properties,\
                plugin_fr.properties,\
                plugin_it.properties,\
                plugin_ja.properties,\

main/plugins/org.talend.designer.components.exchange/plugin_en.properties

@@ -1,5 +0,0 @@
-Exchange=Exchange
-DownloadComponenentsAction.Label=Download Selected Components
-RefreshComponenentsAction.Label=Refresh Components List
-providerName=www.example.org
-pluginName=Exchange Model

main/plugins/org.talend.designer.components.exchange/src/main/java/messages_en.properties

@@ -1,101 +0,0 @@
-ExchangeView.Exchange=Exchange
-AvailableExtensionsComposite.ExtensionName=Extension Name
-AvailableExtensionsComposite.Version=Version
-AvailableExtensionsComposite.Rating=Rating
-AvailableExtensionsComposite.Author=Author
-AvailableExtensionsComposite.FilterTitle=Filter
-AvailableExtensionsComposite.ViewDetail.installOperateStatus=Install
-AvailableExtensionsComposite.ViewDetail.WriteReview=Write a review
-AvailableExtensionsComposite.ViewDetail.InsertionReviewFailure=Insertion Review failure.
-AvailableExtensionsComposite.ViewDetail.InsertionReviewFailureTip=You should check it.
-DownloadedExtensionsComposite.ExtensionName=Extension Name
-DownloadedExtensionsComposite.DownloadedVersion=Downloaded Version
-DownloadedExtensionsComposite.DownloadDate=Download Date
-DownloadedExtensionsComposite.OperateStatus=Operate Status
-DownloadedExtensionsComposite.installOperateStatus=Install
-DownloadedExtensionsComposite.installedOperateStatus=Installed
-DownloadedExtensionsComposite.updateOperateStatus=Update
-MyExtensionsComposite.ExtensionName=Extension Name
-MyExtensionsComposite.Version=Version
-MyExtensionsComposite.UploadDate=Upload Date
-MyExtensionsComposite.AddNewExtensionTitle=Add New Extension
-MyExtensionsComposite.UpLoadNewVersionOperateStatus=Upload New Version
-MyExtensionsComposite.UpdateOperateStatus=Update
-MyExtensionsComposite.ModifyOperateStatus=Modify
-MyExtensionsComposite.DeleteOperateStatus=Delete
-MyExtensionsComposite.Form.Return=Return
-MyExtensionsComposite.Form.ExtensionTitle=Extension Title
-MyExtensionsComposite.Form.InitialVersion=Initial Version
-MyExtensionsComposite.Form.Compatibility=Compatibility
-MyExtensionsComposite.Form.Compatibility.AllVersions=All versions
-MyExtensionsComposite.Form.Compatibility.Version=Version
-MyExtensionsComposite.Form.Compatibility.AndOlder=and older
-MyExtensionsComposite.Form.Compatibility.AndNewer=and newer
-MyExtensionsComposite.Form.Compatibility.AllVersionsExcept=All versions except:
-MyExtensionsComposite.Form.Compatibility.OnlyTheseVersions=Only these versions:
-MyExtensionsComposite.Form.Description=Description
-MyExtensionsComposite.Form.Visibility=Visibility
-MyExtensionsComposite.Form.Visibility.Public=Public(visible by all)
-MyExtensionsComposite.Form.Visibility.Private=Private(visible by me)
-MyExtensionsComposite.Form.Upload=Upload
-MyExtensionsComposite.Form.Upload.SelectAnItem=Select an item from the currently open project
-MyExtensionsComposite.Form.Upload.File=File:
-MyExtensionsComposite.Form.Upload.Browse=Browse...
-MyExtensionsComposite.Form.Upload.Browse.SelectFile=Select a File of the extension to upload
-MyExtensionsComposite.Form.DeleteExtensionTile=Delete Extension
-MyExtensionsComposite.Form.DeleteExtensionMessage=Are you sure you want to delete this Extension?
-MyExtensionsComposite.Form.UploadExtension=Upload Extension
-MyExtensionsComposite.Form.UpdateExtension=Update Extension
-MyExtensionsComposite.Form.ModifyExtension=Modify Extension
-RefreshJob.FindExtensions.Title=Finding available extensions
-RefreshJob.FindExtensions.Message=Finding extensions from exchange...
-ShowContributedExtensionsJob.ShowContributedExtensions.Title=Finding contributed extensions
-ShowContributedExtensionsJob.ShowContributedExtensions.Message=Finding contributed extensions from exchange...
-ShowInstalledExtensionsJob.ShowInstalledExtensions.Title=Finding installed extensions
-ShowInstalledExtensionsJob.ShowInstalledExtensions.Message=Finding installed extensions from exchange...
-DeleteExtensionJob.DeleteExtensionJob.Title=Delete an extension...
-DeleteExtensionJob.DeleteExtensionJob.Message=Delete an extension...
-DeleteExtensionJob.DeleteFailure=Delete failure.
-DeleteExtensionJob.DeleteFailureTip=You should check it.
-ModifyExtensionJob.Title=Modify an extension...
-ModifyExtensionJob.Message=Modify an extension...
-ModifyExtensionJob.ModifyFailure=Modify failure.
-ModifyExtensionJob.ModifyFailureTip=You should check it.
-InstalledExtensionJob.Title=Installed an extension...
-InstalledExtensionJob.Message=Installed an extension...
-InsertionExtensionAction.InstalledFailure=Installed failure.
-InsertionExtensionAction.InstalledFailureTip=You should check it.
-UploadRevisionJob.Title=Upload Revision...
-UploadRevisionJob.Message=Upload Revision...
-UploadRevisionAction.InstalledFailure=Upload Revision failure.
-UploadRevisionAction.InstalledFailureTip=You should check it.
-DownloadComponenentsAction.installExchange=Install Exchange Components
-DownloadComponenentsAction.DownloadTaskTitle=Downloading files from Exchange
-DownloadComponenentsAction.DownloadTaskName=Downloading file from url:
-DownloadComponenentsAction.ReloadPalette=Reloading palette...
-DownloadComponenentsAction.DownloadFailure=Download failure.
-DownloadComponenentsAction.DownloadFailureTip=You must change the Download Settings.
-ExchangeWebService.insertionExtensionSuccessful=Insertion Extension successful.
-ExchangeWebService.downloadingExtensionSuccessful=Downloaded Extension successful.
-ExchangeWebService.deleteExtensionSuccessful=Deleted Extension successful.
-ExchangeWebService.insertReviewSuccessful=Insertion Review successful.
-ExchangeWebService.updateRevisionSuccessful=Update Revision successful.
-ExchangeWebService.insertionRevisionSuccessful=Insertion Revision successful.
-ImportExchangeDialog.dialogTitle=Select an item from Talend Exchange
-ImportExchangeDialog.WARNING=WARNING
-ImportExchangeDialog.NOTSELECTWARNING=Please select one item from table.
-ImportExchangeDialog.downloadProgressBar=Download Item,Please Wait\!
-ImportExchangeDialog.EXTENSION_NAME=Extension Name
-ImportExchangeDialog.AUTHOR_NAME=Author Name
-ImportExchangeDialog.LATEST_REVISION=Latest Revision
-ImportExchangeDialog.EXTENSION_DESCRIPTION=Extension Description
-ImportExchangeDialog.REFRESH_BUTTON=Refresh
-ImportExchangeDialog.REFRESHING_PROGRESSBAR=Refreshing\! Please Wait.....
-ImportExchangeDialog.OPERATION_CANCELLED=Operation was cancelled
-Exchange.logon.error=Exchange user have not been registered, please register using the preferences .
-ImportExchangeDialog.download.extensions=Download extensions\! Please Wait\!
-DownloadComponenentsAction_restartMessage=Install the new component successfully, but need to restart studio to load it, do you want to restart now?
-DownloadComponenentsAction_restartTitle=Need restart
-DownloadComponenentsAction_failureTitle=Failure
-DownloadComponenentsAction_failureMessage=Fail to install the component {0}, need check the component is valid or not.
-DownloadComponenentsAction.installComponentsTitle=Install components

main/plugins/org.talend.designer.components.exchange/src/main/java/messages_ja.properties

@@ -56,7 +56,7 @@ ShowInstalledExtensionsJob.ShowInstalledExtensions.Title=extensions\u3092\u30A4\
 ShowInstalledExtensionsJob.ShowInstalledExtensions.Message=exchange\u304B\u3089extensions\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u2026
 DeleteExtensionJob.DeleteExtensionJob.Title=Extension\u3092\u524A\u9664\u3057\u307E\u3059\u2026
 DeleteExtensionJob.DeleteExtensionJob.Message=Extension\u3092\u524A\u9664\u3057\u307E\u3059\u2026
-DeleteExtensionJob.DeleteFailure=\u524A\u9664\u51FA\u6765\u307E\u305B\u3093
+DeleteExtensionJob.DeleteFailure=\u524A\u9664\u3067\u304D\u307E\u305B\u3093
 DeleteExtensionJob.DeleteFailureTip=\u30C1\u30A7\u30C3\u30AF\u3092\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ModifyExtensionJob.Title=Extension\u3092\u4FEE\u6B63\u2026
 ModifyExtensionJob.Message=Extension\u3092\u4FEE\u6B63\u2026

main/plugins/org.talend.designer.components.libs/libs_src/talend-job-monitoring/pom.xml

@@ -69,13 +69,13 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.13.2</version>
+			<version>2.17.1</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.13.2</version>
+			<version>2.17.1</version>
 			<optional>true</optional>
 		</dependency>
 	</dependencies>
@@ -97,4 +97,4 @@
 		</pluginManagement>
 	</build>
 
-</project>
+</project>

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

@@ -3,10 +3,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.talend.components</groupId>
 	<artifactId>talend-mscrm</artifactId>
-	<version>3.9-20210713</version>
+	<version>3.11-20220124</version>
 	<packaging>jar</packaging>
 	
 	<name>talend-mscrm</name>
+	<licenses>
+		<license>
+			<name>Apache License, Version 2.0</name>
+			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
+			<distribution>may be downloaded from the Maven repository</distribution>
+		</license>
+	</licenses>
 	
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/ClientConfigurationFactory.java

@@ -60,12 +60,13 @@ public class ClientConfigurationFactory {
     }
 
     public final static ClientConfiguration buildOAuthPremiseClientConfiguration(String userName, String password, String authoryEndpoint,
-                                                                                 String serviceAPI, String clientId, String redirectUrl, String forcedResource) {
+                                                                                 String serviceAPI, String clientId, String clientSecret, String redirectUrl, String forcedResource) {
         ClientConfiguration clientConfiguration = new ClientConfiguration(AuthStrategyEnum.OAUTH_PREMISE);
         clientConfiguration.setUserName(userName);
         clientConfiguration.setPassword(password);
         clientConfiguration.setAuthoryEndpoint(authoryEndpoint);
         clientConfiguration.setClientId(clientId);
+        clientConfiguration.setClientSecret(clientSecret);
         clientConfiguration.setRedirectURL(redirectUrl);
         clientConfiguration.setServiceAPI(serviceAPI);
         clientConfiguration.setForceResource(forcedResource);

main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/DynamicsCRMClient.java

@@ -116,11 +116,8 @@ public class DynamicsCRMClient implements IHttpClientFactoryObserver {
     public DynamicsCRMClient(ClientConfiguration clientConfiguration, String serviceRootURL, String entitySet)
             throws AuthenticationException {
         this.clientConfiguration = clientConfiguration;
-
         this.serviceRootURL = serviceRootURL;
-
         this.entitySet = entitySet;
-
         init();
     }
 

main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/authentication/OAuthPremiseStrategyImpl.java

@@ -146,6 +146,10 @@ public class OAuthPremiseStrategyImpl implements IAuthStrategy {
         body.put("redirect_uri", conf.getRedirectURL());
         body.put("client_id", conf.getClientId());
 
+        if(conf.getClientSecret() != null && !"".equals(conf.getClientSecret().trim())){
+            body.put("client_secret", conf.getClientSecret());
+        }
+
         RequestHttpContext queryContext = new RequestHttpContext("POST",
                 computeTokenUrl(conf.getAuthoryEndpoint()),
                 Collections.emptyMap(),

main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/authentication/httpclienthelper/HttpClient.java

@@ -59,8 +59,6 @@ public final class HttpClient {
             redirect = true;
         }
 
-
-        //final HttpHeaders headers = resp.headers();
         final Optional<String> location = response.getFirstValueHeader("location");
 
 
@@ -127,4 +125,4 @@ public final class HttpClient {
     public RequestHttpContext getRequestHttpContext() {
         return requestHttpContext;
     }
-}
+}

main/plugins/org.talend.designer.components.libs/libs_src/talend-mscrm/src/main/java/org/talend/ms/crm/odata/authentication/httpclienthelper/HttpResponse.java

@@ -15,7 +15,7 @@ public final class HttpResponse {
     private Map<String, List<String>> headers;
     private String body;
 
-    private Optional<String> code = null;//Optional.empty();
+    private Optional<String> code = null;
 
     public static HttpResponse fromHttpUrlConnection(HttpURLConnection conn) throws IOException {
         final int status = conn.getResponseCode();
@@ -82,12 +82,12 @@ public final class HttpResponse {
             return Optional.empty();
         }
 
-        final List<String> ss = values.get();
-        if(ss.size() <= 0){
+        final List<String> v = values.get();
+        if (v.size() <= 0) {
             return Optional.empty();
         }
 
-        return Optional.ofNullable(ss.get(0));
+        return Optional.ofNullable(v.get(0));
     }
 
     public String getBody() {
@@ -107,11 +107,13 @@ public final class HttpResponse {
         if (!optLocation.isPresent()) {
             return Optional.empty();
         }
-        final String[] split = optLocation.get().split("&|\\?");
-        final Optional<String> optCode = Arrays.stream(split).filter(e -> e.startsWith("code=")).findFirst();
+        final String optLocationValue = optLocation.get();
+        final String[] split = optLocationValue.split("&|\\?");
 
+        final Optional<String> optCode = Arrays.stream(split).filter(e -> e.startsWith("code=")).findFirst();
         if (optCode.isPresent()) {
-            String code = optCode.get().substring(5);
+            final String optCodeValue = optCode.get();
+            String code = optCodeValue.substring(5);
             return Optional.ofNullable(code);
         }
 

main/plugins/org.talend.designer.components.libs/libs_src/talend-ws/src/main/resources/messages_en.properties

@@ -1,8 +0,0 @@
-org.talend.ws.exception.IllegalPropertyAccessException=Unable to access property {0} which is not accessible for type {1}
-org.talend.ws.exception.NoSuchPropertyException=Property {0} does not exist for type {1}
-org.talend.ws.exception.Instantiation=Unable to instantiate class of type {0}
-org.talend.ws.exception.InvocationTargetPropertyAccessor=A property accessor has thrown an exception : property {0} of class {1}
-org.talend.ws.exception.illegalAccessValueOf=Unable to call method valueOf for enum type {0}
-org.talend.ws.exception.Unknown=An unknown exception has been thrown
-org.talend.ws.exception.InvalidEnumValueException=Value {0} is not valid for enum {1}
-org.talend.ws.exception.InvalidParameterAnyType=You must specify a map like this for anyTypes : {anyType: value, anyType_type: qname} pour les anyType

main/plugins/org.talend.designer.components.localprovider/components/tAS400Close/tAS400Close_messages_el.properties

@@ -1,2 +0,0 @@
-LONG_NAME=\u039A\u03BB\u03B5\u03AF\u03BD\u03B5\u03B9 \u03BC\u03B9\u03B1 \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03B7 \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7 AS400.
-CONNECTION.NAME=\u039B\u03AF\u03C3\u03C4\u03B1 \u03A3\u03C5\u03C3\u03C4\u03B1\u03C4\u03B9\u03BA\u03CE\u03BD \u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03C9\u03BD

main/plugins/org.talend.designer.components.localprovider/components/tAS400Close/tAS400Close_messages_en.properties

@@ -1,3 +0,0 @@
-HELP=org.talend.help.tAS400Close
-LONG_NAME=Close a selected AS400 connection.
-CONNECTION.NAME=Component List

main/plugins/org.talend.designer.components.localprovider/components/tAS400Close/tAS400Close_messages_kr.properties

@@ -1 +0,0 @@
-CONNECTION.NAME=\uCEF4\uD3EC\uB10C\uD2B8\uBAA9\uB85D

main/plugins/org.talend.designer.components.localprovider/components/tAS400Close/tAS400Close_messages_pl.properties

@@ -1 +0,0 @@
-CONNECTION.NAME=Lista komponent\u00F3w

main/plugins/org.talend.designer.components.localprovider/components/tAS400Close/tAS400Close_messages_pt_BR.properties

@@ -1 +0,0 @@
-CONNECTION.NAME=Lista de componentes

main/plugins/org.talend.designer.components.localprovider/components/tAS400Commit/tAS400Commit_messages_el.properties

@@ -1,3 +0,0 @@
-CLOSE.NAME=\u039A\u03BB\u03B5\u03AF\u03C3\u03B9\u03BC\u03BF \u03A3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7\u03C2
-LONG_NAME=\u039F\u03BB\u03BF\u03BA\u03BB\u03B7\u03C1\u03CE\u03BD\u03B5\u03B9 \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C3\u03C5\u03BD\u03B1\u03BB\u03BB\u03B1\u03B3\u03AD\u03C2 \u03C0\u03BF\u03C5 \u03B4\u03B5\u03BD \u03AD\u03C7\u03BF\u03C5\u03BD \u03BF\u03BB\u03BF\u03BA\u03BB\u03B7\u03C1\u03C9\u03B8\u03B5\u03AF \u03C3\u03C4\u03B7\u03BD \u03B5\u03C0\u03B9\u03BB\u03B5\u03B3\u03BC\u03AD\u03BD\u03B7 \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7 AS400
-CONNECTION.NAME=\u039B\u03AF\u03C3\u03C4\u03B1 \u03A3\u03C5\u03C3\u03C4\u03B1\u03C4\u03B9\u03BA\u03CE\u03BD \u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03C9\u03BD

main/plugins/org.talend.designer.components.localprovider/components/tAS400Commit/tAS400Commit_messages_en.properties

@@ -1,4 +0,0 @@
-CLOSE.NAME=Close Connection
-HELP=org.talend.help.tAS400Commit
-LONG_NAME=Commits all transactions not already commited in the selected AS400 connection
-CONNECTION.NAME=Component List

main/plugins/org.talend.designer.components.localprovider/components/tAS400Commit/tAS400Commit_messages_hr.properties

@@ -1 +0,0 @@
-CLOSE.NAME=Zatvori konekciju

main/plugins/org.talend.designer.components.localprovider/components/tAS400Commit/tAS400Commit_messages_kr.properties

@@ -1 +0,0 @@
-CONNECTION.NAME=\uCEF4\uD3EC\uB10C\uD2B8\uBAA9\uB85D

main/plugins/org.talend.designer.components.localprovider/components/tAS400Commit/tAS400Commit_messages_pl.properties

@@ -1,2 +0,0 @@
-CLOSE.NAME=Zamknij po\u0142\u0105czenie
-CONNECTION.NAME=Lista komponent\u00F3w

main/plugins/org.talend.designer.components.localprovider/components/tAS400Commit/tAS400Commit_messages_pt_BR.properties

@@ -1,2 +0,0 @@
-CLOSE.NAME=Fechar conex\u00E3o
-CONNECTION.NAME=Lista de componentes

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_java.xml

@@ -47,8 +47,6 @@
     <PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="2"
 			REPOSITORY_VALUE="DB_VERSION">
 			<ITEMS DEFAULT="V7R1_V7R3">
-				<ITEM NAME="V5R2_V5R4" VALUE="jt400_V5R2.jar"/>
-				<ITEM NAME="V5R3_V6R1" VALUE="jt400_V5R3.jar" />
                 <ITEM NAME="V6R1_V7R2" VALUE="jt400_V6R1.jar" />
                 <ITEM NAME="V7R1_V7R3" VALUE="jt400-9.8.jar" />
 			</ITEMS>
@@ -145,12 +143,10 @@
 
    <CODEGENERATION>
      <IMPORTS>
-       <IMPORT NAME="Driver-V5R2_V5R4" MODULE="jt400_V5R2.jar" MVN="mvn:org.talend.libraries/jt400_V5R2/6.0.0"  REQUIRED_IF="DB_VERSION == 'jt400_V5R2.jar'" />
-       <IMPORT NAME="Driver-V5R3_V6R1" MODULE="jt400_V5R3.jar" MVN="mvn:org.talend.libraries/jt400_V5R3/6.0.0"  REQUIRED_IF="DB_VERSION == 'jt400_V5R3.jar'" />
        <IMPORT NAME="Driver-V6R1_V7R2" MODULE="jt400_V6R1.jar" MVN="mvn:org.talend.libraries/jt400_V6R1/6.0.0"  REQUIRED_IF="DB_VERSION == 'jt400_V6R1.jar'" />
        <IMPORT NAME="Driver-V7R1_V7R3" MODULE="jt400-9.8.jar" MVN="mvn:net.sf.jt400/jt400/9.8"  REQUIRED_IF="DB_VERSION == 'jt400-9.8.jar'" />
-       <IMPORT NAME="slf4j-api-1.7.25.jar" MODULE="slf4j-api-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
-       <IMPORT NAME="slf4j-log4j12-1.7.25.jar" MODULE="slf4j-log4j12-1.7.25.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.25" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <IMPORT NAME="slf4j-api-1.7.29.jar" MODULE="slf4j-api-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-api/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
+       <IMPORT NAME="slf4j-log4j12-1.7.29.jar" MODULE="slf4j-log4j12-1.7.29.jar" MVN="mvn:org.slf4j/slf4j-log4j12/1.7.29" REQUIRED_IF="USE_SHARED_CONNECTION =='true'" />
      </IMPORTS>
 	</CODEGENERATION>
 

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages.properties

@@ -10,8 +10,6 @@ PORT.NAME=Port
 PROPERTIES.NAME=Additional JDBC Parameters
 USER.NAME=Username
 DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
 USE_SHARED_CONNECTION.NAME=Use or register a shared DB Connection

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_ar.properties

@@ -1,4 +0,0 @@
-HOST.NAME=\u0627\u0644\u0645\u0636\u064A\u0641
-PASS.NAME=\u0631\u0645\u0632 \u0627\u0644\u0645\u0631\u0648\u0631
-AUTO_COMMIT.NAME=\u062A\u0623\u0643\u064A\u062F \u062D\u0641\u0638 \u0622\u0644\u064A
-DBNAME.NAME=\u0642\u0627\u0639\u062F\u0629 \u0628\u064A\u0627\u0646\u0627\u062A

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_el.properties

@@ -1,16 +0,0 @@
-ENCODING.NAME=\u039A\u03C9\u03B4\u03B9\u03BA\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7
-HOST.NAME=\u039A\u03CC\u03BC\u03B2\u03BF\u03C2
-LONG_NAME=\u0394\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03B3\u03B5\u03AF \u03BC\u03B9\u03B1 \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7 \u03C3\u03B5 \u03BC\u03B9\u03B1 \u03B2\u03AC\u03C3\u03B7 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD AS400
-NULL_CHAR.NAME=\u03A7\u03B1\u03C1\u03B1\u03BA\u03C4\u03AE\u03C1\u03B1\u03C2 Null 
-PASS.NAME=\u039A\u03C9\u03B4\u03B9\u03BA\u03AE \u03BB\u03AD\u03BE\u03B7
-PORT.NAME=\u0398\u03CD\u03C1\u03B1
-PROPERTIES.NAME=\u03A0\u03C1\u03CC\u03C3\u03B8\u03B5\u03C4\u03B5\u03C2 \u03A0\u03B1\u03C1\u03AC\u03BC\u03B5\u03C4\u03C1\u03BF\u03B9 JDBC
-USER.NAME=\u038C\u03BD\u03BF\u03BC\u03B1 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7
-DB_VERSION.NAME=\u0388\u03BA\u03B4\u03BF\u03C3\u03B7 \u0392\u03B4
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u03C3\u03B5 V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u03C3\u03B5 V6R1 (Deprecated)
-USE_SHARED_CONNECTION.NAME=\u03A7\u03C1\u03AE\u03C3\u03B7 \u03AE \u039A\u03B1\u03C4\u03B1\u03C7\u03CE\u03C1\u03B7\u03C3\u03B7 \u03BC\u03B9\u03B1\u03C2 \u03B4\u03B9\u03B1\u03BC\u03BF\u03B9\u03C1\u03B1\u03B6\u03CC\u03BC\u03B5\u03BD\u03B7\u03C2 \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7\u03C2 \u0392\u0394
-SHARED_CONNECTION_NAME.NAME=\u038C\u03BD\u03BF\u03BC\u03B1 \u0394\u03B9\u03B1\u03BC\u03BF\u03B9\u03C1\u03B1\u03B6\u03CC\u03BC\u03B5\u03BD\u03B7\u03C2 \u03A3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7\u03C2 \u0392\u0394
-AUTO_COMMIT.NAME=\u0391\u03C5\u03C4\u03CC\u03BC\u03B1\u03C4\u03B7 \u0394\u03AD\u03C3\u03BC\u03B5\u03C5\u03C3\u03B7
-TYPE.NAME=\u039F\u03B4\u03B7\u03B3\u03CC\u03C2 \u0392\u03AC\u03C3\u03B7\u03C2 \u0394\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD
-PROPERTY.NAME=\u03A4\u03CD\u03C0\u03BF\u03C2 \u0399\u03B4\u03B9\u03CC\u03C4\u03B7\u03C4\u03B1\u03C2

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_en.properties

@@ -1,21 +0,0 @@
-ENCODING.NAME=Encoding
-HELP=org.talend.help.tAS400Connection
-HOST.NAME=Host
-LONG_NAME=Creates a connection to an AS400 database
-NULL_CHAR.NAME=Null Char
-PASS.NAME=Password
-PORT.NAME=Port
-PROPERTIES.NAME=Additional JDBC Parameters
-USER.NAME=Username
-DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
-USE_SHARED_CONNECTION.NAME=Use or register a shared DB Connection
-SHARED_CONNECTION_NAME.NAME=Shared DB Connection Name
-AUTO_COMMIT.NAME=Auto Commit
-TYPE.NAME=Database Driver
-PROPERTY.NAME=Property Type
-DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
-DBNAME.NAME=Database
-NB_LINE.NAME=Number of line
-DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_fr.properties

@@ -10,8 +10,6 @@ PORT.NAME=Port
 PROPERTIES.NAME=Param\u00E8tres suppl\u00E9mentaires JDBC
 USER.NAME=Utilisateur
 DB_VERSION.NAME=Version de la base de donn\u00E9es
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u00E0 V5R4 (d\u00E9pr\u00E9ci\u00E9e)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u00E0 V6R1 (D\u00E9pr\u00E9ci\u00E9)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u00E0 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u00E0 V7R3
 USE_SHARED_CONNECTION.NAME=Utiliser ou enregistrer une connexion partag\u00E9e \u00E0 une base de donn\u00E9es

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_hr.properties

@@ -1,8 +0,0 @@
-HOST.NAME=Host
-PASS.NAME=Lozinka
-PORT.NAME=Port
-PROPERTIES.NAME=Dodatni JDBC Parametri
-USER.NAME=Korisni\u010Dko ime
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 u V5R4
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 u V6R1
-PROPERTY.NAME=Tip svojstva

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_ja.properties

@@ -10,8 +10,6 @@ PORT.NAME=\u30DD\u30FC\u30C8
 PROPERTIES.NAME=\u8FFD\u52A0\u306EJDBC\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.V5R2_V5R4=V5R2\u304B\u3089V5R4 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3\u304B\u3089V6R1 (\u975E\u63A8\u5968)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
 USE_SHARED_CONNECTION.NAME=\u5171\u6709DB\u63A5\u7D9A\u306E\u4F7F\u7528\u307E\u305F\u306F\u767B\u9332

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_kr.properties

@@ -1,2 +0,0 @@
-PASS.NAME=\uBE44\uBC00\uBC88\uD638
-USER.NAME=\uC0AC\uC6A9\uC790

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_nl.properties

@@ -1,4 +0,0 @@
-PASS.NAME=Wachtwoord
-USER.NAME=Gebruikersnaam
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_pl.properties

@@ -1,12 +0,0 @@
-ENCODING.NAME=Kodowanie
-HOST.NAME=Host
-NULL_CHAR.NAME=Znak Null
-PASS.NAME=Has\u0142o
-PORT.NAME=Port
-USER.NAME=Nazwa u\u017Cytkownika
-DB_VERSION.NAME=Wersja bazy danych
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 na V5R4
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 na V6R1
-AUTO_COMMIT.NAME=Auto Commit
-TYPE.NAME=Sterownik bazy danych
-PROPERTY.NAME=Typ w\u0142a\u015Bciwo\u015Bci

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_pt_BR.properties

@@ -1,5 +0,0 @@
-HOST.NAME=Host
-NULL_CHAR.NAME=Caracter nulo
-PASS.NAME=Senha
-PORT.NAME=Porta
-AUTO_COMMIT.NAME=Auto Commit

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_ro.properties

@@ -1,6 +0,0 @@
-ENCODING.NAME=Incodare
-HOST.NAME=host
-PASS.NAME=parola
-PORT.NAME=port
-USER.NAME=Nume utilizator
-USE_SHARED_CONNECTION.NAME=Inregistreaz\u0103 sau folose\u015Fte legatur\u0103 DB partajat\u0103

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_tr.properties

@@ -1,3 +0,0 @@
-PASS.NAME=\u015Eifre
-PORT.NAME=Port
-USER.NAME=Kullan\u0131c\u0131 Ad\u0131

main/plugins/org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_zh_CN.properties

@@ -10,8 +10,6 @@ PORT.NAME=\u7AEF\u53E3
 PROPERTIES.NAME=\u9644\u52A0 JDBC \u53C2\u6570
 USER.NAME=\u7528\u6237\u540D
 DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u5230 V5R4 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u5230 V6R1 (\u5DF2\u5F03\u7528)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u81F3 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u5230 V7R3
 USE_SHARED_CONNECTION.NAME=\u4F7F\u7528\u6216\u6CE8\u518C\u5171\u4EAB\u6570\u636E\u5E93\u8FDE\u63A5

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_java.xml

@@ -64,8 +64,6 @@
     <PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="3"
 			REPOSITORY_VALUE="DB_VERSION" SHOW_IF="(USE_EXISTING_CONNECTION == 'false')">
 			<ITEMS DEFAULT="V7R1_V7R3">
-				<ITEM NAME="V5R2_V5R4" VALUE="jt400_V5R2.jar"/>
-				<ITEM NAME="V5R3_V6R1" VALUE="jt400_V5R3.jar" />
                 <ITEM NAME="V6R1_V7R2" VALUE="jt400_V6R1.jar" />
                 <ITEM NAME="V7R1_V7R3" VALUE="jt400-9.8.jar" />
 			</ITEMS>
@@ -199,12 +197,27 @@
 			<ITEM NAME="TRIM" FIELD="CHECK"></ITEM>
 		</ITEMS>
 	</PARAMETER>
+	
+	<PARAMETER
+      NAME="SET_QUERY_TIMEOUT"
+      FIELD="CHECK"
+      NUM_ROW="50"
+      >
+      <DEFAULT>false</DEFAULT>
+    </PARAMETER>
+
+    <PARAMETER
+      NAME="QUERY_TIMEOUT_IN_SECONDS"
+      FIELD="TEXT"
+      NUM_ROW="50"
+      SHOW_IF="SET_QUERY_TIMEOUT == 'true'"
+      >
+      <DEFAULT>30</DEFAULT>
+    </PARAMETER>
    </ADVANCED_PARAMETERS>
 
    <CODEGENERATION>
      <IMPORTS>
-       <IMPORT NAME="Driver-V5R2_V5R4" MODULE="jt400_V5R2.jar" MVN="mvn:org.talend.libraries/jt400_V5R2/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R2.jar')" />
-       <IMPORT NAME="Driver-V5R3_V6R1" MODULE="jt400_V5R3.jar" MVN="mvn:org.talend.libraries/jt400_V5R3/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R3.jar')" />
        <IMPORT NAME="Driver-V6R1_V7R2" MODULE="jt400_V6R1.jar" MVN="mvn:org.talend.libraries/jt400_V6R1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V6R1.jar')" />
        <IMPORT NAME="Driver-V7R1_V7R3" MODULE="jt400-9.8.jar" MVN="mvn:net.sf.jt400/jt400/9.8"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400-9.8.jar')" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages.properties

@@ -14,15 +14,15 @@ TRIM_COLUMN.NAME=Trim column
 TRIM_COLUMN.ITEM.TRIM=Trim
 TABLE.NAME=Table Name
 DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
 MAPPING.NAME=Mapping
+SET_QUERY_TIMEOUT.NAME=Set Query Timeout
+QUERY_TIMEOUT_IN_SECONDS.NAME=Timeout (seconds)
 NB_LINE.NAME=Number of line
 GUESS_SCHEMA.NAME=Guess Schema
 CONNECTION.NAME=Component List
 PROPERTY.NAME=Property Type
 TYPE.NAME=Database Driver
 SCHEMA.NAME=Schema
-ENCODING.NAME=Encoding
+ENCODING.NAME=Encoding

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_ar.properties

@@ -1,4 +0,0 @@
-PASS.NAME=\u0631\u0645\u0632 \u0627\u0644\u0645\u0631\u0648\u0631
-SCHEMA_DB.NAME=\u0645\u062E\u0637\u0637
-SCHEMA.NAME=\u0645\u062E\u0637\u0637
-DBNAME.NAME=\u0642\u0627\u0639\u062F\u0629 \u0628\u064A\u0627\u0646\u0627\u062A

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_el.properties

@@ -1,23 +0,0 @@
-HOST.NAME=\u038C\u03BD\u03BF\u03BC\u03B1 \u03BA\u03CC\u03BC\u03B2\u03BF\u03C5
-LONG_NAME=\u0394\u03B9\u03B1\u03B2\u03AC\u03B6\u03B5\u03B9 \u03AD\u03BD\u03B1\u03BD \u03C0\u03AF\u03BD\u03B1\u03BA\u03B1 \u03BA\u03B1\u03B9 \u03B5\u03BE\u03AC\u03B3\u03B5\u03B9 \u03C0\u03B5\u03B4\u03AF\u03B1 \u03B2\u03AC\u03C3\u03B5\u03B9 \u03B5\u03BD\u03CC\u03C2 \u03B5\u03C1\u03C9\u03C4\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 SQL
-PASS.NAME=\u039A\u03C9\u03B4\u03B9\u03BA\u03AE \u03BB\u03AD\u03BE\u03B7
-PROPERTIES.NAME=\u03A0\u03C1\u03CC\u03C3\u03B8\u03B5\u03C4\u03B5\u03C2 \u03A0\u03B1\u03C1\u03AC\u03BC\u03B5\u03C4\u03C1\u03BF\u03B9 JDBC
-QUERY.NAME=\u0395\u03C1\u03CE\u03C4\u03B7\u03BC\u03B1
-QUERYSTORE.NAME=\u03A4\u03CD\u03C0\u03BF\u03C2 \u0395\u03C1\u03C9\u03C4\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2
-SCHEMA_DB.NAME=\u03A3\u03C7\u03AE\u03BC\u03B1
-USER.NAME=\u038C\u03BD\u03BF\u03BC\u03B1 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7
-USE_EXISTING_CONNECTION.NAME=\u03A7\u03C1\u03AE\u03C3\u03B7 \u03C5\u03C0\u03AC\u03C1\u03C7\u03BF\u03C5\u03C3\u03B1\u03C2 \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7\u03C2
-TRIM_ALL_COLUMN.NAME=\u0391\u03C6\u03B1\u03AF\u03C1\u03B5\u03C3\u03B7 \u03BA\u03B5\u03BD\u03CE\u03BD \u03B1\u03C0\u03CC \u03CC\u03BB\u03B5\u03C2 \u03C4\u03B9\u03C2 \u03C3\u03C4\u03AE\u03BB\u03B5\u03C2 String/Char
-TRIM_COLUMN.NAME=\u0391\u03C6\u03B1\u03AF\u03C1\u03B5\u03C3\u03B7 \u03BA\u03B5\u03BD\u03CE\u03BD \u03B1\u03C0\u03CC \u03C3\u03C4\u03AE\u03BB\u03B7
-TRIM_COLUMN.ITEM.TRIM=\u0391\u03C6\u03B1\u03AF\u03C1\u03B5\u03C3\u03B7 \u039A\u03B5\u03BD\u03CE\u03BD
-TABLE.NAME=\u038C\u03BD\u03BF\u03BC\u03B1 \u03A0\u03AF\u03BD\u03B1\u03BA\u03B1
-DB_VERSION.NAME=\u0388\u03BA\u03B4\u03BF\u03C3\u03B7 \u0392\u03B4
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u03C3\u03B5 V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u03C3\u03B5 V6R1 (Deprecated)
-GUESS_SCHEMA.NAME=\u0395\u03B9\u03BA\u03B1\u03C3\u03AF\u03B1 \u03A3\u03C7\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2
-CONNECTION.NAME=\u039B\u03AF\u03C3\u03C4\u03B1 \u03A3\u03C5\u03C3\u03C4\u03B1\u03C4\u03B9\u03BA\u03CE\u03BD \u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03C9\u03BD
-PROPERTY.NAME=\u03A4\u03CD\u03C0\u03BF\u03C2 \u0399\u03B4\u03B9\u03CC\u03C4\u03B7\u03C4\u03B1\u03C2
-TYPE.NAME=\u039F\u03B4\u03B7\u03B3\u03CC\u03C2 \u0392\u03AC\u03C3\u03B7\u03C2 \u0394\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD
-SCHEMA.NAME=\u03A3\u03C7\u03AE\u03BC\u03B1
-ENCODING.NAME=\u039A\u03C9\u03B4\u03B9\u03BA\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7
-MAPPING.NAME=\u03A7\u03B1\u03C1\u03C4\u03BF\u03B3\u03C1\u03AC\u03C6\u03B7\u03C3\u03B7

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_en.properties

@@ -1,28 +0,0 @@
-HELP=org.talend.help.tAS400Input
-HOST.NAME=Host name
-LONG_NAME=Reads a table and extracts fields based on an SQL query
-PASS.NAME=Password
-PROPERTIES.NAME=Additional JDBC Parameters
-QUERY.NAME=Query
-QUERYSTORE.NAME=Query Type
-SCHEMA_DB.NAME=Schema
-USER.NAME=Username
-USE_EXISTING_CONNECTION.NAME=Using an existing connection
-TRIM_ALL_COLUMN.NAME=Trim all the String/Char columns
-TRIM_COLUMN.NAME=Trim column
-TRIM_COLUMN.ITEM.TRIM=Trim
-TABLE.NAME=Table Name
-DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
-GUESS_SCHEMA.NAME=Guess Schema
-CONNECTION.NAME=Component List
-PROPERTY.NAME=Property Type
-TYPE.NAME=Database Driver
-SCHEMA.NAME=Schema
-ENCODING.NAME=Encoding
-MAPPING.NAME=Mapping
-DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
-DBNAME.NAME=Database
-NB_LINE.NAME=Number of line
-DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_fr.properties

@@ -14,11 +14,11 @@ TRIM_COLUMN.NAME=Colonnes \u00E0 rogner
 TRIM_COLUMN.ITEM.TRIM=Supprimer les espaces en d\u00E9but et en fin de champ
 TABLE.NAME=Nom de la table
 DB_VERSION.NAME=Version de la base de donn\u00E9es
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u00E0 V5R4 (d\u00E9pr\u00E9ci\u00E9e)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u00E0 V6R1 (D\u00E9pr\u00E9ci\u00E9)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u00E0 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u00E0 V7R3
 MAPPING.NAME=Mapping
+SET_QUERY_TIMEOUT.NAME=Configurer le d\u00E9lai avant expiration de la requ\u00EAte
+QUERY_TIMEOUT_IN_SECONDS.NAME=D\u00E9lai avant expiration (secondes)
 NB_LINE.NAME=Nombre de lignes
 GUESS_SCHEMA.NAME=D\u00E9tecter le sch\u00E9ma
 CONNECTION.NAME=Liste des composants

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_hr.properties

@@ -1,10 +0,0 @@
-PASS.NAME=Lozinka
-PROPERTIES.NAME=Dodatni JDBC Parametri
-SCHEMA_DB.NAME=\n\n\t\n\nCollection\n\nSchema
-USER.NAME=Korisni\u010Dko ime
-USE_EXISTING_CONNECTION.NAME=Koristi postoje\u0107u konekciju
-TABLE.NAME=Naziv tablice
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 u V5R4
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 u V6R1
-PROPERTY.NAME=Tip svojstva
-SCHEMA.NAME=\n\n\t\n\nCollection\n\nSchema

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_ja.properties

@@ -14,13 +14,13 @@ TRIM_COLUMN.NAME=\u30AB\u30E9\u30E0\u306E\u30C8\u30EA\u30E0
 TRIM_COLUMN.ITEM.TRIM=\u30C8\u30EA\u30E0
 TABLE.NAME=\u30C6\u30FC\u30D6\u30EB\u540D
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.V5R2_V5R4=V5R2\u304B\u3089V5R4 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3\u304B\u3089V6R1 (\u975E\u63A8\u5968)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
 MAPPING.NAME=\u30DE\u30C3\u30D4\u30F3\u30B0
+SET_QUERY_TIMEOUT.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3092\u8A2D\u5B9A
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\uFF08\u79D2\uFF09
 NB_LINE.NAME=\u884C\u6570
-GUESS_SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE\u306E\u63A8\u6E2C
+GUESS_SCHEMA.NAME=\u30B9\u30AD\u30FC\u30DE\u3092\u63A8\u6E2C
 CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
 PROPERTY.NAME=\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7
 TYPE.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C9\u30E9\u30A4\u30D0\u30FC

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_kr.properties

@@ -1,4 +0,0 @@
-PASS.NAME=\uBE44\uBC00\uBC88\uD638
-USER.NAME=\uC0AC\uC6A9\uC790
-TABLE.NAME=\uD14C\uC774\uBE14\uBA85
-CONNECTION.NAME=\uCEF4\uD3EC\uB10C\uD2B8\uBAA9\uB85D

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_nl.properties

@@ -1,5 +0,0 @@
-PASS.NAME=Wachtwoord
-USER.NAME=Gebruikersnaam
-TABLE.NAME=Tabelnaam
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_pl.properties

@@ -1,16 +0,0 @@
-PASS.NAME=Has\u0142o
-QUERY.NAME=Zapytanie
-QUERYSTORE.NAME=Typ zapytania
-SCHEMA_DB.NAME=Schemat
-USER.NAME=Nazwa u\u017Cytkownika
-TABLE.NAME=Nazwa tabeli
-DB_VERSION.NAME=Wersja bazy danych
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 na V5R4
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 na V6R1
-GUESS_SCHEMA.NAME=Podpowiedz schemat
-CONNECTION.NAME=Lista komponent\u00F3w
-PROPERTY.NAME=Typ w\u0142a\u015Bciwo\u015Bci
-TYPE.NAME=Sterownik bazy danych
-SCHEMA.NAME=Schemat
-ENCODING.NAME=Kodowanie
-MAPPING.NAME=Mapowanie

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_pt_BR.properties

@@ -1,4 +0,0 @@
-PASS.NAME=Senha
-QUERYSTORE.NAME=Tipo da consulta
-TABLE.NAME=Nome da Tabela
-CONNECTION.NAME=Lista de componentes

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_ro.properties

@@ -1,4 +0,0 @@
-PASS.NAME=parola
-USER.NAME=Nume utilizator
-USE_EXISTING_CONNECTION.NAME=Folosire conexiune existent\u0103
-ENCODING.NAME=Incodare

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_sr.properties

@@ -1,2 +0,0 @@
-SCHEMA_DB.NAME=Schema
-SCHEMA.NAME=Schema

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_tr.properties

@@ -1,4 +0,0 @@
-PASS.NAME=\u015Eifre
-SCHEMA_DB.NAME=\u015Eema
-USER.NAME=Kullan\u0131c\u0131 Ad\u0131
-SCHEMA.NAME=\u015Eema

main/plugins/org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_zh_CN.properties

@@ -14,11 +14,11 @@ TRIM_COLUMN.NAME=\u526A\u88C1\u5217
 TRIM_COLUMN.ITEM.TRIM=\u526A\u88C1
 TABLE.NAME=\u8868\u540D\u79F0
 DB_VERSION.NAME=\u6570\u636E\u5E93\u7248\u672C
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u5230 V5R4 (\u5DF2\u5F03\u7528)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u5230 V6R1 (\u5DF2\u5F03\u7528)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u81F3 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u5230 V7R3
 MAPPING.NAME=\u6620\u5C04
+SET_QUERY_TIMEOUT.NAME=\u8BBE\u7F6E\u67E5\u8BE2\u8D85\u65F6
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u8D85\u65F6 (\u79D2)
 NB_LINE.NAME=\u884C\u6570
 GUESS_SCHEMA.NAME=\u63A8\u6D4B Schema
 CONNECTION.NAME=\u7EC4\u4EF6\u5217\u8868

main/plugins/org.talend.designer.components.localprovider/components/tAS400LastInsertId/tAS400LastInsertId_messages_ar.properties

@@ -1 +0,0 @@
-SCHEMA.NAME=\u0645\u062E\u0637\u0637

main/plugins/org.talend.designer.components.localprovider/components/tAS400LastInsertId/tAS400LastInsertId_messages_el.properties

@@ -1,2 +0,0 @@
-SCHEMA.NAME=\u03A3\u03C7\u03AE\u03BC\u03B1
-CONNECTION.NAME=\u039B\u03AF\u03C3\u03C4\u03B1 \u03A3\u03C5\u03C3\u03C4\u03B1\u03C4\u03B9\u03BA\u03CE\u03BD \u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03C9\u03BD

main/plugins/org.talend.designer.components.localprovider/components/tAS400LastInsertId/tAS400LastInsertId_messages_en.properties

@@ -1,5 +0,0 @@
-HELP=org.talend.help.tAS400LastInsertId
-LONG_NAME=Fetches the last insert id from a selected AS400 connection
-SCHEMA.NAME=Schema
-CONNECTION.NAME=Component List
-NB_LINE.NAME=Number of line

main/plugins/org.talend.designer.components.localprovider/components/tAS400LastInsertId/tAS400LastInsertId_messages_hr.properties

@@ -1 +0,0 @@
-SCHEMA.NAME=\n\n\t\n\nCollection\n\nSchema

main/plugins/org.talend.designer.components.localprovider/components/tAS400LastInsertId/tAS400LastInsertId_messages_kr.properties

@@ -1 +0,0 @@
-CONNECTION.NAME=\uCEF4\uD3EC\uB10C\uD2B8\uBAA9\uB85D

main/plugins/org.talend.designer.components.localprovider/components/tAS400LastInsertId/tAS400LastInsertId_messages_pl.properties

@@ -1,2 +0,0 @@
-SCHEMA.NAME=Schemat
-CONNECTION.NAME=Lista komponent\u00F3w

main/plugins/org.talend.designer.components.localprovider/components/tAS400LastInsertId/tAS400LastInsertId_messages_pt_BR.properties

@@ -1 +0,0 @@
-CONNECTION.NAME=Lista de componentes

main/plugins/org.talend.designer.components.localprovider/components/tAS400LastInsertId/tAS400LastInsertId_messages_sr.properties

@@ -1 +0,0 @@
-SCHEMA.NAME=Schema

main/plugins/org.talend.designer.components.localprovider/components/tAS400LastInsertId/tAS400LastInsertId_messages_tr.properties

@@ -1 +0,0 @@
-SCHEMA.NAME=\u015Eema

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_begin.javajet

@@ -49,10 +49,14 @@ skeleton="../templates/db_output_bulk.skeleton"
 	String commitEvery = ElementParameterParser.getValue(node, "__COMMIT_EVERY__");
 
 	boolean isEnableDebug = ("true").equals(ElementParameterParser.getValue(node,"__ENABLE_DEBUG_MODE__"));
-
+	
 	boolean useBatchSize = "true".equals(ElementParameterParser.getValue(node,"__USE_BATCH_SIZE__"));
 	String batchSize=ElementParameterParser.getValue(node,"__BATCH_SIZE__");
 
+	boolean setQueryTimeOut = "true".equals(ElementParameterParser.getValue(node,"__SET_QUERY_TIMEOUT__"));
+	
+	String queryTimeOutInSeconds = ElementParameterParser.getValue(node,"__QUERY_TIMEOUT_IN_SECONDS__");
+	
 	String rejectConnName = null;
 	List<? extends IConnection> rejectConns = node.getOutgoingConnections("REJECT");
 	if(rejectConns != null && rejectConns.size() > 0) {
@@ -174,43 +178,47 @@ if(columnList != null && columnList.size() > 0) {
     StringBuilder updateSetStmt = actionSQLMap.get(UPDATE_SET_STMT);
     StringBuilder updateWhereStmt = actionSQLMap.get(UPDATE_WHERE_STMT);
     StringBuilder deleteWhereStmt = actionSQLMap.get(DELETE_WHERE_STMT);
-
+    %>
+    java.sql.PreparedStatement pstmt_<%=cid %> = null;
+    java.sql.PreparedStatement pstmtInsert_<%=cid %> = null;
+    java.sql.PreparedStatement pstmtUpdate_<%=cid %> = null;
+    <%
 	if(("INSERT").equals(dataAction)) {
 	    %>
 	    String insert_<%=cid%> = "INSERT INTO " + <%=table%> + " (<%=insertColName.toString()%>) VALUES (<%=insertValueStmt.toString()%>)";
-	    java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>, java.sql.Statement.RETURN_GENERATED_KEYS);
+	    pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>, java.sql.Statement.RETURN_GENERATED_KEYS);
 		resourceMap.put("pstmt_<%=cid %>", pstmt_<%=cid %>);
 	    <%
 	} else if (("UPDATE").equals(dataAction)) {
 	    %>
 	    String update_<%=cid%> = "UPDATE " + <%=table%> + " SET <%=updateSetStmt.toString()%> WHERE <%=updateWhereStmt.toString()%>";
-	    java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
+	    pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
 		resourceMap.put("pstmt_<%=cid %>", pstmt_<%=cid %>);
 	    <%
 	} else if (("INSERT_OR_UPDATE").equals(dataAction)) {
 	    %>
-	    java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement("SELECT COUNT(1) FROM " + <%=table%> + " WHERE <%=updateWhereStmt.toString()%>");
+	    pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement("SELECT COUNT(1) FROM " + <%=table%> + " WHERE <%=updateWhereStmt.toString()%>");
 		resourceMap.put("pstmt_<%=cid %>", pstmt_<%=cid %>);
 	    String insert_<%=cid%> = "INSERT INTO " + <%=table%> + " (<%=insertColName.toString()%>) VALUES (<%=insertValueStmt.toString()%>)";
-	    java.sql.PreparedStatement pstmtInsert_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>);
+	    pstmtInsert_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>);
 		resourceMap.put("pstmtInsert_<%=cid %>", pstmtInsert_<%=cid %>);
 	    String update_<%=cid%> = "UPDATE " + <%=table%> + " SET <%=updateSetStmt.toString()%> WHERE <%=updateWhereStmt.toString()%>";
-	    java.sql.PreparedStatement pstmtUpdate_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
+	    pstmtUpdate_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
 		resourceMap.put("pstmtUpdate_<%=cid %>", pstmtUpdate_<%=cid %>);
 	    <%
 	} else if (("UPDATE_OR_INSERT").equals(dataAction)) {
 	    %>
 	    String update_<%=cid%> = "UPDATE " + <%=table%> + " SET <%=updateSetStmt.toString()%> WHERE <%=updateWhereStmt.toString()%>";
-	    java.sql.PreparedStatement pstmtUpdate_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
+	    pstmtUpdate_<%=cid %> = conn_<%=cid%>.prepareStatement(update_<%=cid%>);
 		resourceMap.put("pstmtUpdate_<%=cid %>", pstmtUpdate_<%=cid %>);
 	    String insert_<%=cid%> = "INSERT INTO " + <%=table%> + " (<%=insertColName.toString()%>) VALUES (<%=insertValueStmt.toString()%>)";
-	    java.sql.PreparedStatement pstmtInsert_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>);
+	    pstmtInsert_<%=cid %> = conn_<%=cid%>.prepareStatement(insert_<%=cid%>);
 		resourceMap.put("pstmtInsert_<%=cid %>", pstmtInsert_<%=cid %>);
 	    <%
 	} else if (("DELETE").equals(dataAction)) {
 	    %>
 	    String delete_<%=cid%> = "DELETE FROM " + <%=table%> + " WHERE <%=deleteWhereStmt.toString()%>";
-	    java.sql.PreparedStatement pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(delete_<%=cid%>);
+	    pstmt_<%=cid %> = conn_<%=cid%>.prepareStatement(delete_<%=cid%>);
 		resourceMap.put("pstmt_<%=cid %>", pstmt_<%=cid %>);
 	    <%
 	}
@@ -220,6 +228,20 @@ if(columnList != null && columnList.size() > 0) {
        	<%@ include file="../templates/DB/Output/splitSQLForAllDBInBegin.javajet" %>
         <%
     }
+    if(setQueryTimeOut) {
+    	if(("INSERT").equals(dataAction) || ("UPDATE").equals(dataAction) 
+			|| ("DELETE").equals(dataAction) || ("INSERT_OR_UPDATE").equals(dataAction)) {
+%>
+			pstmt_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+<%
+    	}
+    	if(("UPDATE_OR_INSERT").equals(dataAction) || ("INSERT_OR_UPDATE").equals(dataAction)) {
+%>
+			pstmtUpdate_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+			pstmtInsert_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+<%
+    	}
+	}
 }
 } // end isDynamic
 if(isDynamic) {

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_java.xml

@@ -51,8 +51,6 @@
     <PARAMETER NAME="DB_VERSION" FIELD="CLOSED_LIST" NUM_ROW="2"
 			REPOSITORY_VALUE="DB_VERSION" SHOW_IF="(USE_EXISTING_CONNECTION == 'false')">
 			<ITEMS DEFAULT="V7R1_V7R3">
-				<ITEM NAME="V5R2_V5R4" VALUE="jt400_V5R2.jar"/>
-				<ITEM NAME="V5R3_V6R1" VALUE="jt400_V5R3.jar" />
                 <ITEM NAME="V6R1_V7R2" VALUE="jt400_V6R1.jar" />
                 <ITEM NAME="V7R1_V7R3" VALUE="jt400-9.8.jar" />
 			</ITEMS>
@@ -322,13 +320,28 @@
 		NUM_ROW="20">
 		  <DEFAULT>false</DEFAULT>
 	</PARAMETER>
+	
+	<PARAMETER
+      NAME="SET_QUERY_TIMEOUT"
+      FIELD="CHECK"
+      NUM_ROW="30"
+      >
+      <DEFAULT>false</DEFAULT>
+    </PARAMETER>
+
+    <PARAMETER
+      NAME="QUERY_TIMEOUT_IN_SECONDS"
+      FIELD="TEXT"
+      NUM_ROW="30"
+      SHOW_IF="SET_QUERY_TIMEOUT == 'true'"
+      >
+      <DEFAULT>30</DEFAULT>
+    </PARAMETER>
 
   </ADVANCED_PARAMETERS>
 
    <CODEGENERATION>
      <IMPORTS>
-       <IMPORT NAME="Driver-V5R2_V5R4" MODULE="jt400_V5R2.jar" MVN="mvn:org.talend.libraries/jt400_V5R2/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R2.jar')" />
-       <IMPORT NAME="Driver-V5R3_V6R1" MODULE="jt400_V5R3.jar" MVN="mvn:org.talend.libraries/jt400_V5R3/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V5R3.jar')" />
        <IMPORT NAME="Driver-V6R1_V7R2" MODULE="jt400_V6R1.jar" MVN="mvn:org.talend.libraries/jt400_V6R1/6.0.0"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400_V6R1.jar')" />
        <IMPORT NAME="Driver-V7R1_V7R3" MODULE="jt400-9.8.jar" MVN="mvn:net.sf.jt400/jt400/9.8"  REQUIRED_IF="(USE_EXISTING_CONNECTION == 'false') AND (DB_VERSION == 'jt400-9.8.jar')" />
      </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_main.javajet

@@ -41,10 +41,13 @@ skeleton="../templates/db_output_bulk.skeleton"
     String batchSize =ElementParameterParser.getValue(node, "__BATCH_SIZE__");
     boolean useExistingConnection = "true".equals(ElementParameterParser.getValue(node,"__USE_EXISTING_CONNECTION__"));
     boolean isEnableDebug = ("true").equals(ElementParameterParser.getValue(node,"__ENABLE_DEBUG_MODE__"));
-
 	//feature:2880
     getManager(dbmsId, cid, node);
     boolean whereSupportNull = ElementParameterParser.getValue(node, "__SUPPORT_NULL_WHERE__").equals("true");
+    
+    boolean setQueryTimeOut = "true".equals(ElementParameterParser.getValue(node,"__SET_QUERY_TIMEOUT__"));
+    
+    String queryTimeOutInSeconds = ElementParameterParser.getValue(node,"__QUERY_TIMEOUT_IN_SECONDS__");
 
 	String incomingConnName = null;
 	List<IMetadataColumn> columnList = getColumnList(node);
@@ -227,6 +230,20 @@ skeleton="../templates/db_output_bulk.skeleton"
        	<%@ include file="../templates/DB/Output/splitSQLForAllDBInDynamicMain.javajet" %>
         <%
     }
+    if(setQueryTimeOut) {
+    	if(("INSERT").equals(dataAction) || ("UPDATE").equals(dataAction) 
+			|| ("DELETE").equals(dataAction) || ("INSERT_OR_UPDATE").equals(dataAction)) {
+%>
+			pstmt_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+<%
+    	}
+    	if(("UPDATE_OR_INSERT").equals(dataAction) || ("INSERT_OR_UPDATE").equals(dataAction)) {
+%>
+			pstmtUpdate_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+			pstmtInsert_<%=cid %>.setQueryTimeout(<%= queryTimeOutInSeconds %>);
+<%
+    	}
+	}
 }
 %>
 	}

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages.properties

@@ -58,8 +58,6 @@ USE_EXISTING_CONNECTION.NAME=Using an existing connection
 USE_FIELD_OPTIONS.NAME=Use field options
 ENABLE_DEBUG_MODE.NAME=Debug query mode
 DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3
 NB_LINE_UPDATED.NAME=NB Line Updated
@@ -73,3 +71,5 @@ CONNECTION.NAME=Component List
 USE_BATCH_SIZE.NAME=Use Batch Size
 BATCH_SIZE.NAME=Batch Size
 NB_LINE_REJECTED.NAME=NB Line Rejected
+SET_QUERY_TIMEOUT.NAME=Set Query Timeout
+QUERY_TIMEOUT_IN_SECONDS.NAME=Timeout (seconds)

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_ar.properties

@@ -1,32 +0,0 @@
-ADD_COLS.ITEM.NAME=\u0627\u0644\u0627\u0633\u0645
-ADD_COLS.ITEM.OPERATOR=\u0639\u0627\u0645\u0644
-ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=\u064A\u0633\u0627\u0648\u064A
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=>
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=\u0623\u0643\u0628\u0631 \u0623\u0648 \u064A\u0633\u0627\u0648\u064A
-ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
-ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=IS NOT
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_EQUAL_THAN=<
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_THAN=\u0623\u0642\u0644 \u0645\u0646
-ADD_COLS.ITEM.OPERATOR.ITEM.NOT_EQUAL=<>
-ADD_COLS.ITEM.POS=\u0645\u0648\u0642\u0639
-ADD_COLS.ITEM.POS.ITEM.REPLACE=\u0627\u0633\u062A\u0628\u062F\u0627\u0644
-ADD_COLS.ITEM.REFCOL=\u0639\u0645\u0648\u062F \u0627\u0644\u0645\u0631\u062C\u0639
-ADD_COLS.ITEM.SQL=\u062C\u0645\u0644\u0629 SQL
-ADD_COLS.NAME=\u0623\u0639\u0645\u062F\u0629 \u0625\u0636\u0627\u0641\u064A\u0629
-CLEAR_TABLE.NAME=\u062D\u0630\u0641 \u0628\u064A\u0627\u0646\u0627\u062A \u062C\u062F\u0648\u0644
-COMMIT_EVERY.NAME=\u062A\u0623\u0643\u064A\u062C \u0627\u0644\u062D\u0641\u0638 \u0643\u0644
-DATA_ACTION.ITEM.DELETE=\u062D\u0630\u0641
-DATA_ACTION.ITEM.INSERT=\u0625\u062F\u062E\u0627\u0644
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u0625\u0636\u0627\u0641\u0629 \u0623\u0648 \u062A\u0639\u062F\u064A\u0644
-DATA_ACTION.ITEM.UPDATE=\u062A\u0639\u062F\u064A\u0644
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u062A\u0639\u062F\u064A\u0644 \u0623\u0648 \u0625\u062F\u062E\u0627\u0644
-DATA_ACTION.NAME=\u0627\u0644\u0639\u0645\u0644 \u0639\u0644\u0649 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A
-FIELD_OPTIONS.ITEM.DELETE_KEY=\u0645\u0641\u062A\u0627\u062D \u0627\u0644\u062D\u0630\u0641
-FIELD_OPTIONS.ITEM.INSERTABLE=\u0642\u0627\u0628\u0644 \u0644\u0644\u0625\u062F\u062E\u0627\u0644
-FIELD_OPTIONS.ITEM.UPDATABLE=\u0642\u0627\u0628\u0644 \u0644\u0644\u062A\u0639\u062F\u064A\u0644
-FIELD_OPTIONS.ITEM.UPDATE_KEY=\u0645\u0641\u062A\u0627\u062D \u0627\u0644\u062A\u0639\u062F\u064A\u0644
-HOST.NAME=\u0627\u0644\u0645\u0636\u064A\u0641
-PASS.NAME=\u0631\u0645\u0632 \u0627\u0644\u0645\u0631\u0648\u0631
-SCHEMA_FLOW.NAME=\u0645\u062E\u0637\u0637
-BATCH_SIZE.NAME=\u062D\u062C\u0645 \u0627\u0644\u062F\u0641\u0639\u0629
-DBNAME.NAME=\u0642\u0627\u0639\u062F\u0629 \u0628\u064A\u0627\u0646\u0627\u062A

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_el.properties

@@ -1,69 +0,0 @@
-ADD_COLS.ITEM.DATATYPE=\u03A4\u03CD\u03C0\u03BF\u03C2 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD
-ADD_COLS.ITEM.NAME=\u038C\u03BD\u03BF\u03BC\u03B1
-ADD_COLS.ITEM.OPERATOR=\u03A4\u03B5\u03BB\u03B5\u03C3\u03C4\u03AE\u03C2
-ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=\u039C\u03B5\u03B3\u03B1\u03BB\u03CD\u03C4\u03B5\u03C1\u03BF \u03AE \u038A\u03C3\u03BF
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=\u039C\u03B5\u03B3\u03B1\u03BB\u03CD\u03C4\u03B5\u03C1\u03BF \u03AE \u038A\u03C3\u03BF
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=\u039C\u03B5\u03B3\u03B1\u03BB\u03CD\u03C4\u03B5\u03C1\u03BF \u03AE \u038A\u03C3\u03BF
-ADD_COLS.ITEM.OPERATOR.ITEM.IS=\u0395\u0399\u039D\u0391\u0399
-ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=\u0394\u0395\u039D \u0395\u0399\u039D\u0391\u0399
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_EQUAL_THAN=<\
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_THAN=\u039C\u03B9\u03BA\u03C1\u03CC\u03C4\u03B5\u03C1\u03BF \u03B1\u03C0\u03CC
-ADD_COLS.ITEM.OPERATOR.ITEM.NOT_EQUAL=<>
-ADD_COLS.ITEM.POS=\u0398\u03AD\u03C3\u03B7
-ADD_COLS.ITEM.POS.ITEM.AFTER=\u039C\u03B5\u03C4\u03AC
-ADD_COLS.ITEM.POS.ITEM.BEFORE=\u03A0\u03C1\u03B9\u03BD \u03B1\u03C0\u03CC
-ADD_COLS.ITEM.POS.ITEM.REPLACE=\u0391\u03BD\u03C4\u03B9\u03BA\u03B1\u03C4\u03AC\u03C3\u03C4\u03B1\u03C3\u03B7
-ADD_COLS.ITEM.REFCOL=\u03A3\u03C4\u03AE\u03BB\u03B7 \u03B1\u03BD\u03B1\u03C6\u03BF\u03C1\u03AC\u03C2
-ADD_COLS.ITEM.SQL=\u0388\u03BA\u03C6\u03C1\u03B1\u03C3\u03B7 SQL
-ADD_COLS.NAME=\u0395\u03C0\u03B9\u03C0\u03BB\u03AD\u03BF\u03BD \u03C3\u03C4\u03AE\u03BB\u03B5\u03C2
-CLEAR_TABLE.NAME=\u0395\u03BA\u03BA\u03B1\u03B8\u03AC\u03C1\u03B9\u03C3\u03B7 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD \u03C3\u03C4\u03BF\u03BD \u03C0\u03AF\u03BD\u03B1\u03BA\u03B1
-COMMIT_EVERY.NAME=\u039F\u03BB\u03BF\u03BA\u03BB\u03AE\u03C1\u03C9\u03C3\u03B7 \u03CC\u03BB\u03C9\u03BD\n
-DATA_ACTION.ITEM.DELETE=\u03B4\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE
-DATA_ACTION.ITEM.INSERT=\u03B5\u03B9\u03C3\u03B1\u03B3\u03C9\u03B3\u03AE
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u0395\u03B9\u03C3\u03B1\u03B3\u03C9\u03B3\u03AE \u03AE \u03B5\u03BD\u03B7\u03BC\u03AD\u03C1\u03C9\u03C3\u03B7
-DATA_ACTION.ITEM.UPDATE=\u0395\u03BD\u03B7\u03BC\u03AD\u03C1\u03C9\u03C3\u03B7
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u0395\u03BD\u03B7\u03BC\u03AD\u03C1\u03C9\u03C3\u03B7 \u03AE \u03B5\u03B9\u03C3\u03B1\u03B3\u03C9\u03B3\u03AE
-DATA_ACTION.NAME=\u0395\u03BD\u03AD\u03C1\u03B3\u03B5\u03B9\u03B1 \u03C3\u03B5 \u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1
-DIE_ON_ERROR.NAME=\u0394\u03B9\u03B1\u03BA\u03BF\u03C0\u03AE \u03C3\u03B5 \u03C3\u03C6\u03AC\u03BB\u03BC\u03B1
-ENCODING.NAME=\u039A\u03C9\u03B4\u03B9\u03BA\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7
-FIELD_OPTIONS.ITEM.DELETE_KEY=\u039A\u03BB\u03B5\u03B9\u03B4\u03AF \u03B4\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE\u03C2
-FIELD_OPTIONS.ITEM.INSERTABLE=\u0395\u03B9\u03C3\u03B1\u03B3\u03CC\u03BC\u03B5\u03BD\u03BF
-FIELD_OPTIONS.ITEM.UPDATABLE=\u0395\u03BD\u03B7\u03BC\u03B5\u03C1\u03CE\u03C3\u03B9\u03BC\u03BF
-FIELD_OPTIONS.ITEM.UPDATE_KEY=\u0395\u03BD\u03B7\u03BC\u03AD\u03C1\u03C9\u03C3\u03B7 \u03BA\u03BB\u03B5\u03B9\u03B4\u03B9\u03BF\u03CD
-FIELD_OPTIONS.NAME=\u0395\u03C0\u03B9\u03BB\u03BF\u03B3\u03B5\u03C2 \u03C0\u03B5\u03B4\u03AF\u03BF\u03C5
-HOST.NAME=\u039A\u03CC\u03BC\u03B2\u03BF\u03C2
-LONG_NAME=\u0395\u03B9\u03C3\u03AC\u03B3\u03B5\u03B9 \u03AE \u03B5\u03BD\u03B7\u03BC\u03B5\u03C1\u03CE\u03BD\u03B5\u03B9 \u03B3\u03C1\u03B1\u03BC\u03BC\u03AD\u03C2 \u03C3\u03B5 \u03AD\u03BD\u03B1\u03BD \u03C0\u03AF\u03BD\u03B1\u03BA\u03B1
-PASS.NAME=\u039A\u03C9\u03B4\u03B9\u03BA\u03AE \u03BB\u03AD\u03BE\u03B7
-PROPERTIES.NAME=\u03A0\u03C1\u03CC\u03C3\u03B8\u03B5\u03C4\u03B5\u03C2 \u03A0\u03B1\u03C1\u03AC\u03BC\u03B5\u03C4\u03C1\u03BF\u03B9 JDBC
-QUERY.NAME=\u0395\u03C1\u03CE\u03C4\u03B7\u03BC\u03B1
-REJECT.LINK=\u0391\u03C0\u03BF\u03C1\u03C1\u03AF\u03C8\u03B5\u03B9\u03C2
-REJECT.MENU=\u0391\u03C0\u03BF\u03C1\u03C1\u03AF\u03C8\u03B5\u03B9\u03C2
-SCHEMA_FLOW.NAME=\u03A3\u03C7\u03AE\u03BC\u03B1
-SCHEMA_REJECT.NAME=\u0391\u03C0\u03CC\u03C1\u03C1\u03B9\u03C8\u03B7 \u03A3\u03C7\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2
-STANDARD_SYNTAX.NAME=\u03A0\u03B1\u03C1\u03B1\u03B3\u03C9\u03B3\u03AE \u03C3\u03C5\u03BD\u03C4\u03B1\u03BA\u03C4\u03B9\u03BA\u03BF\u03CD Standard sql
-TABLE.NAME=\u03A0\u03AF\u03BD\u03B1\u03BA\u03B1\u03C2
-TABLE_ACTION.ITEM.CLEAR=\u0395\u03BA\u03BA\u03B1\u03B8\u03AC\u03C1\u03B9\u03C3\u03B7 \u03C0\u03AF\u03BD\u03B1\u03BA\u03B1
-TABLE_ACTION.ITEM.CREATE=\u0394\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03B3\u03AF\u03B1 \u03C0\u03AF\u03BD\u03B1\u03BA\u03B1
-TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u0394\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03B3\u03AF\u03B1 \u03C0\u03AF\u03BD\u03B1\u03BA\u03B1 \u03B1\u03BD \u03B4\u03B5\u03BD \u03C5\u03C0\u03AC\u03C1\u03C7\u03B5\u03B9
-TABLE_ACTION.ITEM.DROP_CREATE=\u0395\u03BD\u03B1\u03C0\u03CC\u03B8\u03B5\u03C3\u03B7 \u03BA\u03B1\u03B9 \u03B4\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03B3\u03AF\u03B1 \u03C0\u03AF\u03BD\u03B1\u03BA\u03B1
-TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u0395\u03BD\u03B1\u03C0\u03CC\u03B8\u03B5\u03C3\u03B7 \u03C0\u03AF\u03BD\u03B1\u03BA\u03B1 \u03B1\u03BD \u03C5\u03C0\u03AC\u03C1\u03C7\u03B5\u03B9 \u03BA\u03B1\u03B9 \u03B4\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03B3\u03AF\u03B1
-TABLE_ACTION.ITEM.NONE=\u03A0\u03C1\u03BF\u03B5\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE
-TABLE_ACTION.NAME=\u0395\u03BD\u03AD\u03C1\u03B3\u03B5\u03B9\u03B1 \u03C3\u03B5 \u03C0\u03AF\u03BD\u03B1\u03BA\u03B1
-USER.NAME=\u038C\u03BD\u03BF\u03BC\u03B1 \u03C7\u03C1\u03AE\u03C3\u03C4\u03B7
-USE_COMMIT_CONTROL.NAME=\u03A7\u03C1\u03AE\u03C3\u03B7 \u03B5\u03BB\u03AD\u03B3\u03C7\u03BF\u03C5 \u03BF\u03BB\u03BF\u03BA\u03BB\u03AE\u03C1\u03C9\u03C3\u03B7\u03C2
-USE_EXISTING_CONNECTION.NAME=\u03A7\u03C1\u03AE\u03C3\u03B7 \u03C5\u03C0\u03AC\u03C1\u03C7\u03BF\u03C5\u03C3\u03B1\u03C2 \u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7\u03C2
-USE_FIELD_OPTIONS.NAME=\u03A7\u03C1\u03AE\u03C3\u03B7 \u03B5\u03C0\u03B9\u03BB\u03BF\u03B3\u03CE\u03BD \u03C0\u03B5\u03B4\u03AF\u03BF\u03C5
-ENABLE_DEBUG_MODE.NAME=\u0395\u03BD\u03B5\u03C1\u03B3\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03BB\u03B5\u03B9\u03C4\u03BF\u03C5\u03C1\u03B3\u03AF\u03B1\u03C2 \u03B1\u03C0\u03BF\u03C3\u03C6\u03B1\u03BB\u03BC\u03AC\u03C4\u03C9\u03C3\u03B7\u03C2
-DB_VERSION.NAME=\u0388\u03BA\u03B4\u03BF\u03C3\u03B7 \u0392\u03B4
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u03C3\u03B5 V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u03C3\u03B5 V6R1 (Deprecated)
-NB_LINE_UPDATED.NAME=\u0397 \u0393\u03C1\u03B1\u03BC\u03BC\u03AE NB \u0395\u03BD\u03B7\u03BC\u03B5\u03C1\u03CE\u03B8\u03B7\u03BA\u03B5
-NB_LINE_INSERTED.NAME=\u0395\u03B9\u03C3\u03B1\u03C7\u03B8\u03B5\u03AF\u03C3\u03B1 \u0393\u03C1\u03B1\u03BC\u03BC\u03AE NB
-NB_LINE_DELETED.NAME=\u0391\u03C1\u03B9\u03B8\u03BC\u03CC\u03C2
-PROPERTY.NAME=\u03A4\u03CD\u03C0\u03BF\u03C2 \u0399\u03B4\u03B9\u03CC\u03C4\u03B7\u03C4\u03B1\u03C2
-TYPE.NAME=\u039F\u03B4\u03B7\u03B3\u03CC\u03C2 \u0392\u03AC\u03C3\u03B7\u03C2 \u0394\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03C9\u03BD
-MAPPING.NAME=\u03A7\u03B1\u03C1\u03C4\u03BF\u03B3\u03C1\u03AC\u03C6\u03B7\u03C3\u03B7
-SUPPORT_NULL_WHERE.NAME=\u03A5\u03C0\u03BF\u03C3\u03C4\u03AE\u03C1\u03B9\u03BE\u03B7 null \u03C3\u03C4\u03B7 \u03B4\u03AE\u03BB\u03C9\u03C3\u03B7 "SQL WHERE"
-CONNECTION.NAME=\u039B\u03AF\u03C3\u03C4\u03B1 \u03A3\u03C5\u03C3\u03C4\u03B1\u03C4\u03B9\u03BA\u03CE\u03BD \u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03C9\u03BD
-USE_BATCH_SIZE.NAME=\u03A7\u03C1\u03AE\u03C3\u03B7 \u039C\u03B5\u03B3\u03AD\u03B8\u03BF\u03C5\u03C2 \u0394\u03AD\u03C3\u03BC\u03B7\u03C2
-BATCH_SIZE.NAME=\u039C\u03AD\u03B3\u03B5\u03B8\u03BF\u03C2 \u03B4\u03AD\u03C3\u03BC\u03B7\u03C2

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_en.properties

@@ -1,75 +0,0 @@
-ADD_COLS.ITEM.DATATYPE=Data type
-ADD_COLS.ITEM.NAME=Name
-ADD_COLS.ITEM.OPERATOR=Operator
-ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=Greater or Equal
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=Greater or Equal
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=Greater or Equal
-ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
-ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=IS NOT
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_EQUAL_THAN=<
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_THAN=Lower than
-ADD_COLS.ITEM.OPERATOR.ITEM.NOT_EQUAL=<>
-ADD_COLS.ITEM.POS=Position
-ADD_COLS.ITEM.POS.ITEM.AFTER=After
-ADD_COLS.ITEM.POS.ITEM.BEFORE=Before
-ADD_COLS.ITEM.POS.ITEM.REPLACE=Replace
-ADD_COLS.ITEM.REFCOL=Reference column
-ADD_COLS.ITEM.SQL=SQL expression
-ADD_COLS.NAME=Additional columns
-CLEAR_TABLE.NAME=Clear data in table
-COMMIT_EVERY.NAME=Commit every
-DATA_ACTION.ITEM.DELETE=Delete
-DATA_ACTION.ITEM.INSERT=Insert
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=Insert or update
-DATA_ACTION.ITEM.UPDATE=Update
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=Update or insert
-DATA_ACTION.NAME=Action on data
-DIE_ON_ERROR.NAME=Die on error
-ENCODING.NAME=Encoding
-FIELD_OPTIONS.ITEM.DELETE_KEY=Deletion key
-FIELD_OPTIONS.ITEM.INSERTABLE=Insertable
-FIELD_OPTIONS.ITEM.UPDATABLE=Updatable
-FIELD_OPTIONS.ITEM.UPDATE_KEY=Update Key
-FIELD_OPTIONS.NAME=Field options
-HELP=org.talend.help.tInformixOutput
-HOST.NAME=Host
-LONG_NAME=Inserts or updates lines into a table
-PASS.NAME=Password
-PROPERTIES.NAME=Additional JDBC Parameters
-QUERY.NAME=Query
-REJECT.LINK=Rejects
-REJECT.MENU=Rejects
-SCHEMA_FLOW.NAME=Schema
-SCHEMA_REJECT.NAME=Reject Schema
-STANDARD_SYNTAX.NAME=Generation Standard sql syntax
-TABLE.NAME=Table
-TABLE_ACTION.ITEM.CLEAR=Clear table
-TABLE_ACTION.ITEM.CREATE=Create table
-TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=Create table if does not exist
-TABLE_ACTION.ITEM.DROP_CREATE=Drop and create table
-TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=Drop table if exists and create
-TABLE_ACTION.ITEM.NONE=Default
-TABLE_ACTION.NAME=Action on table
-USER.NAME=Username
-USE_COMMIT_CONTROL.NAME=Use commit control
-USE_EXISTING_CONNECTION.NAME=Using an existing connection
-USE_FIELD_OPTIONS.NAME=Use field options
-ENABLE_DEBUG_MODE.NAME=Debug query mode
-DB_VERSION.NAME=DB Version
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4 (Deprecated)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1 (Deprecated)
-NB_LINE_UPDATED.NAME=NB Line Updated
-NB_LINE_INSERTED.NAME=NB Line Inserted
-NB_LINE_DELETED.NAME=NB Line Deleted
-PROPERTY.NAME=Property Type
-TYPE.NAME=Database Driver
-MAPPING.NAME=Mapping
-SUPPORT_NULL_WHERE.NAME=Support null in "SQL WHERE" statement
-CONNECTION.NAME=Component List
-USE_BATCH_SIZE.NAME=Use Batch Size
-BATCH_SIZE.NAME=Batch Size
-NB_LINE_REJECTED.NAME=NB Line Rejected
-DB_VERSION.ITEM.V6R1_V7R2=V6R1 to V7R2
-DBNAME.NAME=Database
-NB_LINE.NAME=Number of line
-DB_VERSION.ITEM.V7R1_V7R3=V7R1 to V7R3

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_fr.properties

@@ -19,7 +19,7 @@ ADD_COLS.NAME=Colonnes suppl\u00E9mentaires
 CLEAR_TABLE.NAME=Effacer les donn\u00E9es dans la table
 COMMIT_EVERY.NAME=Commiter tous les
 DATA_ACTION.ITEM.DELETE=Supprimer
-DATA_ACTION.ITEM.INSERT=Insert
+DATA_ACTION.ITEM.INSERT=Ins\u00E9rer
 DATA_ACTION.ITEM.INSERT_OR_UPDATE=Ins\u00E9rer ou mettre \u00E0 jour
 DATA_ACTION.ITEM.UPDATE=Update
 DATA_ACTION.ITEM.UPDATE_OR_INSERT=Update ou insert
@@ -58,8 +58,6 @@ USE_EXISTING_CONNECTION.NAME=Utiliser une connexion existante
 USE_FIELD_OPTIONS.NAME=Utiliser les options de champ
 ENABLE_DEBUG_MODE.NAME=Mode de d\u00E9bogage de requ\u00EAte
 DB_VERSION.NAME=Version de la base de donn\u00E9es
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 \u00E0 V5R4 (d\u00E9pr\u00E9ci\u00E9e)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 \u00E0 V6R1 (D\u00E9pr\u00E9ci\u00E9)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1 \u00E0 V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1 \u00E0 V7R3
 NB_LINE_UPDATED.NAME=Nombre de lignes mises \u00E0 jour
@@ -73,3 +71,5 @@ CONNECTION.NAME=Liste des composants
 USE_BATCH_SIZE.NAME=Utiliser la taille des lots
 BATCH_SIZE.NAME=Taille des lots
 NB_LINE_REJECTED.NAME=Nombre de lignes rejet\u00E9es
+SET_QUERY_TIMEOUT.NAME=Configurer le d\u00E9lai avant expiration de la requ\u00EAte
+QUERY_TIMEOUT_IN_SECONDS.NAME=D\u00E9lai avant expiration (secondes)

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_hr.properties

@@ -1,30 +0,0 @@
-ADD_COLS.ITEM.NAME=Ime
-ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=Ve\u0107e ili jednako
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=>
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=Ve\u0107e ili jednako
-ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
-ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=IS NOT
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_EQUAL_THAN=<
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_THAN=Manje od
-ADD_COLS.ITEM.OPERATOR.ITEM.NOT_EQUAL=<>
-ADD_COLS.ITEM.POS=Pozicija
-ADD_COLS.ITEM.POS.ITEM.REPLACE=Zamijeni
-ADD_COLS.ITEM.SQL=SQL upit
-ADD_COLS.NAME=Dodatni stupci
-CLEAR_TABLE.NAME=Obri\u0161i podatke u tablici
-COMMIT_EVERY.NAME=Izvr\u0161i svaki
-DATA_ACTION.ITEM.DELETE=Obri\u0161i
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=Umetni ili a\u017Euriraj
-DATA_ACTION.ITEM.UPDATE=A\u017Euriraj
-FIELD_OPTIONS.ITEM.DELETE_KEY=Brisanje klju\u010Da
-FIELD_OPTIONS.ITEM.INSERTABLE=Dozvoljeno umetanje
-FIELD_OPTIONS.ITEM.UPDATE_KEY=klju\u010D za a\u017Euriranje
-HOST.NAME=Host
-PASS.NAME=Lozinka
-PROPERTIES.NAME=Dodatni JDBC Parametri
-SCHEMA_FLOW.NAME=\n\n\t\n\nCollection\n\nSchema
-USER.NAME=Korisni\u010Dko ime
-USE_EXISTING_CONNECTION.NAME=Koristi postoje\u0107u konekciju
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 u V5R4
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 u V6R1
-PROPERTY.NAME=Tip svojstva

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_ja.properties

@@ -55,11 +55,9 @@ TABLE_ACTION.NAME=\u30C6\u30FC\u30D6\u30EB\u306E\u64CD\u4F5C
 USER.NAME=\u30E6\u30FC\u30B6\u30FC\u540D
 USE_COMMIT_CONTROL.NAME=\u30B3\u30DF\u30C3\u30C8\u5236\u5FA1\u3092\u4F7F\u3046
 USE_EXISTING_CONNECTION.NAME=\u65E2\u5B58\u306E\u63A5\u7D9A\u3092\u4F7F\u7528
-USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u4F7F\u7528
+USE_FIELD_OPTIONS.NAME=\u30D5\u30A3\u30FC\u30EB\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528
 ENABLE_DEBUG_MODE.NAME=\u30C7\u30D0\u30C3\u30B0\u30AF\u30A8\u30EA\u30FC\u30E2\u30FC\u30C9
 DB_VERSION.NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D0\u30FC\u30B8\u30E7\u30F3
-DB_VERSION.ITEM.V5R2_V5R4=V5R2\u304B\u3089V5R4 (\u975E\u63A8\u5968)
-DB_VERSION.ITEM.V5R3_V6R1=V5R3\u304B\u3089V6R1 (\u975E\u63A8\u5968)
 DB_VERSION.ITEM.V6R1_V7R2=V6R1\u304B\u3089V7R2
 DB_VERSION.ITEM.V7R1_V7R3=V7R1\u304B\u3089V7R3
 NB_LINE_UPDATED.NAME=NB\u884C\u66F4\u65B0\u6E08\u307F
@@ -73,3 +71,5 @@ CONNECTION.NAME=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30EA\u30B9\u30C8
 USE_BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30B5\u30A4\u30BA\u3092\u4F7F\u7528
 BATCH_SIZE.NAME=\u30D0\u30C3\u30C1\u30B5\u30A4\u30BA
 NB_LINE_REJECTED.NAME=\u30EA\u30B8\u30A7\u30AF\u30C8\u884C\u6570
+SET_QUERY_TIMEOUT.NAME=\u30AF\u30A8\u30EA\u30FC\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3092\u8A2D\u5B9A
+QUERY_TIMEOUT_IN_SECONDS.NAME=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\uFF08\u79D2\uFF09

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_kr.properties

@@ -1,12 +0,0 @@
-ADD_COLS.ITEM.NAME=\uC774\uB984
-ADD_COLS.ITEM.OPERATOR=\uC5F0\uC0B0\uC790
-ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=>=
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=>=
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=>=
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_EQUAL_THAN=\uC791\uB2E4
-DATA_ACTION.ITEM.DELETE=\uC0AD\uC81C
-FIELD_OPTIONS.ITEM.INSERTABLE=\uC0BD\uC785 \uAC00\uB2A5
-FIELD_OPTIONS.ITEM.UPDATABLE=\uC5C5\uB370\uC774\uD2B8 \uAC00\uB2A5\uD55C
-PASS.NAME=\uBE44\uBC00\uBC88\uD638
-USER.NAME=\uC0AC\uC6A9\uC790
-CONNECTION.NAME=\uCEF4\uD3EC\uB10C\uD2B8\uBAA9\uB85D

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_nl.properties

@@ -1,14 +0,0 @@
-ADD_COLS.ITEM.NAME=Naam
-ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=Groter dan of gelijk aan
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=Groter dan of gelijk aan
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=Groter dan of gelijk aan
-ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_THAN=Kleiner dan
-ADD_COLS.ITEM.OPERATOR.ITEM.NOT_EQUAL=<>
-COMMIT_EVERY.NAME=Commit iedere
-DATA_ACTION.ITEM.DELETE=Verwijderen
-DATA_ACTION.ITEM.UPDATE=Update
-PASS.NAME=Wachtwoord
-USER.NAME=Gebruikersnaam
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_pl.properties

@@ -1,50 +0,0 @@
-ADD_COLS.ITEM.DATATYPE=Typ danych
-ADD_COLS.ITEM.NAME=Nazwa
-ADD_COLS.ITEM.OPERATOR=Operator
-ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=Wi\u0119ksze lub r\u00F3wne
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=Wi\u0119ksze lub r\u00F3wne
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=Wi\u0119ksze lub r\u00F3wne
-ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
-ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=Is NOT
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_EQUAL_THAN=<\
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_THAN=Mniejszy ni\u017C
-ADD_COLS.ITEM.OPERATOR.ITEM.NOT_EQUAL=<>
-ADD_COLS.ITEM.POS=Pozycja
-ADD_COLS.ITEM.POS.ITEM.AFTER=Po
-ADD_COLS.ITEM.POS.ITEM.BEFORE=Przed
-ADD_COLS.ITEM.POS.ITEM.REPLACE=Zamie\u0144
-ADD_COLS.ITEM.SQL=Wyra\u017Cenie SQL
-ADD_COLS.NAME=Kolumny dodatkowe
-CLEAR_TABLE.NAME=Wyczy\u015B\u0107 dane tabeli
-COMMIT_EVERY.NAME=Zapisz wszystko
-DATA_ACTION.ITEM.DELETE=Usu\u0144
-DATA_ACTION.ITEM.INSERT=Wstawianie
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=Wstaw lub aktualizuj
-DATA_ACTION.ITEM.UPDATE=Zaktualizuj
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=Aktualizuj lub wstaw
-DATA_ACTION.NAME=Akcja na danych
-ENCODING.NAME=Kodowanie
-FIELD_OPTIONS.ITEM.DELETE_KEY=Przycisk kasowania
-FIELD_OPTIONS.ITEM.INSERTABLE=Insertowalne
-FIELD_OPTIONS.ITEM.UPDATABLE=Aktualizowalne
-FIELD_OPTIONS.ITEM.UPDATE_KEY=Klucz UPDATE
-FIELD_OPTIONS.NAME=Opcje pola
-HOST.NAME=Host
-PASS.NAME=Has\u0142o
-QUERY.NAME=Zapytanie
-SCHEMA_FLOW.NAME=Schemat
-TABLE.NAME=Tabela
-TABLE_ACTION.ITEM.CLEAR=Wyczy\u015B\u0107 tabel\u0119
-TABLE_ACTION.ITEM.CREATE=Utw\u00F3rz tabel\u0119
-USER.NAME=Nazwa u\u017Cytkownika
-USE_FIELD_OPTIONS.NAME=Uzyj opcji Pola
-ENABLE_DEBUG_MODE.NAME=W\u0142\u0105cz tryb Debug
-DB_VERSION.NAME=Wersja bazy danych
-DB_VERSION.ITEM.V5R2_V5R4=V5R2 na V5R4
-DB_VERSION.ITEM.V5R3_V6R1=V5R3 na V6R1
-PROPERTY.NAME=Typ w\u0142a\u015Bciwo\u015Bci
-TYPE.NAME=Sterownik bazy danych
-MAPPING.NAME=Mapowanie
-SUPPORT_NULL_WHERE.NAME=Wparcie NULL w klauzuli "SQL WHERE" 
-CONNECTION.NAME=Lista komponent\u00F3w
-BATCH_SIZE.NAME=Rozmiar wsadu

main/plugins/org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_pt_BR.properties

@@ -1,32 +0,0 @@
-ADD_COLS.ITEM.DATATYPE=Tipo de dado
-ADD_COLS.ITEM.NAME=Nome
-ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=\
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=>\
-ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=>=
-ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
-ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=IS NOT
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_EQUAL_THAN=<\
-ADD_COLS.ITEM.OPERATOR.ITEM.NOT_EQUAL=<>
-ADD_COLS.ITEM.POS=Posi\u00E7\u00E3o
-ADD_COLS.ITEM.POS.ITEM.REPLACE=Trocar
-ADD_COLS.ITEM.REFCOL=Coluna de Refer\u00EAncia
-ADD_COLS.ITEM.SQL=Express\u00E3o SQL
-ADD_COLS.NAME=Colunas adicionais
-CLEAR_TABLE.NAME=Limpar os dados da tabela
-COMMIT_EVERY.NAME=Commit de todos
-DATA_ACTION.ITEM.DELETE=Deletar
-DATA_ACTION.ITEM.INSERT=Inserir
-DATA_ACTION.ITEM.INSERT_OR_UPDATE=Inserir ou atualizar
-DATA_ACTION.ITEM.UPDATE=Atualizar
-DATA_ACTION.ITEM.UPDATE_OR_INSERT=Atualizar ou inserir
-DATA_ACTION.NAME=A\u00E7\u00E3o para dado
-FIELD_OPTIONS.ITEM.DELETE_KEY=Chave ao deletar
-FIELD_OPTIONS.ITEM.INSERTABLE=Insertable
-FIELD_OPTIONS.ITEM.UPDATABLE=Atualiz\u00E1vel
-FIELD_OPTIONS.ITEM.UPDATE_KEY=Chave no update
-FIELD_OPTIONS.NAME=Op\u00E7\u00E3o de campos
-HOST.NAME=Host
-PASS.NAME=Senha
-TABLE.NAME=Tabela
-CONNECTION.NAME=Lista de componentes
-BATCH_SIZE.NAME=Tamanho do Batch