fix(TUP-17996):When Deploying one customer's job in CI, the build failed with error: constant string too long (#1403)

fix(TUP-17996):When Deploying one customer's job in CI, the build failed with error: constant string too long
https://jira.talendforge.org/browse/TUP-17996

i18n/plugins/org.talend.componentdesigner.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.componentdesigner.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.componentdesigner.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.componentdesigner.rcp.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.componentdesigner.rcp.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.componentdesigner.rcp.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.abstractmap.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.abstractmap.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.abstractmap.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.alfrescooutput.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.alfrescooutput.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.alfrescooutput.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.business.diagram.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.business.diagram.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.business.diagram.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.codegen.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.codegen.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.codegen.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.components.exchange.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.components.exchange.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.components.exchange.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.core.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.core.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.core.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.dbmap.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.dbmap.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.dbmap.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.documentation.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.documentation.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.documentation.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.fileoutputxml.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.fileoutputxml.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.fileoutputxml.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.gefabstractmap.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.gefabstractmap.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.gefabstractmap.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.hl7.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.hl7.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.hl7.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.mapper.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.mapper.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.mapper.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.maven.job.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.maven.job.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.maven.job.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.rowgenerator.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.rowgenerator.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.rowgenerator.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.runprocess.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.runprocess.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.runprocess.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.scd.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.scd.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.scd.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.webservice.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.webservice.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.webservice.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.designer.xmlmap.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.xmlmap.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.xmlmap.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.expressionbuilder.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.expressionbuilder.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.expressionbuilder.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.presentation.onboarding.resource.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.presentation.onboarding.resource.tos.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.repository.ftp.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.ftp.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.ftp.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.repository.json.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.json.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.json.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.repository.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.repository.view.di.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.view.di.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.view.di.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.sbi.engines.client.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.sbi.engines.client.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.sbi.engines.client.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.spagic.engines.client.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.spagic.engines.client.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.spagic.engines.client.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.sqlbuilder.nl/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.sqlbuilder.nl</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.sqlbuilder.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/features/org.talend.componentdesigner.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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.componentdesigner.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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.componentdesigner.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.designer.business.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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.business.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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.business.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.designer.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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.rcp.branding.tos.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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.rcp.branding.tos.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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.rcp.branding.tos.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.rcp.branding.tos.test.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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.rcp.branding.tos.test.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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.repository.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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.sbi.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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.sbi.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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.sbi.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.spagic.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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.spagic.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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.spagic.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.tos.components.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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.tos.components.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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.tos.components.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.tos.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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.tos.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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.tos.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/features/org.talend.tos.libraries.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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.tos.libraries.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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.tos.libraries.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

main/plugins/org.talend.componentdesigner.rcp/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.componentdesigner.rcp</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.componentdesigner.rcp</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/plugins/org.talend.componentdesigner/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.componentdesigner</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.componentdesigner</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/plugins/org.talend.designer.abstractmap/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.abstractmap</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.abstractmap</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/plugins/org.talend.designer.alfrescooutput/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.alfrescooutput</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.alfrescooutput</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/plugins/org.talend.designer.business.diagram/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.business.diagram</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.business.diagram</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -711,6 +711,7 @@ this.globalResumeTicket = false;//to run others jobs
 
     //5. all others sub-job (MultiThread mode)
     if(isRunInMultiThread){
+        %>final Thread launchingThread = Thread.currentThread();<%
         for (INode rootNode : rootNodes) {
             String componentName = rootNode.getComponent().getName();
             String uniqueName = rootNode.getUniqueName();
@@ -748,6 +749,10 @@ this.globalResumeTicket = false;//to run others jobs
                         status = localStatus;
                     }
 
+                    if ("true".equals(((java.util.Map) threadLocal.get()).get("JobInterrupted"))) {
+                        launchingThread.interrupt();
+                    }
+
                     runningThreadCount.add(-1);
                 }
             }
@@ -757,13 +762,22 @@ this.globalResumeTicket = false;//to run others jobs
             }
         }
 %>
+    boolean interrupted = false;
     while (runningThreadCount.getCount() > 0) {
         try {
             Thread.sleep(10);
+        } catch (java.lang.InterruptedException e) {
+            interrupted = true;
         } catch (java.lang.Exception e) {
             e.printStackTrace();
         }
     }
+
+    if (interrupted) {
+        Thread.currentThread().interrupt();
+    }
+
+
 <%
     } else { // isRunInMultiThread  //5. all others sub-job (SingleThread  mode)
         for (INode rootNode : rootNodes) {
@@ -1110,13 +1124,16 @@ if (execStat) {
 <%  if(exist_tMDM) { %>
     private void closeMDMConnections() {
         try {
-<%    for (INode mdmComponent : mdmComponentsList) { %>
-        org.talend.mdm.webservice.TMDMService service_<%=mdmComponent.getUniqueName() %> = (org.talend.mdm.webservice.TMDMService)globalMap.get("TMDMService_<%=mdmComponent.getUniqueName() %>");
-		if(service_<%=mdmComponent.getUniqueName() %> != null)
-		{
-			service_<%=mdmComponent.getUniqueName() %>.logout(new org.talend.mdm.webservice.WSLogout());
-		}
-<%    } %>
+            java.util.Iterator keySets = globalMap.keySet().iterator();
+            while (keySets.hasNext()) {
+                String key = keySets.next().toString();
+                if (key.startsWith("TMDMService_tMDMConnection_")) {
+                    org.talend.mdm.webservice.TMDMService service = (org.talend.mdm.webservice.TMDMService)globalMap.get(key);
+                    if (service != null) {
+                        service.logout(new org.talend.mdm.webservice.WSLogout());
+                    }
+                }
+            }
         } catch (java.lang.Exception e) {
         }
     }
@@ -1228,12 +1245,14 @@ if (execStat) {
             connections.put("connBaseDN_<%=ldapNode.getUniqueName() %>", globalMap.get("connBaseDN_<%=ldapNode.getUniqueName() %>"));
 <%      } %>
 
-<%        for (INode mdmNode : mdmComponentsList) {%>
-            connections.put("TMDMService_<%=mdmNode.getUniqueName() %>", globalMap.get("TMDMService_<%=mdmNode.getUniqueName() %>"));
-<%          if( "false".equals(ElementParameterParser.getValue(mdmNode, "__AUTO_COMMIT__"))) {%>
-	            connections.put("mdmTransaction_<%=mdmNode.getUniqueName() %>", globalMap.get("mdmTransaction_<%=mdmNode.getUniqueName() %>"));
-<%            }
-        } %>
+<%      for (INode mdmNode : mdmComponentsList) {%>
+            connections.put("mdmUrl_<%=mdmNode.getUniqueName() %>", globalMap.get("mdmUrl_<%=mdmNode.getUniqueName() %>"));
+            connections.put("username_<%=mdmNode.getUniqueName() %>", globalMap.get("username_<%=mdmNode.getUniqueName() %>"));
+            connections.put("password_<%=mdmNode.getUniqueName() %>", globalMap.get("password_<%=mdmNode.getUniqueName() %>"));
+            connections.put("useTransaction_<%=mdmNode.getUniqueName() %>", globalMap.get("useTransaction_<%=mdmNode.getUniqueName() %>"));
+            connections.put("useClientTranId_<%=mdmNode.getUniqueName() %>", globalMap.get("useClientTranId_<%=mdmNode.getUniqueName() %>"));
+<%      } %>
+
 <%      for (INode paloNode : paloComponentsList) { %>
             connections.put("p_<%=paloNode.getUniqueName() %>", globalMap.get("p_<%=paloNode.getUniqueName() %>"));
             connections.put("pConn_<%=paloNode.getUniqueName() %>", globalMap.get("pConn_<%=paloNode.getUniqueName() %>"));

main/plugins/org.talend.designer.codegen/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.codegen</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.codegen</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -63,6 +63,7 @@ import org.talend.core.model.components.ComponentCategory;
 import org.talend.core.model.components.ComponentManager;
 import org.talend.core.model.components.ComponentProviderInfo;
 import org.talend.core.model.components.ComponentUtilities;
+import org.talend.core.model.components.EComponentType;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IComponentsFactory;
 import org.talend.core.model.components.IComponentsHandler;
@@ -82,6 +83,7 @@ import org.talend.designer.core.model.components.ComponentFilesNaming;
 import org.talend.designer.core.model.components.EmfComponent;
 import org.talend.designer.core.model.process.AbstractProcessProvider;
 import org.talend.designer.core.model.process.GenericProcessProvider;
+import org.talend.designer.core.ui.editor.jobletcontainer.JobletUtil;
 
 /**
  * Component factory that look for each component and load their information. <br/>
@@ -769,6 +771,32 @@ public class ComponentsFactory implements IComponentsFactory {
         }
         return null;
     }
+    
+    @Override
+    public IComponent getJobletComponent(String name, String paletteType) {
+        if (componentList == null) {
+            init(false);
+        }
+        
+        for (IComponent comp : componentList) {
+            if(comp.getComponentType() != EComponentType.JOBLET){
+                continue;
+            }
+            String comName = comp.getName();
+            if(comp != null && paletteType.equals(comp.getPaletteType())){
+                if (comName.equals(name)) {
+                    return comp;
+                }else if(new JobletUtil().matchExpression(comName)){
+                    String[] names = comName.split(":"); //$NON-NLS-1$
+                    comName = names[1];
+                    if (comName.equals(name)) {
+                      return comp;
+                    }
+                }   
+            }
+        }
+        return null;
+    }
 
     @Override
     public void initializeComponents(IProgressMonitor monitor) {

main/plugins/org.talend.designer.components.exchange/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.components.exchange</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.components.exchange</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/plugins/org.talend.designer.components.libs/libs_src/mdm_transaction/src/main/java/com/talend/mdm/transaction/client/MDMTransaction.java

@@ -1,6 +1,7 @@
 package com.talend.mdm.transaction.client;
 
 import java.io.IOException;
+import java.util.List;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpException;
@@ -10,98 +11,96 @@ import org.apache.commons.httpclient.auth.AuthScope;
 import org.apache.commons.httpclient.methods.DeleteMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
 
+@SuppressWarnings("nls")
 public class MDMTransaction {
 
-    public static final String JVM_STICKY_SESSION = "sticky_session"; //$NON-NLS-1$
-    public static final String DEFAULT_STICKY_SESSION = "JSESSIONID"; //$NON-NLS-1$
+    private String url;
 
-	private String url;
-	private String id;
-	private String username;
-	private String password;
-	private String sessionId;
-	
-	public void commit() throws IOException {
-		HttpClient client = new HttpClient();
-		client.getState().setCredentials(AuthScope.ANY,
-				new UsernamePasswordCredentials(username, password));
+    private String id;
 
-		HttpMethod method = new PostMethod(url + "/" + id);
-		method.setDoAuthentication(true);
-		try {
-		    method.setRequestHeader("Cookie", getStickySession() + "=" + sessionId); //$NON-NLS-1$ //$NON-NLS-2$
-			client.executeMethod(method);
-		} catch (HttpException e) {
-			throw e;
-		} catch (IOException e) {
-			throw e;
-		} finally {
-			method.releaseConnection();
-		}
+    private String username;
 
-		int statuscode = method.getStatusCode();
-		if (statuscode >= 400) {
-		    throw new MDMTransactionException("Commit failed. The commit operation has returned the code " + statuscode + ".");
-		}
-	}
+    private String password;
 
-	public void rollback() throws IOException {
-		HttpClient client = new HttpClient();
-		client.getState().setCredentials(AuthScope.ANY,
-				new UsernamePasswordCredentials(username, password));
+    private List<String> cookies;
 
-		HttpMethod method = new DeleteMethod(url + "/" + id);
-		method.setDoAuthentication(true);
-		try {
-		    method.setRequestHeader("Cookie", getStickySession() + "=" + sessionId); //$NON-NLS-1$ //$NON-NLS-2$
-			client.executeMethod(method);
-		} catch (HttpException e) {
-			throw e;
-		} catch (IOException e) {
-			throw e;
-		} finally {
-			method.releaseConnection();
-		}
+    public void commit() throws IOException {
+        HttpClient client = new HttpClient();
+        client.getState().setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username, password));
 
-		int statuscode = method.getStatusCode();
-		if (statuscode >= 400) {
-		    throw new MDMTransactionException("Rollback failed. The rollback operation has returned the code " + statuscode + ".");
-		}
-	}
-	
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-	
-	public String getId() {
-		return id;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getSessionId() {
-        return sessionId;
-    }
-
-    public void setSessionId(String sessionId) {
-        this.sessionId = sessionId;
-    }
-
-	public static String getStickySession() {
-        String stickySession = System.getProperty(JVM_STICKY_SESSION);
-        if(stickySession == null) {
-            stickySession = DEFAULT_STICKY_SESSION;
+        HttpMethod method = new PostMethod(url + "/" + id);
+        method.setDoAuthentication(true);
+        try {
+            for (String cookie : cookies) {
+                method.addRequestHeader("Cookie", cookie);
+            }
+            client.executeMethod(method);
+        } catch (HttpException e) {
+            throw e;
+        } catch (IOException e) {
+            throw e;
+        } finally {
+            method.releaseConnection();
+        }
+
+        int statuscode = method.getStatusCode();
+        if (statuscode >= 400) {
+            throw new MDMTransactionException("Commit failed. The commit operation has returned the code " + statuscode + ".");
         }
-        return stickySession;
     }
+
+    public void rollback() throws IOException {
+        HttpClient client = new HttpClient();
+        client.getState().setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username, password));
+
+        HttpMethod method = new DeleteMethod(url + "/" + id);
+        method.setDoAuthentication(true);
+        try {
+            for (String cookie : cookies) {
+                method.addRequestHeader("Cookie", cookie);
+            }
+            client.executeMethod(method);
+        } catch (HttpException e) {
+            throw e;
+        } catch (IOException e) {
+            throw e;
+        } finally {
+            method.releaseConnection();
+        }
+
+        int statuscode = method.getStatusCode();
+        if (statuscode >= 400) {
+            throw new MDMTransactionException(
+                    "Rollback failed. The rollback operation has returned the code " + statuscode + ".");
+        }
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public List<String> getCookies() {
+        return cookies;
+    }
+
+    public void setCookies(List<String> cookies) {
+        this.cookies = cookies;
+    }
+
 }

main/plugins/org.talend.designer.components.libs/libs_src/mdm_transaction/src/main/java/com/talend/mdm/transaction/client/MDMTransactionClient.java

@@ -1,6 +1,8 @@
 package com.talend.mdm.transaction.client;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpClient;
@@ -10,13 +12,10 @@ import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthScope;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
+@SuppressWarnings("nls")
 public class MDMTransactionClient {
 
-    private static final Log LOG = LogFactory.getLog(MDMTransactionClient.class);
-
     public static MDMTransaction newTransaction(String url, String username, String password) throws IOException {
         HttpClient client = new HttpClient();
         client.getState().setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username, password));
@@ -25,11 +24,11 @@ public class MDMTransactionClient {
         PutMethod put = new PutMethod(url);
         put.setDoAuthentication(true);
         String tid;
-        String sessionID;
+        List<String> cookies;
         try {
             client.executeMethod(put);
             tid = put.getResponseBodyAsString();
-            sessionID = parseSessionID(put);
+            cookies = parseCookies(put);
         } catch (HttpException e) {
             throw e;
         } catch (IOException e) {
@@ -43,30 +42,30 @@ public class MDMTransactionClient {
         result.setId(tid);
         result.setUsername(username);
         result.setPassword(password);
-        result.setSessionId(sessionID);
+        result.setCookies(cookies);
 
         return result;
     }
 
     public static String getMDMTransactionURL(String url, boolean isNewServer) {
-        if(url == null || "".equals(url)) {
+        if (url == null || "".equals(url)) {
             return "";
         }
 
         int count = 3;
-        int i=0;
-        for(;i<url.length();i++) {
+        int i = 0;
+        for (; i < url.length(); i++) {
             char c = url.charAt(i);
-            if('/' == c) {
+            if ('/' == c) {
                 count--;
             }
-            if(count == 0) {
+            if (count == 0) {
                 break;
             }
         }
 
         String result = url.substring(0, i);
-        if(isNewServer){
+        if (isNewServer) {
             result += "/talendmdm/services/rest/transactions";
         } else {
             result += "/datamanager/services/transactions";
@@ -75,17 +74,17 @@ public class MDMTransactionClient {
         return result;
     }
 
-    public static String getSessionID(String url, String username, String password) throws IOException {
+    public static List<String> getCookies(String url, String username, String password) throws IOException {
         HttpClient client = new HttpClient();
         client.getState().setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username, password));
         client.getParams().setAuthenticationPreemptive(true);
 
         GetMethod get = new GetMethod(url);
         get.setDoAuthentication(true);
-        String sessionID;
+        List<String> cookies;
         try {
             client.executeMethod(get);
-            sessionID = parseSessionID(get);
+            cookies = parseCookies(get);
         } catch (HttpException e) {
             throw e;
         } catch (IOException e) {
@@ -93,44 +92,16 @@ public class MDMTransactionClient {
         } finally {
             get.releaseConnection();
         }
-        return sessionID;
+        return cookies;
     }
 
-    private static String parseSessionID(HttpMethod method) {
-        String sessionID = null;
-        String stickySession = MDMTransaction.getStickySession();
-        Header[] setCookie = method.getResponseHeaders("Set-Cookie"); //$NON-NLS-1$
-        for(Header header : setCookie) {
-            String headerValue = header.getValue();
-            if(headerValue.startsWith(stickySession + "=")) { //$NON-NLS-1$
-                int beginIndex = (stickySession + "=").length(); //$NON-NLS-1$
-                int endIndex = headerValue.indexOf(";", beginIndex); //$NON-NLS-1$
-                sessionID = headerValue.substring(beginIndex, endIndex);
-                break;
-            }
+    private static List<String> parseCookies(HttpMethod method) {
+        List<String> cookies = new ArrayList<String>();
+        Header[] setCookie = method.getResponseHeaders("Set-Cookie");
+        for (Header header : setCookie) {
+            cookies.add(header.getValue());
         }
-        if(sessionID == null) {
-            if(LOG.isDebugEnabled()) {
-                LOG.warn("Cookie for sticky session not found!"); //$NON-NLS-1$
-            }
-            sessionID = ""; //$NON-NLS-1$
-        }
-        return sessionID;
-    }
-
-    public static void main(String[] args) throws IOException {
-        String sessionID = MDMTransactionClient.getSessionID("http://localhost:8621/talendmdm/services/rest/transactions", "administrator", "administrator");
-        System.out.println(sessionID);
-
-        MDMTransaction mt = MDMTransactionClient.newTransaction("http://localhost:8180/talendmdm/services/rest/transactions", "administrator", "administrator");
-        mt.commit();
-
-        MDMTransaction mt1 = MDMTransactionClient.newTransaction("http://localhost:8180/talendmdm/services/rest/transactions", "administrator", "administrator");
-        mt1.rollback();
-
-        String url = "http://localhost:8180/talend/TalendPort";
-        String mdmurl = MDMTransactionClient.getMDMTransactionURL(url, true);
-        System.out.println(mdmurl);
+        return cookies;
     }
 
 }

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

@@ -1,111 +1,111 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.talend.libraries</groupId>
-	<artifactId>talend-soap</artifactId>
-	<version>2.0-20160927</version>
-	<packaging>jar</packaging>
-	
-	<name>talend-soap</name>
-	
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<cxf.version>3.1.1</cxf.version>
-		<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
-	</properties>
-	
-	<distributionManagement>
-		<snapshotRepository>
-			<id>talend_nexus_deployment</id>
-			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</snapshotRepository>
-		<repository>
-			<id>talend_nexus_deployment</id>
-			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-	</distributionManagement>
-	
-	<dependencies>
-		<dependency>
-  			<groupId>sun.jdk</groupId>
-  			<artifactId>rt.jar</artifactId>
-  			<version>1.7</version>
-  			<scope>system</scope>
-  			<systemPath>${java.home}/lib/rt.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>jdom</groupId>
-			<artifactId>jdom</artifactId>
-			<version>1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.xml.messaging.saaj</groupId>
-			<artifactId>saaj-impl</artifactId>
-			<version>1.3.2</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-			<version>1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-			<version>2.6.2</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.9</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/java</directory>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                	<source>${java.source.version}</source>
-                    <target>${java.source.version}</target>
-                    <showDeprecation>true</showDeprecation>
-             		<showWarnings>true</showWarnings>
-             		<compilerArgument>-XDignore.symbol.file</compilerArgument>
-                	<fork>true</fork>
-                </configuration>
-            </plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>default-jar</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>../../../org.talend.designer.components.localprovider/components/tSOAP</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.talend.libraries</groupId>
+	<artifactId>talend-soap</artifactId>
+	<version>2.0-20160927</version>
+	<packaging>jar</packaging>
+	
+	<name>talend-soap</name>
+	
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<cxf.version>3.1.1</cxf.version>
+		<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
+	</properties>
+	
+	<distributionManagement>
+		<snapshotRepository>
+			<id>talend_nexus_deployment</id>
+			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</snapshotRepository>
+		<repository>
+			<id>talend_nexus_deployment</id>
+			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+	</distributionManagement>
+	
+	<dependencies>
+		<dependency>
+  			<groupId>sun.jdk</groupId>
+  			<artifactId>rt.jar</artifactId>
+  			<version>1.7</version>
+  			<scope>system</scope>
+  			<systemPath>${java.home}/lib/rt.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>jdom</groupId>
+			<artifactId>jdom</artifactId>
+			<version>1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.messaging.saaj</groupId>
+			<artifactId>saaj-impl</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.6.2</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.9</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                	<source>${java.source.version}</source>
+                    <target>${java.source.version}</target>
+                    <showDeprecation>true</showDeprecation>
+             		<showWarnings>true</showWarnings>
+             		<compilerArgument>-XDignore.symbol.file</compilerArgument>
+                	<fork>true</fork>
+                </configuration>
+            </plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>../../../org.talend.designer.components.localprovider/components/tSOAP</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

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

@@ -14,7 +14,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
+		<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
 	</properties>
 	
 	<distributionManagement>

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

@@ -2,8 +2,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.talend</groupId>
-	<artifactId>httputil</artifactId>
-	<name>httputil</name>
+	<artifactId>talend-httputil</artifactId>
+	<name>talend-httputil</name>
 	<version>1.0.1</version>
 
 	<dependencies>

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

@@ -15,7 +15,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<cxf.version>3.1.1</cxf.version>
-		<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
+		<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
 	</properties>
 	
 	<distributionManagement>

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

@@ -1,84 +1,84 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.talend.libraries</groupId>
-	<artifactId>talend-mscrm</artifactId>
-	<version>2.0-20161111</version>
-	<packaging>jar</packaging>
-	
-	<name>talend-mscrm</name>
-	
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<cxf.version>3.1.1</cxf.version>
-		<talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
-	</properties>
-	
-	<distributionManagement>
-		<snapshotRepository>
-			<id>talend_nexus_deployment</id>
-			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</snapshotRepository>
-		<repository>
-			<id>talend_nexus_deployment</id>
-			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-	</distributionManagement>
-	
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.axis2</groupId>
-			<artifactId>axis2-xmlbeans</artifactId>
-			<version>1.7.0</version>
-		</dependency>
-		<dependency>
-    		<groupId>log4j</groupId>
-    		<artifactId>log4j</artifactId>
-    		<version>1.2.5</version>
-		</dependency>
-		<dependency>
-    		<groupId>org.apache.httpcomponents</groupId>
-    		<artifactId>httpclient</artifactId>
-    		<version>4.2.1</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/java</directory>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>default-jar</id>
-						<phase>package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>../../../org.talend.libraries.crm/lib</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.talend.libraries</groupId>
+	<artifactId>talend-mscrm</artifactId>
+	<version>2.0-20161111</version>
+	<packaging>jar</packaging>
+	
+	<name>talend-mscrm</name>
+	
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<cxf.version>3.1.1</cxf.version>
+		<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
+	</properties>
+	
+	<distributionManagement>
+		<snapshotRepository>
+			<id>talend_nexus_deployment</id>
+			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</snapshotRepository>
+		<repository>
+			<id>talend_nexus_deployment</id>
+			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+	</distributionManagement>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.axis2</groupId>
+			<artifactId>axis2-xmlbeans</artifactId>
+			<version>1.7.0</version>
+		</dependency>
+		<dependency>
+    		<groupId>log4j</groupId>
+    		<artifactId>log4j</artifactId>
+    		<version>1.2.5</version>
+		</dependency>
+		<dependency>
+    		<groupId>org.apache.httpcomponents</groupId>
+    		<artifactId>httpclient</artifactId>
+    		<version>4.2.1</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>../../../org.talend.libraries.crm/lib</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

main/plugins/org.talend.designer.components.libs/libs_src/thashfile/build.xml

@@ -29,8 +29,8 @@
 	<property name="compile.deprecation" value="false" />
 	<property name="compile.optimize" value="true" />
 
-    <property name="ant.build.javac.source" value="1.7"/>
-    <property name="ant.build.javac.target" value="1.7"/>
+    <property name="ant.build.javac.source" value="1.6"/>
+    <property name="ant.build.javac.target" value="1.6"/>
 
 	<target name="process" description="prepare a temp dir">
 		<antcall target="prepare" />

main/plugins/org.talend.designer.components.libs/libs_src/thashfile/org/talend/designer/components/hashfile/common/IteratorHashFile.java

@@ -17,9 +17,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-/**
- * @deprecated
- */
 public class IteratorHashFile<V> implements Iterator<V> {
 
     // it is for the MATCHING_MODE.FIRST_MATCH

main/plugins/org.talend.designer.components.libs/libs_src/thashfile/org/talend/designer/components/hashfile/common/MapHashFile.java

@@ -7,9 +7,6 @@ import java.util.Set;
 import java.util.Iterator;
 import org.talend.designer.components.hashfile.memory.AdvancedMemoryHashFile;
 
-/**
- * @deprecated use {@link MemoryCaches} instead
- */
 public class MapHashFile {
 	//use this map instead of globalMap
 	private Map<String, AdvancedMemoryHashFile> resourceMap = Collections.synchronizedMap(new HashMap<String, AdvancedMemoryHashFile>());

main/plugins/org.talend.designer.components.libs/libs_src/thashfile/org/talend/designer/components/hashfile/memory/AdvancedMemoryHashFile.java

@@ -19,13 +19,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.talend.designer.components.hashfile.common.Cache;
 import org.talend.designer.components.hashfile.common.IteratorHashFile;
 import org.talend.designer.components.hashfile.common.MATCHING_MODE;
 
-/**
- * @deprecated use {@link Cache} instead
- */
 public class AdvancedMemoryHashFile<V> {
 
     // it is for the MATCHING_MODE.FIRST_MATCH

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

@@ -1,37 +1,77 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.talend.libraries</groupId>
-    <artifactId>thashfile</artifactId>
-    <version>1.0-20160718</version>
-    <packaging>jar</packaging>
-    <name>thashfile</name>
-    <properties>
-        <talend.nexus.url>http://newbuild.talend.com:8081</talend.nexus.url>
-		<maven.compiler.source>1.7</maven.compiler.source>
-		<maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-    
-    <distributionManagement>
-        <snapshotRepository>
-            <id>talend_nexus_deployment</id>
-            <url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </snapshotRepository>
-        <repository>
-            <id>talend_nexus_deployment</id>
-            <url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </distributionManagement>
-    
-</project>
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.talend.libraries</groupId>
+	<artifactId>tshfile</artifactId>
+	<version>2.0-20160622</version>
+	<packaging>jar</packaging>
+
+	<name>thashfile</name>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<cxf.version>3.1.1</cxf.version>
+		<talend.nexus.url>https://artifacts-zl.talend.com</talend.nexus.url>
+	</properties>
+
+	<distributionManagement>
+		<snapshotRepository>
+			<id>talend_nexus_deployment</id>
+			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
+			<snapshots><enabled>true</enabled></snapshots>
+			<releases><enabled>false</enabled></releases>
+		</snapshotRepository>
+		<repository>
+			<id>talend_nexus_deployment</id>
+			<url>${talend.nexus.url}/nexus/content/repositories/TalendOpenSourceRelease/</url>
+			<snapshots><enabled>false</enabled></snapshots>
+			<releases><enabled>true</enabled></releases>
+		</repository>
+	</distributionManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-rs-client</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.3.1</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>../../../org.talend.designer.components.localprovider/components/thashfile</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

main/plugins/org.talend.designer.components.libs/libs_src/thashfile/src/main/java/org/talend/designer/components/hashfile/common/Cache.java

@@ -1,30 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.designer.components.hashfile.common;
-
-import org.talend.designer.components.hashfile.file.AdvancedFileHashFile;
-
-/**
- * Interface for caches which stores data.
- * It substitutes {@link AdvancedFileHashFile} class
- */
-public interface Cache<T> extends Iterable<T> {
-
-    /**
-     * Put value in cache. Returns null if put operation has failed
-     * 
-     * @param value value to put
-     * @return value itself or null if operation has failed
-     */
-    T put(T value);
-}

main/plugins/org.talend.designer.components.libs/libs_src/thashfile/src/main/java/org/talend/designer/components/hashfile/common/MemoryCaches.java

@@ -1,87 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.designer.components.hashfile.common;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Stores and provides MemoreCaches by key. It also supports linked caches
- */
-public class MemoryCaches {
-
-    /**
-     * Instance of this singleton
-     */
-    private static MemoryCaches instance;
-    
-    private Map<String, Cache> cacheMap;
-    
-    public static TalendMultiThreadLockMap resourceLockMap = new TalendMultiThreadLockMap();
-    
-    private MemoryCaches() {
-        cacheMap = Collections.synchronizedMap(new HashMap<String, Cache>());
-    }
-    
-    /**
-     * Returns instance of this singleton
-     * 
-     * @return instance
-     */
-    public static MemoryCaches getInstance() {
-        if (instance == null) {
-            instance = new MemoryCaches();
-        }
-        return instance;
-    }
-    
-    public <T> Cache<T> getMemoryCache(String key) {
-        Cache<T> cache = cacheMap.get(key);
-        return cache;
-    }
-    
-    public <T> void addMemoryCache(String key, Cache<T> cache) {
-        cacheMap.put(key, cache);
-    }
-    
-    /**
-     * Removes cache, which corresponds to specified key.
-     * CacheMap can contain several keys, which points to the same cache (linked caches).
-     * Method removes all pairs with value, to which points specified key
-     * 
-     * @param key cache key
-     */
-    public void clearCache(String key){
-        Cache cache = cacheMap.get(key);
-        // removes linked caches
-        cacheMap.values().removeAll(Collections.singleton(cache));
-    }
-    
-    public static class TalendMultiThreadLockMap {
-
-        private Map<Object, Object> tMultiTheadLockMap = new HashMap<Object, Object>();
-
-        public synchronized Object get(Object key) {
-            if (tMultiTheadLockMap.get(key) == null) {
-                tMultiTheadLockMap.put(key, new Object());
-            }
-            return tMultiTheadLockMap.get(key);
-        }
-
-        public synchronized void remove(Object key) {
-            tMultiTheadLockMap.remove(key);
-        }
-    }
-
-}

main/plugins/org.talend.designer.components.libs/libs_src/thashfile/src/main/java/org/talend/designer/components/hashfile/memory/KeepAllMemoryCache.java

@@ -1,61 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.designer.components.hashfile.memory;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.talend.designer.components.hashfile.common.Cache;
-
-/**
- * Memory {@link Cache}, which keeps all records even in case of key duplication 
- */
-public class KeepAllMemoryCache<V> implements Cache<V> {
-    
-    /**
-     * Stores all records
-     */
-    private List<V> allRecords;
-    
-    /**
-     * Constructor creates synchronized list to store all records
-     */
-    public KeepAllMemoryCache() {
-        allRecords = Collections.synchronizedList(new ArrayList<V>());
-    }
-
-    /**
-     * {@inheritDoc}
-     * 
-     * Iterator must be manually synched by user
-     */
-    @Override
-    public Iterator<V> iterator() {
-        return new NotRemovingIterator<V>(allRecords.iterator());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public V put(V value) {
-        if (value != null) {
-            allRecords.add(value);
-            return value;
-        }
-        return null;
-    }
-
-}

main/plugins/org.talend.designer.components.libs/libs_src/thashfile/src/main/java/org/talend/designer/components/hashfile/memory/KeepFirstMemoryCache.java

@@ -1,61 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.designer.components.hashfile.memory;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.talend.designer.components.hashfile.common.Cache;
-
-/**
- * Memory {@link Cache}, which keeps only first record with specific key in case of key duplication 
- */
-public class KeepFirstMemoryCache<V> implements Cache<V> {
-
-    /**
-     * Stores first met records
-     */
-    private Set<V> firstMetCache;
-    
-    /**
-     * Constructor creates synchronized map to store records, which key was firstly met
-     */
-    public KeepFirstMemoryCache() {
-        firstMetCache = Collections.synchronizedSet(new LinkedHashSet<V>());
-    }
-    
-    /**
-     * {@inheritDoc}
-     * 
-     * Iterator must be manually synched by user 
-     */
-    @Override
-    public Iterator<V> iterator() {
-        return new NotRemovingIterator<V>(firstMetCache.iterator());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public V put(V value) {
-        if (value != null) {
-            firstMetCache.add(value);
-            return value;
-        }
-        return null;
-    }
-
-}

main/plugins/org.talend.designer.components.libs/libs_src/thashfile/src/main/java/org/talend/designer/components/hashfile/memory/KeepLastMemoryCache.java

@@ -1,66 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.designer.components.hashfile.memory;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.talend.designer.components.hashfile.common.Cache;
-
-/**
- * Memory {@link Cache}, which keeps only last record with specific key in case of key duplication 
- */
-public class KeepLastMemoryCache<V> implements Cache<V> {
-
-    /**
-     * Stores last met records
-     */
-    private Set<V> lastMetCache;
-    
-    /**
-     * Constructor creates synchronized map to store last records with certain key
-     */
-    public KeepLastMemoryCache() {
-        lastMetCache = Collections.synchronizedSet(new LinkedHashSet<V>());
-    }
-    
-    /**
-     * {@inheritDoc}
-     * 
-     * Iterator must be manually synched by user
-     */
-    @Override
-    public Iterator<V> iterator() {
-        return new NotRemovingIterator<V>(lastMetCache.iterator());
-    }   
-        
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public V put(V value) {
-        if (value != null) {
-            // check if value is already in set
-            if(!lastMetCache.add(value)) {
-                // remove old value
-                lastMetCache.remove(value);
-                // add new value
-                lastMetCache.add(value);
-            }
-        }
-        return null;
-    }
-
-}

main/plugins/org.talend.designer.components.libs/libs_src/thashfile/src/main/java/org/talend/designer/components/hashfile/memory/MemoryCacheFactory.java

@@ -1,56 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.designer.components.hashfile.memory;
-
-import org.talend.designer.components.hashfile.common.Cache;
-
-/**
- * Creates appropriate MemoryCache according to keep mode
- */
-public class MemoryCacheFactory {
-    
-    public static final String KEEP_ALL = "KEEP_ALL";
-    
-    public static final String KEEP_FIRST = "KEEP_FIRST";
-    
-    public static final String KEEP_LAST = "KEEP_LAST";
-
-    /**
-     * Creates appropriate MemoryCache according to keep mode
-     * 
-     * @param keepMode mode, could be "KEEP_ALL"
-     * @return
-     */
-    public static <T> Cache<T> createMemoryCache(String keepMode) {
-        Cache<T> memoryCache = null;
-        switch (keepMode) {
-        case KEEP_ALL: {
-            memoryCache = new KeepAllMemoryCache<>();
-            break;
-        }
-        case KEEP_FIRST: {
-            memoryCache = new KeepFirstMemoryCache<>();
-            break;
-        }
-        case KEEP_LAST: {
-            memoryCache = new KeepLastMemoryCache<>();
-            break;
-        }
-        default:
-        {
-            memoryCache = new KeepAllMemoryCache<>();
-        }
-        }
-        return memoryCache;
-    }
-}

main/plugins/org.talend.designer.components.libs/libs_src/thashfile/src/main/java/org/talend/designer/components/hashfile/memory/NotRemovingIterator.java

@@ -1,62 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.designer.components.hashfile.memory;
-
-import java.util.Iterator;
-
-/**
- * Decorates MemoryCache iterator to disallow remove action
- */
-class NotRemovingIterator<E> implements Iterator<E> {
-
-    /**
-     * Decorated iterator
-     */
-    private Iterator<E> iterator;
-    
-    /**
-     * Constructor sets decorated iterator
-     * 
-     * @param iterator decorated iterator
-     */
-    NotRemovingIterator(Iterator<E> iterator) {
-        this.iterator = iterator;
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean hasNext() {
-        return iterator.hasNext();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public E next() {
-        return iterator.next();
-    }
-
-    /**
-     * Operation is not supported
-     * 
-     * @throws {@link UnsupportedOperationException}
-     */
-    @Override
-    public void remove() {
-        throw new UnsupportedOperationException("remove() is not supported");
-    }
-
-}

main/plugins/org.talend.designer.components.libs/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>6.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.components.libs</artifactId>
-  <packaging>eclipse-plugin</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>6.3.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.components.libs</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -167,8 +167,8 @@
             <IMPORT NAME="staxon" MODULE="staxon-1.2.jar" MVN="mvn:org.talend.libraries/staxon-1.2/6.0.0"  REQUIRED_IF="READ_BY == 'XPATH'" />
             
             <IMPORT NAME="json-path-1.2.0.jar" MODULE="json-path-1.2.0.jar" MVN="mvn:org.talend.libraries/json-path-1.2.0/6.0.0"  REQUIRED_IF="READ_BY == 'JSONPATH'" />
-            <IMPORT NAME="json-smart-2.1.0.jar" MODULE="json-smart-2.1.0.jar" MVN="mvn:org.talend.libraries/json-smart-2.1.0/6.0.0"  REQUIRED_IF="READ_BY == 'JSONPATH'" />
-            <IMPORT NAME="asm-1.0.2.jar" MODULE="asm-1.0.2.jar" MVN="mvn:org.talend.libraries/asm-1.0.2/6.0.0"  REQUIRED_IF="READ_BY == 'JSONPATH'" />
+            <IMPORT NAME="json-smart-2.2.1.jar" MODULE="json-smart-2.2.1.jar" MVN="mvn:org.talend.libraries/json-smart-2.2.1/6.0.0"  REQUIRED_IF="READ_BY == 'JSONPATH'" />
+            <IMPORT NAME="accessors-smart-1.1.jar" MODULE="accessors-smart-1.1.jar" MVN="mvn:org.talend.libraries/accessors-smart-1.1/6.0.0"  REQUIRED_IF="READ_BY == 'JSONPATH'" />
             <IMPORT NAME="slf4j-api-1.7.5.jar" MODULE="slf4j-api-1.7.5.jar" MVN="mvn:org.talend.libraries/slf4j-api-1.7.5/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.slf4j/lib/slf4j-api-1.7.5.jar" REQUIRED_IF="READ_BY == 'JSONPATH'" />
             <IMPORT NAME="slf4j-log4j12-1.7.5.jar" MODULE="slf4j-log4j12-1.7.5.jar" MVN="mvn:org.talend.libraries/slf4j-log4j12-1.7.5/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.slf4j/lib/slf4j-log4j12-1.7.5.jar" REQUIRED_IF="READ_BY == 'JSONPATH'" />
     </IMPORTS>

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputLDIF/tFileOutputLDIF_java.xml

@@ -58,7 +58,6 @@
 				<ITEM NAME="ISMULTIVALUE" FIELD="CHECK" />
 				<ITEM NAME="SEPARATOR" VALUE="&quot;,&quot;" />
 				<ITEM NAME="BINARY" FIELD="CHECK" />
-				<ITEM NAME="BINARY_TRANSFER_REQUIRED" FIELD="CHECK" NOT_READONLY_IF="(MODIFYCONFIG.BINARY =='true') AND (MODIFYCONFIG.OPERATION. !='NONE')" />
 				<ITEM NAME="BASE64" FIELD="CHECK" />
 			</ITEMS>
 		</PARAMETER>

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputLDIF/tFileOutputLDIF_main.javajet

@@ -169,7 +169,6 @@ if ("modify".equals(changetype)) {
 		String separator = null;
 		boolean isBinary = false;
 		boolean isBase64 = false;
-		boolean isBinaryTransfer = false;
 		for(Map<String, String> line:modifyColumns){// search in the configuration table
 				String columnName = line.get("SCHEMA_COLUMN");
 				if(column.getLabel().equals(columnName)){
@@ -178,7 +177,6 @@ if ("modify".equals(changetype)) {
 					separator = line.get("SEPARATOR");
 					isBinary = "true".equals(line.get("BINARY"));
 					isBase64 = "true".equals(line.get("BASE64"));
-					isBinaryTransfer = isBinary && "true".equals(line.get("BINARY_TRANSFER_REQUIRED")) && !"none".equals(operation);
 					// Binary content --> always Base64 encoded
 					// Explicit base64 encoding : base64 checkbox checked for this column
 					if(isBinary && !isBase64){
@@ -200,7 +198,7 @@ Please check "isBase64" for column <%=columnName%> when "isBianry" is checked.
 %>
 
 <%if(!"none".equals(operation)){%>
-	util_<%=cid %>.breakString(sb_<%=cid %>, "<%=operation %>: " + "<%=ldifUtil.getAttributeType(metadata,column.getLabel(),isBinaryTransfer).replaceAll(":","") %>", wrap_<%=cid %>);
+	util_<%=cid %>.breakString(sb_<%=cid %>, "<%=operation %>: " + "<%=ldifUtil.getAttributeType(metadata,column.getLabel(),isBinary).replaceAll(":","") %>", wrap_<%=cid %>);
 	<%if(isMultiValue){%>
 		String[] values_<%=column.getLabel() %>_<%=cid %> = value_<%=column.getLabel() %>_<%=cid %>.split(<%=separator %>);
 		for(String item_<%=cid %> : values_<%=column.getLabel() %>_<%=cid %>){

main/plugins/org.talend.designer.components.localprovider/components/tFileOutputLDIF/tFileOutputLDIF_messages.properties

@@ -39,7 +39,6 @@ MODIFYCONFIG.ITEM.OPERATION=Operation
 MODIFYCONFIG.ITEM.ISMULTIVALUE=MultiValue
 MODIFYCONFIG.ITEM.SEPARATOR=Separator
 MODIFYCONFIG.ITEM.BINARY=Binary
-MODIFYCONFIG.ITEM.BINARY_TRANSFER_REQUIRED=Binary transfer required
 MODIFYCONFIG.ITEM.BASE64=Base64
 MODIFYCONFIG.ITEM.OPERATION.ITEM.ADD=Add
 MODIFYCONFIG.ITEM.OPERATION.ITEM.DELETE=Delete

main/plugins/org.talend.designer.components.localprovider/components/tHashInput/tHashInput_begin.javajet

@@ -145,25 +145,25 @@
 int nb_line_<%=cid%> = 0;
 
 <%
-if (outputDataConnName != null && tHashOutput_incommingDataConnName != null) {
+ if(outputDataConnName != null && tHashOutput_incommingDataConnName != null){
 //fix bug 21630,use method getAdvancedMemoryHashFile to get a exist AdvancedMemoryHashFile
 %>	
-org.talend.designer.components.hashfile.common.MemoryCaches memoryCaches_<%=cid %> = org.talend.designer.components.hashfile.common.MemoryCaches.getInstance();
-org.talend.designer.components.hashfile.common.Cache<<%=tHashOutput_incommingDataConnName %>Struct> cache_<%=cid %> = memoryCaches_<%=cid %>.getMemoryCache("tHashFile_<%=jobName %>_" + pid +"_<%=tHashOutputName %>");
-if (cache_<%=cid %> == null) {
+org.talend.designer.components.hashfile.common.MapHashFile mf_<%=cid %>=org.talend.designer.components.hashfile.common.MapHashFile.getMapHashFile();
+org.talend.designer.components.hashfile.memory.AdvancedMemoryHashFile<<%=tHashOutput_incommingDataConnName %>Struct> tHashFile_<%=cid %> = mf_<%=cid %>.getAdvancedMemoryHashFile("tHashFile_<%=jobName %>_" + pid +"_<%=tHashOutputName %>");
+if(tHashFile_<%=cid %>==null) {
 	throw new RuntimeException("The hash is not initialized : The hash must exist before you read from it");
 }
-java.util.Iterator<<%=tHashOutput_incommingDataConnName %>Struct> iterator_<%=cid %> = cache_<%=cid %>.iterator();
+java.util.Iterator<<%=tHashOutput_incommingDataConnName %>Struct> iterator_<%=cid %> = tHashFile_<%=cid %>.iterator();
 while (iterator_<%=cid %>.hasNext()) {
     <%=tHashOutput_incommingDataConnName %>Struct next_<%=cid %> = iterator_<%=cid %>.next();
 
 <%
     List<IMetadataColumn> columns = metadata.getListColumns();
-    List<IMetadataColumn> tHashOutputcolumns = tHashOutput_metadata.getListColumns();
+    List<IMetadataColumn>  tHashOutputcolumns = tHashOutput_metadata.getListColumns();
     
     //min
     int size = Math.min(columns.size(), tHashOutputcolumns.size());
-    for(int i=0; i<size; i++) {
+    for(int i=0; i<size; i++){
 %>
 	<%=outputDataConnName %>.<%=columns.get(i).getLabel() %> = next_<%=cid %>.<%=tHashOutputcolumns.get(i).getLabel() %>;
 <%

main/plugins/org.talend.designer.components.localprovider/components/tHashInput/tHashInput_end.javajet

@@ -149,7 +149,7 @@
 		String jobName = codeGenArgument.getJobName();
     	if(release_cache){
 		%>	
-    		memoryCaches_<%=cid %>.clearCache("tHashFile_<%=jobName %>_" + pid +"_<%=tHashOutputName %>");
+    		mf_<%=cid %>.clearCache("tHashFile_<%=jobName %>_" + pid +"_<%=tHashOutputName %>");
     	<%	
     	}
     	%>

main/plugins/org.talend.designer.components.localprovider/components/tHashInput/tHashInput_java.xml

@@ -57,7 +57,7 @@
 
    <CODEGENERATION>
      <IMPORTS>
-		<IMPORT NAME="thashfile" MODULE="thashfile-1.0-20160718.jar" MVN="mvn:org.talend.libraries/thashfile-1.0-20160718/6.0.0"  REQUIRED="true" />
+		<IMPORT NAME="thashfile" MODULE="thashfile.jar" MVN="mvn:org.talend.libraries/thashfile/6.0.0"  REQUIRED="true" />
      </IMPORTS>
    </CODEGENERATION>
    

main/plugins/org.talend.designer.components.localprovider/components/tHashOutput/tHashOutput_begin.javajet

@@ -159,46 +159,48 @@
 <%
 //fix bug 21630,add a class MapHashFile,when the AdvancedMemoryHashFile of the linked tHashOutput is null,use method getAdvancedMemoryHashFile to get previous AdvancedMemoryHashFile.
 %>
-org.talend.designer.components.hashfile.common.MemoryCaches memoryCaches_<%=cid %> = org.talend.designer.components.hashfile.common.MemoryCaches.getInstance();
+org.talend.designer.components.hashfile.common.MapHashFile mf_<%=cid %>=org.talend.designer.components.hashfile.common.MapHashFile.getMapHashFile();
 <%	
-if (!isLinked) {
+if(!isLinked){//111
+	//////////////////////////////////////////////////////////////
+	//it doesn't link to another tHashOutput, it is a new HashFile.
+	
 	boolean isAppend = "true".equals(ElementParameterParser.getValue(node, "__APPEND__"));
-	if (incommingDataConn != null) {
+	
+	if(incommingDataConn != null){//222
 		String connectionName = incommingDataConn.getName();
 %>    
-		org.talend.designer.components.hashfile.common.Cache<<%=connectionName %>Struct> cache_<%=cid %> = null;
-		String hashKey_<%=cid %> = "tHashFile_<%=jobName %>_" + pid + "_<%=cid %>";
+		org.talend.designer.components.hashfile.memory.AdvancedMemoryHashFile<<%=connectionName %>Struct> tHashFile_<%=cid %> = null;
+		String hashKey_<%=cid%> = "tHashFile_<%=jobName%>_" + pid + "_<%=cid%>";
 <%
-		// It is used when Iterator exists in the same job
 		if (isAppend) {
 %>
-			synchronized(org.talend.designer.components.hashfile.common.MapHashFile.resourceLockMap.get(hashKey_<%=cid %>)) {
-				// if first iteration
-			    if (memoryCaches_<%=cid %>.getMemoryCache(hashKey_<%=cid %>) == null) {
-					cache_<%=cid %> = org.talend.designer.components.hashfile.memory.MemoryCacheFactory.createMemoryCache("<%=matchingMode %>");
-	      		    memoryCaches_<%=cid %>.addMemoryCache(hashKey_<%=cid %>, cache_<%=cid %>);
-				// if not first iteration
+			synchronized(org.talend.designer.components.hashfile.common.MapHashFile.resourceLockMap.get(hashKey_<%=cid%>)){
+			    if(mf_<%=cid%>.getResourceMap().get(hashKey_<%=cid%>) == null){
+	      		    mf_<%=cid%>.getResourceMap().put(hashKey_<%=cid%>, new org.talend.designer.components.hashfile.memory.AdvancedMemoryHashFile<<%=connectionName%>Struct>(org.talend.designer.components.hashfile.common.MATCHING_MODE.<%=matchingMode%>));
+	      		    tHashFile_<%=cid%> = mf_<%=cid%>.getResourceMap().get(hashKey_<%=cid%>);
 			    }else{
-			    	cache_<%=cid %> = memoryCaches_<%=cid %>.getMemoryCache(hashKey_<%=cid %>);
+			    	tHashFile_<%=cid%> = mf_<%=cid%>.getResourceMap().get(hashKey_<%=cid%>);
 			    }
 			}
 <%
 		} else {
 %>
-			synchronized(org.talend.designer.components.hashfile.common.MapHashFile.resourceLockMap.get(hashKey_<%=cid %>)) {
-				cache_<%=cid %> = org.talend.designer.components.hashfile.memory.MemoryCacheFactory.createMemoryCache(<%=matchingMode %>);
-				memoryCaches_<%=cid %>.addMemoryCache(hashKey_<%=cid %>, keepCache_<%=cid %>);
+			synchronized(org.talend.designer.components.hashfile.common.MapHashFile.resourceLockMap.get(hashKey_<%=cid%>)){
+				mf_<%=cid%>.getResourceMap().put(hashKey_<%=cid%>, new org.talend.designer.components.hashfile.memory.AdvancedMemoryHashFile<<%=connectionName%>Struct>(org.talend.designer.components.hashfile.common.MATCHING_MODE.<%=matchingMode%>));
+				tHashFile_<%=cid%> = mf_<%=cid%>.getResourceMap().get(hashKey_<%=cid%>);
 			}
 <%
 		}
-	}
-} else {
-	// tHashOutput component is linked to another tHashOutput, so it works in append model.
+	}//222
+}else{//111
+	//////////////////////////////////////////////////////////////
+	//it link to another tHashOutput, it works in append model.
 %>
-	org.talend.designer.components.hashfile.common.Cache<<%=tHashOutput_incommingDataConnName %>Struct> cache_<%=cid %> = memoryCaches_<%=cid %>.getMemoryCache("tHashFile_<%=jobName %>_" + pid + "_<%=tHashOutputName %>");
-	// Associate linked key with the same cache object
-	memoryCaches_<%=cid %>.addMemoryCache("tHashFile_<%=jobName %>_" + pid + "_<%=cid %>", cache_<%=cid %>);
+		org.talend.designer.components.hashfile.memory.AdvancedMemoryHashFile<<%=tHashOutput_incommingDataConnName %>Struct> tHashFile_<%=cid %> = null; 
+		//use this map to keep the present key and the previous key of AdvancedMemoryHashFile
+		mf_<%=cid %>.getKeyMap().put("tHashFile_<%=jobName %>_" +pid + "_<%=cid %>", "tHashFile_<%=jobName %>_" + pid + "_<%=tHashOutputName %>");
 <%
-}
+}//111
 %>
-    int nb_line_<%=cid %> = 0;
+        int nb_line_<%=cid%> = 0;

main/plugins/org.talend.designer.components.localprovider/components/tHashOutput/tHashOutput_java.xml

@@ -61,12 +61,13 @@
 			<DEFAULT>2</DEFAULT>
 		</PARAMETER>
 
+		<!-- todo: support KEEP_FIRST/KEEP_LAST -->		
 		<PARAMETER NAME="KEYS_MANAGEMENT" FIELD="CLOSED_LIST"
 			NUM_ROW="10"
 			SHOW_IF="(LINK_WITH =='false')">
 			<ITEMS DEFAULT="KEEP_ALL">
 				<ITEM NAME="KEEP_FIRST" VALUE="KEEP_FIRST" />
-				<ITEM NAME="KEEP_LAST" VALUE="KEEP_LAST" />
+				<!--  <ITEM NAME="KEEP_LAST" VALUE="KEEP_LAST" />  -->
 				<ITEM NAME="KEEP_ALL" VALUE="KEEP_ALL" />
 			</ITEMS>
 		</PARAMETER>
@@ -82,7 +83,7 @@
 
    <CODEGENERATION>
      <IMPORTS>
-		<IMPORT NAME="thashfile" MODULE="thashfile-1.0-20160718.jar" MVN="mvn:org.talend.libraries/thashfile-1.0-20160718/6.0.0"  REQUIRED="true" />
+		<IMPORT NAME="thashfile" MODULE="thashfile.jar" MVN="mvn:org.talend.libraries/thashfile/6.0.0"  REQUIRED="true" />
      </IMPORTS>
    </CODEGENERATION>
    

main/plugins/org.talend.designer.components.localprovider/components/tHashOutput/tHashOutput_main.javajet

@@ -160,60 +160,69 @@
 %>
 
 <%	
-if (!isLinked) {
-	if (incommingDataConn != null) {
+if(!isLinked){//111
+	//////////////////////////////////////////////////////////////
+	//it doesn't link to another tHashOutput, it is a new HashFile.
+	if(incommingDataConn != null){//222
 		String connectionName = incommingDataConn.getName();
+		
 		IMetadataTable metadataTable = incommingDataConn.getMetadataTable();
 		List<IMetadataColumn> listColumns = metadataTable.getListColumns();		
 %>    
 		<%=connectionName %>Struct oneRow_<%=cid %> = new <%=connectionName %>Struct();
+				
 <%
-        for (IMetadataColumn column : listColumns) {
-            String columnName = column.getLabel();
-			if("id_Dynamic".equals(column.getTalendType())) {
+            for (IMetadataColumn column : listColumns) {
+                String columnName = column.getLabel();
+				if("id_Dynamic".equals(column.getTalendType())) {
 %>
-				oneRow_<%=cid %>.<%=columnName %> = <%=connectionName %>.<%=columnName %>.clone();
+					oneRow_<%=cid %>.<%=columnName %> = <%=connectionName %>.<%=columnName %>.clone();
 <%
-			} else {
+				} else {
 %>
-				oneRow_<%=cid %>.<%=columnName %> = <%=connectionName %>.<%=columnName %>;
+					oneRow_<%=cid %>.<%=columnName %> = <%=connectionName %>.<%=columnName %>;
 <%
-			}
-        }
+				}
+        	}
 %>
-        cache_<%=cid %>.put(oneRow_<%=cid %>);
+		
+        tHashFile_<%=cid %>.put(oneRow_<%=cid %>);
         nb_line_<%=cid %> ++;
 <%	
-	}
-} else {
-	if (incommingDataConn != null && tHashOutput_metadata != null) {
+	}//222
+}else{//111
+	//////////////////////////////////////////////////////////////
+	//it link to another tHashOutput, it works in append model. 
+	if(incommingDataConn != null && tHashOutput_metadata != null){//333
 		String connectionName = incommingDataConn.getName();	
         List<IMetadataColumn> columns = metadata.getListColumns();
         List<IMetadataColumn>  tHashOutputcolumns = tHashOutput_metadata.getListColumns();
-		//fix bug 21630,use method getAdvancedMemoryHashFile to get a exist AdvancedMemoryHashFile
+//fix bug 21630,use method getAdvancedMemoryHashFile to get a exist AdvancedMemoryHashFile
 %>
-		if (cache_<%=cid %> == null) {
-			cache_<%=cid %> = memoryCaches_<%=cid %>.getMemoryCache("tHashFile_<%=jobName %>_" + pid +"_<%=tHashOutputName %>");
-			memoryCaches_<%=cid %>.addMemoryCache("tHashFile_<%=jobName %>_" + pid + "_<%=cid %>", cache_<%=cid %>);
+		if(tHashFile_<%=cid %> == null){
+			tHashFile_<%=cid %> = mf_<%=cid %>.getAdvancedMemoryHashFile("tHashFile_<%=jobName %>_" + pid +"_<%=tHashOutputName %>");
+			mf_<%=cid %>.getResourceMap().put("tHashFile_<%=jobName %>_" + pid +"_<%=cid %>", tHashFile_<%=cid %>);
 		}
 		<%=tHashOutput_incommingDataConnName %>Struct oneRow_<%=cid %> = new <%=tHashOutput_incommingDataConnName %>Struct();
 <%      
-		int size = Math.min(columns.size(), tHashOutputcolumns.size());
-		for (int i=0; i<size; i++) {
-			if("id_Dynamic".equals(tHashOutputcolumns.get(i).getTalendType())) {
+    //min
+    int size = Math.min(columns.size(), tHashOutputcolumns.size());
+    for(int i=0; i<size; i++){//444
+		if("id_Dynamic".equals(tHashOutputcolumns.get(i).getTalendType())) {
 %>
-				oneRow_<%=cid %>.<%=tHashOutputcolumns.get(i).getLabel() %> = <%=connectionName %>.<%=columns.get(i).getLabel() %>.clone();
+			oneRow_<%=cid %>.<%=tHashOutputcolumns.get(i).getLabel() %> = <%=connectionName %>.<%=columns.get(i).getLabel() %>.clone();
 <%
-			} else {
+		} else {
 %>
-				oneRow_<%=cid %>.<%=tHashOutputcolumns.get(i).getLabel() %> = <%=connectionName %>.<%=columns.get(i).getLabel() %>;
+			oneRow_<%=cid %>.<%=tHashOutputcolumns.get(i).getLabel() %> = <%=connectionName %>.<%=columns.get(i).getLabel() %>;
 <%
-			}
 		}
+	}//444
 %>
-        cache_<%=cid %>.put(oneRow_<%=cid %>);
+        tHashFile_<%=cid %>.put(oneRow_<%=cid %>);
         nb_line_<%=cid%> ++;	
 <%	
-	}
-}
+  }//333
+
+}//111
 %>

main/plugins/org.talend.designer.components.localprovider/components/tMDMBulkLoad/tMDMBulkLoad_begin.javajet

@@ -36,33 +36,35 @@ String trans = "mdmTrans_" + connection;
 org.talend.mdm.bulkload.client.BulkloadClient bulkloadClient_<%=cid %> = new org.talend.mdm.bulkload.client.BulkloadClient(<%=mdmUrl %>, <%=username %>, decryptedPassword_<%=cid %>, null, <%=dataCluster %> + "<%=isStaging?"#STAGING":""%>", <%=dataEntity %>, <%=dataModule %>);
 
 <%if(useTransaction) {%>
-    String transKey_<%=cid %> = "<%=trans%>_" + Thread.currentThread().getThreadGroup().getName();
-    com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
-    if(mdmTransaction_<%=cid %> == null) {
-        String murl_<%=cid %> = (String)globalMap.get("mdmUrl_<%=connection %>");
-        if(murl_<%=cid %>.endsWith("?wsdl")) {
-            murl_<%=cid %> = murl_<%=cid %>.substring(0, murl_<%=cid %>.length() - 5);
+    if(globalMap.get("useTransaction_<%=connection %>") != null && (Boolean)globalMap.get("useTransaction_<%=connection %>")) {
+        String transKey_<%=cid %> = "<%=trans%>_" + Thread.currentThread().getThreadGroup().getName();
+        com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
+        if(mdmTransaction_<%=cid %> == null) {
+            String murl_<%=cid %> = (String)globalMap.get("mdmUrl_<%=connection %>");
+            if(murl_<%=cid %>.endsWith("?wsdl")) {
+                murl_<%=cid %> = murl_<%=cid %>.substring(0, murl_<%=cid %>.length() - 5);
+            }
+            String turl_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getMDMTransactionURL(murl_<%=cid %>, true);
+            String username_<%=cid %> = (String)globalMap.get("username_<%=connection %>");
+            String password_<%=cid %> = (String)globalMap.get("password_<%=connection %>");
+            if((Boolean)globalMap.get("useClientTranId_<%=connection %>")) {
+                List<String> cookies_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getCookies(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
+                mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
+                mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
+                mdmTransaction_<%=cid %>.setId("<%=cid %>_" + java.util.UUID.randomUUID());
+                mdmTransaction_<%=cid %>.setUsername(username_<%=cid %>);
+                mdmTransaction_<%=cid %>.setPassword(password_<%=cid %>);
+                mdmTransaction_<%=cid %>.setCookies(cookies_<%=cid%>);
+            } else {
+                <% logUtil.debug("\"Attempt to get a remote transaction from url: \" + murl_" + cid);%>
+                mdmTransaction_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.newTransaction(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
+            }
+            globalMap.put(transKey_<%=cid %>, mdmTransaction_<%=cid %>);
+            <% logUtil.debug("\"Got transaction successfully with key=\" + transKey_" + cid);%>
         }
-        String turl_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getMDMTransactionURL(murl_<%=cid %>, true);
-        String username_<%=cid %> = (String)globalMap.get("username_<%=connection %>");
-        String password_<%=cid %> = (String)globalMap.get("password_<%=connection %>");
-        if((Boolean)globalMap.get("useClientTranId_<%=connection %>")) {
-            String sessionID_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
-            mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
-            mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
-            mdmTransaction_<%=cid %>.setId("<%=cid %>_" + java.util.UUID.randomUUID());
-            mdmTransaction_<%=cid %>.setUsername(username_<%=cid %>);
-            mdmTransaction_<%=cid %>.setPassword(password_<%=cid %>);
-            mdmTransaction_<%=cid %>.setSessionId(sessionID_<%=cid %>);
-        } else {
-            <% logUtil.debug("\"Attempt to get a remote transaction from url: \" + murl_" + cid);%>
-            mdmTransaction_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.newTransaction(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
-        }
-        globalMap.put(transKey_<%=cid %>, mdmTransaction_<%=cid %>);
-        <% logUtil.debug("\"Got transaction successfully with key=\" + transKey_" + cid);%>
+        bulkloadClient_<%=cid %>.setTransactionId(mdmTransaction_<%=cid %>.getId());
+        bulkloadClient_<%=cid %>.setCookies(mdmTransaction_<%=cid%>.getCookies());
     }
-    bulkloadClient_<%=cid %>.setTransactionId(mdmTransaction_<%=cid %>.getId());
-    bulkloadClient_<%=cid %>.setSessionId(mdmTransaction_<%=cid%>.getSessionId());
 <%}%>
 
 bulkloadClient_<%=cid %>.startThreadCount();

main/plugins/org.talend.designer.components.localprovider/components/tMDMDelete/tMDMDelete_begin.javajet

@@ -71,13 +71,13 @@ int nb_line_<%=cid %> = 0;
             com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
             if(mdmTransaction_<%=cid %> == null){
                 if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
-                    String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
+                    List<String> cookies_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getCookies(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
                     mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
                     mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
                     mdmTransaction_<%=cid %>.setId("<%=cid %>_" + java.util.UUID.randomUUID());
                     mdmTransaction_<%=cid %>.setUsername(username_<%=cid %>);
                     mdmTransaction_<%=cid %>.setPassword(password_<%=cid %>);
-                    mdmTransaction_<%=cid %>.setSessionId(sessionID_<%=cid%>);
+                    mdmTransaction_<%=cid %>.setCookies(cookies_<%=cid%>);
                 }else{
                     <% logUtil.debug("\"Attempt to get a remote transaction from url: \" + murl_" + cid);%>
                     mdmTransaction_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.newTransaction(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
@@ -89,8 +89,7 @@ int nb_line_<%=cid %> = 0;
                 context_<%=cid %>.put(org.apache.cxf.headers.Header.HEADER_LIST, soapHeaders_<%=cid %>);
 
                 java.util.Map<String, java.util.List<String>> httpHeaders_<%=cid %> = new java.util.HashMap<String, java.util.List<String>>();
-                String cookie_<%=cid %> = com.talend.mdm.transaction.client.MDMTransaction.getStickySession() + "=" + mdmTransaction_<%=cid%>.getSessionId();
-                httpHeaders_<%=cid %>.put("Cookie", java.util.Arrays.asList(cookie_<%=cid %>));
+                httpHeaders_<%=cid %>.put("Cookie", mdmTransaction_<%=cid %>.getCookies());
                 context_<%=cid %>.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, httpHeaders_<%=cid %>);
 
                 globalMap.put(transKey_<%=cid %>, mdmTransaction_<%=cid %>);

main/plugins/org.talend.designer.components.localprovider/components/tMDMInput/tMDMInput_java.xml

@@ -166,8 +166,6 @@
                     <ITEM NAME="NONE" VALUE="NONE" />
                     <ITEM NAME="OR" VALUE="OR" />
                     <ITEM NAME="AND" VALUE="AND" />                 
-                    <ITEM NAME="STRICTAND" VALUE="STRICTAND" />
-                    <ITEM NAME="EXACTLY" VALUE="EXACTLY" />
                     <ITEM NAME="NOT" VALUE="NOT" />
                 </ITEMS>
             </ITEM>

main/plugins/org.talend.designer.components.localprovider/components/tMDMOutput/tMDMOutput_begin.javajet

@@ -139,13 +139,13 @@ int nb_line_rejected_<%=cid %> = 0;
             com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
             if(mdmTransaction_<%=cid %> == null){
                 if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
-                    String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
+                    List<String> cookies_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getCookies(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
                     mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
                     mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
                     mdmTransaction_<%=cid %>.setId("<%=cid %>_" + java.util.UUID.randomUUID());
                     mdmTransaction_<%=cid %>.setUsername(username_<%=cid %>);
                     mdmTransaction_<%=cid %>.setPassword(password_<%=cid %>);
-                    mdmTransaction_<%=cid %>.setSessionId(sessionID_<%=cid%>);
+                    mdmTransaction_<%=cid %>.setCookies(cookies_<%=cid%>);
                 }else{
                     <% logUtil.debug("\"Attempt to get a remote transaction from url: \" + murl_" + cid);%>
                     mdmTransaction_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.newTransaction(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
@@ -157,8 +157,7 @@ int nb_line_rejected_<%=cid %> = 0;
                 context_<%=cid %>.put(org.apache.cxf.headers.Header.HEADER_LIST, soapHeaders_<%=cid %>);
 
                 java.util.Map<String, java.util.List<String>> httpHeaders_<%=cid %> = new java.util.HashMap<String, java.util.List<String>>();
-                String cookie_<%=cid %> = com.talend.mdm.transaction.client.MDMTransaction.getStickySession() + "=" + mdmTransaction_<%=cid%>.getSessionId();
-                httpHeaders_<%=cid %>.put("Cookie", java.util.Arrays.asList(cookie_<%=cid %>));
+                httpHeaders_<%=cid %>.put("Cookie", mdmTransaction_<%=cid %>.getCookies());
                 context_<%=cid %>.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, httpHeaders_<%=cid %>);
 
                 globalMap.put(transKey_<%=cid %>, mdmTransaction_<%=cid %>);

main/plugins/org.talend.designer.components.localprovider/components/tMDMReadConf/tMDMReadConf_begin.javajet

@@ -114,13 +114,13 @@ if ((metadatas != null) && (metadatas.size() > 0)) {//1
                             com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
                             if(mdmTransaction_<%=cid %> == null){
                                 if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
-                                    String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
+                                    List<String> cookies_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getCookies(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
                                     mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
                                     mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
                                     mdmTransaction_<%=cid %>.setId("<%=cid %>_" + java.util.UUID.randomUUID());
                                     mdmTransaction_<%=cid %>.setUsername(username_<%=cid %>);
                                     mdmTransaction_<%=cid %>.setPassword(password_<%=cid %>);
-                                    mdmTransaction_<%=cid %>.setSessionId(sessionID_<%=cid%>);
+                                    mdmTransaction_<%=cid %>.setCookies(cookies_<%=cid%>);
                                 }else{
                                     <% logUtil.debug("\"Attempt to get a remote transaction from url: \" + murl_" + cid);%>
                                     mdmTransaction_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.newTransaction(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
@@ -132,8 +132,7 @@ if ((metadatas != null) && (metadatas.size() > 0)) {//1
                                 context_<%=cid %>.put(org.apache.cxf.headers.Header.HEADER_LIST, soapHeaders_<%=cid %>);
 
                                 java.util.Map<String, java.util.List<String>> httpHeaders_<%=cid %> = new java.util.HashMap<String, java.util.List<String>>();
-                                String cookie_<%=cid %> = com.talend.mdm.transaction.client.MDMTransaction.getStickySession() + "=" + mdmTransaction_<%=cid%>.getSessionId();
-                                httpHeaders_<%=cid %>.put("Cookie", java.util.Arrays.asList(cookie_<%=cid %>));
+                                httpHeaders_<%=cid %>.put("Cookie", mdmTransaction_<%=cid %>.getCookies());
                                 context_<%=cid %>.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, httpHeaders_<%=cid %>);
 
                                 globalMap.put(transKey_<%=cid %>, mdmTransaction_<%=cid %>);

main/plugins/org.talend.designer.components.localprovider/components/tMDMReadConf/tMDMReadConf_java.xml

@@ -157,8 +157,6 @@
 	        		<ITEM NAME="NONE" VALUE="NONE" />
 	        		<ITEM NAME="OR" VALUE="OR" />
 	        		<ITEM NAME="AND" VALUE="AND" />
-	        		<ITEM NAME="STRICTAND" VALUE="STRICTAND" />
-	        		<ITEM NAME="EXACTLY" VALUE="EXACTLY" />
 	        		<ITEM NAME="NOT" VALUE="NOT" />
 	        	</ITEMS>
 	        </ITEM>

main/plugins/org.talend.designer.components.localprovider/components/tMDMRouteRecord/tMDMRouteRecord_main.javajet

@@ -76,13 +76,13 @@ int nb_line_<%=cid %> = 0;
             com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
             if(mdmTransaction_<%=cid %> == null){
                 if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
-                    String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
+                    List<String> cookies_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getCookies(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
                     mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
                     mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
                     mdmTransaction_<%=cid %>.setId("<%=cid %>_" + java.util.UUID.randomUUID());
                     mdmTransaction_<%=cid %>.setUsername(username_<%=cid %>);
                     mdmTransaction_<%=cid %>.setPassword(password_<%=cid %>);
-                    mdmTransaction_<%=cid %>.setSessionId(sessionID_<%=cid%>);
+                    mdmTransaction_<%=cid %>.setCookies(cookies_<%=cid%>);
                 }else{
                     <% logUtil.debug("\"Attempt to get a remote transaction from url: \" + murl_" + cid);%>
                     mdmTransaction_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.newTransaction(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
@@ -94,8 +94,7 @@ int nb_line_<%=cid %> = 0;
                 context_<%=cid %>.put(org.apache.cxf.headers.Header.HEADER_LIST, soapHeaders_<%=cid %>);
 
                 java.util.Map<String, java.util.List<String>> httpHeaders_<%=cid %> = new java.util.HashMap<String, java.util.List<String>>();
-                String cookie_<%=cid %> = com.talend.mdm.transaction.client.MDMTransaction.getStickySession() + "=" + mdmTransaction_<%=cid%>.getSessionId();
-                httpHeaders_<%=cid %>.put("Cookie", java.util.Arrays.asList(cookie_<%=cid %>));
+                httpHeaders_<%=cid %>.put("Cookie", mdmTransaction_<%=cid %>.getCookies());
                 context_<%=cid %>.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, httpHeaders_<%=cid %>);
 
                 globalMap.put(transKey_<%=cid %>, mdmTransaction_<%=cid %>);

main/plugins/org.talend.designer.components.localprovider/components/tMDMSP/tMDMSP_begin.javajet

@@ -69,13 +69,13 @@ int nb_line_<%=cid %> = 0;
             com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
             if(mdmTransaction_<%=cid %> == null){
                 if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
-                    String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
+                    List<String> cookies_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getCookies(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
                     mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
                     mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
                     mdmTransaction_<%=cid %>.setId("<%=cid %>_" + java.util.UUID.randomUUID());
                     mdmTransaction_<%=cid %>.setUsername(username_<%=cid %>);
                     mdmTransaction_<%=cid %>.setPassword(password_<%=cid %>);
-                    mdmTransaction_<%=cid %>.setSessionId(sessionID_<%=cid%>);
+                    mdmTransaction_<%=cid %>.setCookies(cookies_<%=cid%>);
                 }else{
                     <% logUtil.debug("\"Attempt to get a remote transaction from url: \" + murl_" + cid);%>
                     mdmTransaction_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.newTransaction(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
@@ -87,8 +87,7 @@ int nb_line_<%=cid %> = 0;
                 context_<%=cid %>.put(org.apache.cxf.headers.Header.HEADER_LIST, soapHeaders_<%=cid %>);
 
                 java.util.Map<String, java.util.List<String>> httpHeaders_<%=cid %> = new java.util.HashMap<String, java.util.List<String>>();
-                String cookie_<%=cid %> = com.talend.mdm.transaction.client.MDMTransaction.getStickySession() + "=" + mdmTransaction_<%=cid%>.getSessionId();
-                httpHeaders_<%=cid %>.put("Cookie", java.util.Arrays.asList(cookie_<%=cid %>));
+                httpHeaders_<%=cid %>.put("Cookie", mdmTransaction_<%=cid %>.getCookies());
                 context_<%=cid %>.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, httpHeaders_<%=cid %>);
 
                 globalMap.put(transKey_<%=cid %>, mdmTransaction_<%=cid %>);

main/plugins/org.talend.designer.components.localprovider/components/tMDMViewSearch/tMDMViewSearch_begin.javajet

@@ -112,13 +112,13 @@ if ((metadatas != null) && (metadatas.size() > 0)) {
                             com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
                             if(mdmTransaction_<%=cid %> == null){
                                 if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
-                                    String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
+                                    List<String> cookies_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getCookies(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
                                     mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
                                     mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
                                     mdmTransaction_<%=cid %>.setId("<%=cid %>_" + java.util.UUID.randomUUID());
                                     mdmTransaction_<%=cid %>.setUsername(username_<%=cid %>);
                                     mdmTransaction_<%=cid %>.setPassword(password_<%=cid %>);
-                                    mdmTransaction_<%=cid %>.setSessionId(sessionID_<%=cid%>);
+                                    mdmTransaction_<%=cid %>.setCookies(cookies_<%=cid%>);
                                 }else{
                                     <% logUtil.debug("\"Attempt to get a remote transaction from url: \" + murl_" + cid);%>
                                     mdmTransaction_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.newTransaction(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
@@ -130,8 +130,7 @@ if ((metadatas != null) && (metadatas.size() > 0)) {
                                 context_<%=cid %>.put(org.apache.cxf.headers.Header.HEADER_LIST, soapHeaders_<%=cid %>);
 
                                 java.util.Map<String, java.util.List<String>> httpHeaders_<%=cid %> = new java.util.HashMap<String, java.util.List<String>>();
-                                String cookie_<%=cid %> = com.talend.mdm.transaction.client.MDMTransaction.getStickySession() + "=" + mdmTransaction_<%=cid%>.getSessionId();
-                                httpHeaders_<%=cid %>.put("Cookie", java.util.Arrays.asList(cookie_<%=cid %>));
+                                httpHeaders_<%=cid %>.put("Cookie", mdmTransaction_<%=cid %>.getCookies());
                                 context_<%=cid %>.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, httpHeaders_<%=cid %>);
 
                                 globalMap.put(transKey_<%=cid %>, mdmTransaction_<%=cid %>);

main/plugins/org.talend.designer.components.localprovider/components/tMDMWriteConf/tMDMWriteConf_begin.javajet

@@ -143,13 +143,13 @@ int nb_line_rejected_<%=cid %> = 0;
             com.talend.mdm.transaction.client.MDMTransaction mdmTransaction_<%=cid %> = (com.talend.mdm.transaction.client.MDMTransaction)globalMap.get(transKey_<%=cid %>);
             if(mdmTransaction_<%=cid %> == null){
                 if((Boolean)globalMap.get("useClientTranId_<%=connection %>")){
-                    String sessionID_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getSessionID(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
+                    List<String> cookies_<%=cid%> = com.talend.mdm.transaction.client.MDMTransactionClient.getCookies(turl_<%=cid%>,username_<%=cid%>,password_<%=cid%>);
                     mdmTransaction_<%=cid %> = new com.talend.mdm.transaction.client.MDMTransaction();
                     mdmTransaction_<%=cid %>.setUrl(turl_<%=cid %>);
                     mdmTransaction_<%=cid %>.setId("<%=cid %>_" + java.util.UUID.randomUUID());
                     mdmTransaction_<%=cid %>.setUsername(username_<%=cid %>);
                     mdmTransaction_<%=cid %>.setPassword(password_<%=cid %>);
-                    mdmTransaction_<%=cid %>.setSessionId(sessionID_<%=cid%>);
+                    mdmTransaction_<%=cid %>.setCookies(cookies_<%=cid%>);
                 }else{
                     <% logUtil.debug("\"Attempt to get a remote transaction from url: \" + murl_" + cid);%>
                     mdmTransaction_<%=cid %> = com.talend.mdm.transaction.client.MDMTransactionClient.newTransaction(turl_<%=cid %>,username_<%=cid %>,password_<%=cid %>);
@@ -161,8 +161,7 @@ int nb_line_rejected_<%=cid %> = 0;
                 context_<%=cid %>.put(org.apache.cxf.headers.Header.HEADER_LIST, soapHeaders_<%=cid %>);
 
                 java.util.Map<String, java.util.List<String>> httpHeaders_<%=cid %> = new java.util.HashMap<String, java.util.List<String>>();
-                String cookie_<%=cid %> = com.talend.mdm.transaction.client.MDMTransaction.getStickySession() + "=" + mdmTransaction_<%=cid%>.getSessionId();
-                httpHeaders_<%=cid %>.put("Cookie", java.util.Arrays.asList(cookie_<%=cid %>));
+                httpHeaders_<%=cid %>.put("Cookie", mdmTransaction_<%=cid %>.getCookies());
                 context_<%=cid %>.put(org.apache.cxf.message.Message.PROTOCOL_HEADERS, httpHeaders_<%=cid %>);
 
                 globalMap.put(transKey_<%=cid %>, mdmTransaction_<%=cid %>);

main/plugins/org.talend.designer.components.localprovider/components/tREST/tREST_begin.javajet

@@ -129,8 +129,10 @@ imports="
 				%>		
 				<%=conn.getName() %> = new <%=conn.getName() %>Struct();
 				if(errorResponse_<%=cid%>!=null){
-					<%=conn.getName() %>.Body = errorResponse_<%=cid%>.getEntity(String.class);
 					<%=conn.getName() %>.ERROR_CODE = errorResponse_<%=cid%>.getStatus();
+					if(<%=conn.getName() %>.ERROR_CODE!=204){
+					    <%=conn.getName() %>.Body = errorResponse_<%=cid%>.getEntity(String.class);
+					}
 				}else{
 					<%=conn.getName() %>.Body = restResponse_<%=cid%>;
 				}

main/plugins/org.talend.designer.components.localprovider/components/tWebServiceInput/tWebServiceInput_java.xml

@@ -203,12 +203,12 @@ for(int i = 0; i < result.length; i++){
 		<IMPORTS>
 			<IMPORT NAME="WebServiceInput" MODULE="WebServiceInput.jar" MVN="mvn:org.talend.libraries/WebServiceInput/6.0.0"
 				REQUIRED="true" />
-			<IMPORT NAME="SOAP-axis" MODULE="axis.jar" MVN="mvn:org.talend.libraries/axis/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/axis.jar" REQUIRED="true" />
+			<IMPORT NAME="SOAP-axis" MODULE="axis-p1.jar" MVN="mvn:org.talend.libraries/axis-p1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.axis2/lib/axis-p1.jar" REQUIRED="true" />
 			<IMPORT NAME="SOAP-jaxrpc" MODULE="jaxrpc.jar" MVN="mvn:org.talend.libraries/jaxrpc/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.jax/lib/jaxrpc.jar"
 				REQUIRED="true" />
 			<IMPORT NAME="SOAP-saaj" MODULE="saaj.jar" MVN="mvn:org.talend.libraries/saaj/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.saaj/lib/saaj.jar" REQUIRED="true" />
 			<IMPORT NAME="WSDL4J-1_6_3" MODULE="wsdl4j-1.6.3.jar" MVN="mvn:org.talend.libraries/wsdl4j-1.6.3/6.0.0"
-				BundleID="org.apache.servicemix.bundles.wsdl4j" REQUIRED="true" />
+				REQUIRED="true" />
 			<IMPORT NAME="SOAP-discovery"
 				MODULE="commons-discovery-0.2.jar" MVN="mvn:org.talend.libraries/commons-discovery-0.2/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-discovery-0.2.jar" REQUIRED="true" />
 			<IMPORT NAME="SOAP-logging" MODULE="commons-logging-1.1.jar" MVN="mvn:org.talend.libraries/commons-logging-1.1/6.0.0"  UrlPath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-logging-1.1.jar"

main/plugins/org.talend.designer.components.localprovider/components/templates/Log4j/LogUtil.javajet

@@ -61,7 +61,7 @@ class BasicLogUtil{
             <%
             }
             %>
-            log.<%=level%>("<%=logID%> - " <%for(String message : messages){%> + <%=message%> <%}%>);
+            log.<%=level%>("<%=logID%> - " <%for(String message : messages){%> + (<%=message%>) <%}%>);
         <%
         }
     }

main/plugins/org.talend.designer.components.localprovider/components/templates/db_output_bulk.skeleton

@@ -2709,8 +2709,13 @@ public class CLASS {
             } else if(actionType == UPDATE_TYPE) {
                 prefix = "pstmtUpdate_";
             }
+            String dbType = column.getColumn().getType();
             StringBuilder setStmt = new StringBuilder();
-            if(typeToGenerate.equals("Character")) {
+            if(dbType.equals("UUID") && (typeToGenerate.equals("String") || typeToGenerate.equals("Object"))) {
+                isObject = true;
+                setStmt.append("if(" + incomingConnName + "." + column.getName() + " == null) {\r\n");
+                setStmt.append(prefix + cid + ".setNull(" + index + ", java.sql.Types.OTHER);\r\n");
+            } else if(typeToGenerate.equals("Character")) {
                 isObject = true;
                 setStmt.append("if(" + incomingConnName + "." + column.getName() + " == null) {\r\n");
                 setStmt.append(prefix + cid + ".setNull(" + index + ", java.sql.Types.CHAR);\r\n");                
@@ -2793,6 +2798,8 @@ public class CLASS {
                 setStmt.append(prefix + cid + ".setNull(" + index + ", java.sql.Types.VARCHAR);\r\n");
                 setStmt.append(prefix + cid + ".setNull(" + index + " + 1 , java.sql.Types.INTEGER);\r\n");
                 setStmt.append("}\r\n");    
+            } else if(dbType.equals("UUID") && (typeToGenerate.equals("String") || typeToGenerate.equals("Object"))) {
+                setStmt.append(prefix + cid + ".setObject(" + index + ", " + incomingConnName + "." + column.getName() + ", java.sql.Types.OTHER);\r\n");
             } else {
                 setStmt.append(prefix + cid + ".set" + typeToGenerate + "(" + index + ", " + incomingConnName + "." + column.getName() + ");\r\n");
             }