chore: support export item

chore: support to export item
TUP-22780 Icons under repository broken during switch to branch, and NPE pop up (#4749 )
2022-09-19 10:44:06 +08:00 · 2022-09-19 10:38:39 +08:00 · 2021-11-09 19:26:37 +08:00 · 2021-11-05 20:05:00 +08:00 · 2021-11-04 22:16:15 +08:00 · 2021-11-04 19:55:39 +08:00
355 changed files with 6704 additions and 3736 deletions
--- a/main/features/org.talend.commons.feature/feature.xml
+++ b/main/features/org.talend.commons.feature/feature.xml
@@ -8,7 +8,6 @@
    <discovery label="Talend web site" url="http://www.talend.com"/> 
  </url>  
  <requires>
-    <import plugin="org.bouncycastle.bcprov" version="1.68.0" match="greaterOrEqual"/>
    <import plugin="com.fasterxml.jackson.core.jackson-databind" version="2.9.8" match="greaterOrEqual"/>
    <import plugin="jackson-core-asl" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="jackson-mapper-asl" version="0.0.0" match="greaterOrEqual"/>
--- a/main/features/org.talend.commons.feature/pom.xml
+++ b/main/features/org.talend.commons.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.feature</artifactId>
--- a/main/features/org.talend.core.feature/feature.xml
+++ b/main/features/org.talend.core.feature/feature.xml
@@ -21,7 +21,7 @@
    <import feature="org.eclipse.gef" version="0.0.0" match="greaterOrEqual"/>
    <import feature="org.eclipse.gmf.runtime.notation" version="0.0.0" match="greaterOrEqual"/>
    <import feature="org.eclipse.jdt" version="0.0.0" match="greaterOrEqual"/>
-    <import feature="org.eclipse.platform" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.platform.feature" version="0.0.0" match="greaterOrEqual"/>
    <import feature="org.talend.tos.libraries.feature" version="0.0.0" match="greaterOrEqual"/>
    <import feature="org.talend.utils.feature" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="javax.activation" version="0.0.0" match="greaterOrEqual"/>
--- a/main/features/org.talend.core.feature/pom.xml
+++ b/main/features/org.talend.core.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.feature</artifactId>
--- a/main/features/org.talend.fragment.jars.common.feature/pom.xml
+++ b/main/features/org.talend.fragment.jars.common.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.fragment.jars.common.feature</artifactId>
--- a/main/features/org.talend.help.feature/pom.xml
+++ b/main/features/org.talend.help.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.help.feature</artifactId>
--- a/main/features/org.talend.libraries.jdbc.feature/pom.xml
+++ b/main/features/org.talend.libraries.jdbc.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.libraries.jdbc.feature</artifactId>
--- a/main/features/org.talend.platform.feature/build.properties
+++ b/main/features/org.talend.platform.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
--- a/main/features/org.talend.platform.feature/feature.xml
+++ b/main/features/org.talend.platform.feature/feature.xml
@@ -0,0 +1,525 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.platform.feature"
+      label="Platform featrue"
+      version="8.0.1.qualifier"
+      provider-name=".Talend SA.">
+
+   <description url="http://www.talend.com/online/featuresdescription.html#platform-feature">
+      Complete description about this feature at http://www.talend.com/online/featuresdescription.html#platform-feature
+   </description>
+
+   <copyright url="http://www.talend.com/online/copyright.txt">
+      Copyright Talend 2006, 2007
+   </copyright>
+
+   <license>
+      The licence are describe in branding feature
+   </license>
+
+   <includes
+         id="org.eclipse.rcp"
+         version="4.20.0.v20210611-1600"/>
+
+   <includes
+         id="org.eclipse.equinox.p2.user.ui"
+         version="2.4.1200.v20210507-0825"
+         optional="true"/>
+
+   <includes
+         id="org.eclipse.help"
+         version="2.3.600.v20210611-1600"/>
+
+   <plugin
+         id="org.apache.ant"
+         download-size="3025"
+         install-size="3540"
+         version="1.10.10.v20210426-1926"/>
+
+   <plugin
+         id="org.eclipse.ant.core"
+         download-size="105"
+         install-size="186"
+         version="3.6.0.v20210415-1314"
+         unpack="false"/>
+
+   <plugin
+         id="com.jcraft.jsch"
+         download-size="297"
+         install-size="539"
+         version="0.1.55.v20190404-1902"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.compare.core"
+         download-size="66"
+         install-size="127"
+         version="3.6.1000.v20201020-1107"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.compare"
+         download-size="789"
+         install-size="1572"
+         version="3.8.0.v20210415-0713"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.compare.win32"
+         os="win32"
+         download-size="43"
+         install-size="77"
+         version="1.2.800.v20200127-1343"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filebuffers"
+         download-size="113"
+         install-size="244"
+         version="3.7.0.v20210512-1543"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem"
+         download-size="68"
+         install-size="128"
+         version="1.9.0.v20210419-1155"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.net"
+         download-size="64"
+         install-size="124"
+         version="1.3.1100.v20210424-0724"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.net.linux"
+         os="linux"
+         download-size="14"
+         install-size="22"
+         version="1.0.0.v20210424-0724"
+         fragment="true"
+         unpack="false"/>
+   
+   <plugin
+         id="org.eclipse.core.net.linux.x86_64"
+         os="linux"
+         arch="x86_64"
+         download-size="7"
+         install-size="11"
+         version="1.2.500.v20210510-1619"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.net.win32.x86_64"
+         os="win32"
+         arch="x86_64"
+         download-size="34"
+         install-size="63"
+         version="1.1.500.v20190925-1337"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.resources"
+         download-size="877"
+         install-size="1912"
+         version="3.15.0.v20210521-0722"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi.util"
+         download-size="71"
+         install-size="148"
+         version="3.6.0.v20210212-1137"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.debug.core"
+         download-size="387"
+         install-size="807"
+         version="3.18.100.v20210511-0446"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.debug.ui"
+         download-size="2979"
+         install-size="6065"
+         version="3.15.0.v20210525-1810"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.e4.ui.ide"
+         download-size="11"
+         install-size="15"
+         version="3.15.200.v20210108-1832"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.event"
+         download-size="32"
+         install-size="58"
+         version="1.6.0.v20210212-1143"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ltk.core.refactoring"
+         download-size="335"
+         install-size="757"
+         version="3.11.400.v20210427-0555"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ltk.ui.refactoring"
+         download-size="461"
+         install-size="953"
+         version="3.11.400.v20210320-1132"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.platform"
+         download-size="637"
+         install-size="959"
+         version="4.20.0.v20210611-1600"/>
+
+   <plugin
+         id="org.eclipse.platform.doc.user"
+         download-size="6712"
+         install-size="9296"
+         version="4.20.0.v20210530-2150"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.search"
+         download-size="533"
+         install-size="1043"
+         version="3.13.200.v20210419-1029"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.text.quicksearch"
+         download-size="94"
+         install-size="184"
+         version="1.1.100.v20210426-1601"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.team.core"
+         download-size="395"
+         install-size="847"
+         version="3.9.0.v20210510-1748"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.team.ui"
+         download-size="1428"
+         install-size="3017"
+         version="3.9.0.v20210426-0837"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.text"
+         download-size="288"
+         install-size="577"
+         version="3.12.0.v20210512-1644"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jface.text"
+         download-size="1021"
+         install-size="2137"
+         version="3.18.0.v20210512-1640"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jsch.core"
+         download-size="40"
+         install-size="75"
+         version="1.3.900.v20200422-1935"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jsch.ui"
+         download-size="91"
+         install-size="180"
+         version="1.4.0.v20210426-0843"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.console"
+         download-size="205"
+         install-size="378"
+         version="3.11.0.v20210510-1914"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.intro"
+         download-size="337"
+         install-size="661"
+         version="3.6.200.v20210409-1747"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.intro.universal"
+         download-size="2144"
+         install-size="2741"
+         version="3.4.200.v20210409-1747"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.cheatsheets"
+         download-size="379"
+         install-size="733"
+         version="3.7.300.v20210507-0822"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.browser"
+         download-size="203"
+         install-size="337"
+         version="3.6.1100.v20210118-1327"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.genericeditor"
+         download-size="143"
+         install-size="341"
+         version="1.2.0.v20210129-1224"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.monitoring"
+         download-size="59"
+         install-size="110"
+         version="1.2.0.v20210111-1353"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.navigator"
+         download-size="416"
+         install-size="876"
+         version="3.10.100.v20210415-0924"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.navigator.resources"
+         download-size="169"
+         install-size="348"
+         version="3.8.100.v20210319-0848"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.net"
+         download-size="45"
+         install-size="84"
+         version="1.4.0.v20210426-0838"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.workbench.texteditor"
+         download-size="653"
+         install-size="1376"
+         version="3.16.100.v20210512-1009"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.views"
+         download-size="104"
+         install-size="187"
+         version="3.11.0.v20210111-1351"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.editors"
+         download-size="607"
+         install-size="1344"
+         version="3.14.100.v20210513-1110"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.externaltools"
+         download-size="143"
+         install-size="275"
+         version="3.5.0.v20210510-1849"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.ide"
+         download-size="2421"
+         install-size="4780"
+         version="3.18.200.v20210523-1724"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.ide.application"
+         download-size="110"
+         install-size="214"
+         version="1.4.100.v20210506-1050"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.win32"
+         ws="win32"
+         download-size="22"
+         install-size="41"
+         version="3.4.400.v20200414-1247"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem.linux.x86_64"
+         os="linux"
+         arch="x86_64"
+         download-size="11"
+         install-size="21"
+         version="1.2.300.v20180828-0158"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem.macosx"
+         os="macosx"
+         download-size="25"
+         install-size="160"
+         version="1.3.300.v20210427-1937"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.resources.win32.x86_64"
+         os="win32"
+         arch="x86_64"
+         download-size="57"
+         install-size="109"
+         version="3.5.400.v20190812-0909"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem.win32.x86_64"
+         os="win32"
+         arch="x86_64"
+         download-size="37"
+         install-size="73"
+         version="1.4.200.v20190812-0909"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.variables"
+         download-size="35"
+         install-size="64"
+         version="3.5.0.v20210510-1945"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.forms"
+         download-size="323"
+         install-size="642"
+         version="3.11.100.v20210108-1139"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.views.properties.tabbed"
+         download-size="107"
+         install-size="217"
+         version="3.9.100.v20201223-1348"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security"
+         download-size="110"
+         install-size="230"
+         version="1.3.600.v20210126-1005"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.ui"
+         download-size="167"
+         install-size="318"
+         version="1.3.0.v20210121-0947"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.win32.x86_64"
+         os="win32"
+         arch="x86_64"
+         download-size="40"
+         install-size="74"
+         version="1.1.200.v20190812-0919"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.macosx"
+         os="macosx"
+         download-size="28"
+         install-size="165"
+         version="1.101.400.v20210427-1958"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.linux"
+         os="linux"
+         download-size="23"
+         install-size="35"
+         version="1.0.100.v20210419-1942"
+         fragment="true"
+         unpack="false"/>
+   
+   <plugin
+         id="org.eclipse.equinox.security.linux.x86_64"
+         os="linux"
+         arch="x86_64"
+         download-size="7"
+         install-size="11"
+         version="1.1.500.v20210125-1508"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.externaltools"
+         download-size="42"
+         install-size="80"
+         version="1.2.0.v20210510-1841"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.runtime"
+         download-size="69"
+         install-size="149"
+         version="3.22.0.v20210506-1025"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.intro.quicklinks"
+         download-size="23"
+         install-size="43"
+         version="1.1.100.v20210315-0954"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.team.genericeditor.diff.extension"
+         download-size="16"
+         install-size="23"
+         version="1.1.0.v20210426-0951"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.urischeme"
+         download-size="51"
+         install-size="98"
+         version="1.1.400.v20210407-1558"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.views.log"
+         download-size="169"
+         install-size="292"
+         version="1.2.1500.v20210315-1034"
+         unpack="false"/>
+
+</feature>
--- a/main/features/org.talend.platform.feature/pom.xml
+++ b/main/features/org.talend.platform.feature/pom.xml
@@ -0,0 +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>tcommon-studio-se</artifactId>
+    <version>8.0.1</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.platform.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.rcp.feature/pom.xml
+++ b/main/features/org.talend.rcp.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.feature</artifactId>
--- a/main/features/org.talend.update.p2.feature/pom.xml
+++ b/main/features/org.talend.update.p2.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.update.p2.feature</artifactId>
--- a/main/features/org.talend.updates.feature/pom.xml
+++ b/main/features/org.talend.updates.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.updates.feature</artifactId>
--- a/main/features/org.talend.utils.feature/feature.xml
+++ b/main/features/org.talend.utils.feature/feature.xml
@@ -5,7 +5,7 @@
  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
  <requires>
-    <import plugin="org.bouncycastle.bcprov" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.bouncycastle.bcprov" version="1.69.0" match="greaterOrEqual"/>
    <import plugin="com.cedarsoftware.json-io" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.0" match="greaterOrEqual"/>
    <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.8" match="greaterOrEqual"/>
@@ -20,7 +20,7 @@
    <import plugin="org.apache.servicemix.bundles.avro" version="0.0.0" match="greaterOrEqual"/>
    <import plugin="org.junit" version="4.13.2" match="greaterOrEqual"/>
    <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.apache.commons.configuration" version="2.0.0" match="greaterOrEqual"/>
+    <import plugin="org.slf4j.binding.log4j12" version="0.0.0" match="greaterOrEqual"/>
  </requires>  
  <plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
  <plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
--- a/main/features/org.talend.utils.feature/pom.xml
+++ b/main/features/org.talend.utils.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.utils.feature</artifactId>
--- a/main/plugins/org.talend.common.ui.runtime/icons/download.gif
+++ b/main/plugins/org.talend.common.ui.runtime/icons/download.gif
--- a/main/plugins/org.talend.common.ui.runtime/icons/download.png
+++ b/main/plugins/org.talend.common.ui.runtime/icons/download.png
--- a/main/plugins/org.talend.common.ui.runtime/pom.xml
+++ b/main/plugins/org.talend.common.ui.runtime/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.common.ui.runtime</artifactId>
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/EImage.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/EImage.java
@@ -109,6 +109,8 @@ public enum EImage implements IImage {
    TABLE_VIEW("/icons/array_hot.png"), //$NON-NLS-1$
    NO_TABLE_VIEW("/icons/array.png"), //$NON-NLS-1$
    COMPOSITE_BACKGROUND("/icons/compositeBackground.jpg"), //$NON-NLS-1$
+    
+    DOWNLOAD_LIB("/icons/download.png"), //$NON-NLS-1$

    LOCK_ICON("/icons/lock.gif"), //$NON-NLS-1$
    UNLOCK_ICON("/icons/unlock.gif"), //$NON-NLS-1$
@@ -125,7 +127,6 @@ public enum EImage implements IImage {
    FILL_COLOR_ICON("/icons/fill_color.gif"), //$NON-NLS-1$

    OPEN_IN_BROWSER("/icons/open.gif"), //$NON-NLS-1$
-    DOWNLOAD_MODULE("/icons/download.gif"), //$NON-NLS-1$

    COMPONENT_MISSING("/icons/component_missing.png"), //$NON-NLS-1$

--- a/main/plugins/org.talend.commons.runtime/pom.xml
+++ b/main/plugins/org.talend.commons.runtime/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.runtime</artifactId>
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/CommonsPlugin.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/CommonsPlugin.java
@@ -28,6 +28,7 @@ import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
 import org.talend.commons.exception.ExceptionService;
 import org.talend.commons.runtime.debug.TalendDebugHandler;
+import org.talend.commons.utils.platform.PluginChecker;
 import org.talend.commons.utils.system.EclipseCommandLine;

 /**
@@ -57,6 +58,8 @@ public class CommonsPlugin implements BundleActivator {
    // TESB-17856: For commandline builds ESB Micorservice bundle
    private static boolean isESBMicorservice = false;

+    private static Boolean isDevMode = null;
+
    private static ServiceTracker proxyTracker;

    public static boolean isWorkbenchCreated() {
@@ -110,6 +113,17 @@ public class CommonsPlugin implements BundleActivator {
        return System.getProperty(EclipseCommandLine.PROP_VM) == null;
    }

+    public static boolean isDevMode() {
+        try {
+            if (isDevMode == null) {
+                isDevMode = Platform.getBundle(PluginChecker.RCP_BUNDLE_ID).getBundleContext().getProperty("osgi.dev") != null;
+            }
+            return isDevMode;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
    public static boolean isDebugMode() {
        return Boolean.getBoolean("talendDebug") //$NON-NLS-1$
                || ArrayUtils.contains(Platform.getApplicationArgs(), TalendDebugHandler.TALEND_DEBUG);
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/ExceptionHandler.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/ExceptionHandler.java
@@ -38,6 +38,12 @@ public class ExceptionHandler {
        CommonExceptionHandler.log(message);
    }

+    public static void logDebug(String message) {
+        if (CommonsPlugin.isDebugMode() || CommonsPlugin.isDevMode()) {
+            CommonExceptionHandler.log(message);
+        }
+    }
+    
    public static void process(Throwable ex, Priority priority) {
        CommonExceptionHandler.process(ex, priority);

--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/LoginException.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/exception/LoginException.java
@@ -20,9 +20,24 @@ package org.talend.commons.exception;
 public class LoginException extends BusinessException {

    public static final String RESTART = "restart";
+    
+    private int errCode;
+    
+
+    public LoginException(String key, Throwable cause) {
+        super(key, cause);
+    }

    public LoginException(String message) {
        super(message);
    }
-
+    
+    public LoginException(int errCode, String message) {
+        super(message);
+        this.errCode = errCode;
+    }
+    
+    public int getErrCode() {
+        return this.errCode;
+    }
 }
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/i18n/internal/messages_ja.properties
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/i18n/internal/messages_ja.properties
@@ -18,7 +18,7 @@ ReflectionPropertyException.Access.ErrorMsg3=\u30AF\u30E9\u30B9'{2}'\u306E\u30D7
 ResourceUtils.canMove1=\u79FB\u52D5\u53EF\u80FD
 ResourceUtils.canMove2=Can move {0} -> {1}
 ResourceUtils.cannotMoveRule3=Cannot move {0} -> {1} (Rule 3-Descendant)
-ResourceUtils.cnanotMoveRule1=Cannot move {0} -> {1} (Rule 1-Test if source & target are differents)
+ResourceUtils.cnanotMoveRule1={0}\u3092{1}\u306B\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093(\u30EB\u30FC\u30EB1 - \u30BD\u30FC\u30B9\u3068\u30BF\u30FC\u30B2\u30C3\u30C8\u304C\u7570\u306A\u308B\u5834\u5408\u306F\u30C6\u30B9\u30C8)
 ResourceUtils.go= ->
 ResourceUtils.streamNull=\u30B9\u30C8\u30EA\u30FC\u30E0\u304CNULL\u3067\u3059
 ReusableMultiKey.Keys.BeNull=\u30AD\u30FC\u306E\u914D\u5217\u306FNULL\u5024\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/PatchComponent.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/PatchComponent.java
@@ -23,7 +23,7 @@ public interface PatchComponent extends P2InstallComponent {

    static final String FOLDER_PATCHES = "patches"; //$NON-NLS-1$

-    boolean install(IProgressMonitor monitor, File patchFile) throws Exception;
+    boolean install(IProgressMonitor monitor, File... patchFiles) throws Exception;

    boolean isPlainZipInstalled(IProgressMonitor monitor, String patchName) throws Exception;
 }
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/VersionUtils.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/VersionUtils.java
@@ -36,6 +36,7 @@ import org.osgi.framework.FrameworkUtil;
 import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.i18n.internal.Messages;
+import org.talend.utils.format.PresentableBox;

 /**
 * Represents a version. Contents a major and a minor version.<br/>
@@ -327,7 +328,12 @@ public class VersionUtils {
        String talendVersion = getTalendVersion();
        String majorVersion = StringUtils.substringBeforeLast(talendVersion, "."); //$NON-NLS-1$
        String artifactIdFolder = mojoType.getMojoArtifactIdFolder();
-        Optional<File> optional = Stream.of(new File(artifactIdFolder).listFiles())
+        File[] artifactFiles = new File[0];
+        File folder = new File(artifactIdFolder);
+        if (folder.exists()) {
+            artifactFiles = folder.listFiles();
+        }
+        Optional<File> optional = Stream.of(artifactFiles)
                .filter(f -> f.isDirectory() && f.getName().startsWith(majorVersion))
                .sorted((f1, f2) -> new DefaultArtifactVersion(f2.getName()).compareTo(new DefaultArtifactVersion(f1.getName())))
                .findFirst();
@@ -357,6 +363,21 @@ public class VersionUtils {
        return version;
    }

+    public static String getInternalMajorVersion() {
+        return StringUtils.substringBefore(getInternalVersion(), "."); //$NON-NLS-1$
+    }
+
+    public static String getDisplayPatchVersion(String patchName) {
+        try {
+            if (Integer.parseInt(StringUtils.substringAfterLast(patchName, "v")) > 1) { //$NON-NLS-1$
+                return patchName;
+            }
+            return StringUtils.substringBefore(patchName, "v"); //$NON-NLS-1$
+        } catch (NumberFormatException e) {
+            return patchName;
+        }
+    }
+
    public static void clearCache() {
        synchronized (VersionUtils.class) {
            productVersion = null;
@@ -389,5 +410,15 @@ public class VersionUtils {
        }
        return null;
    }
+    
+    public static String getProductVersionLog() {
+            Object version = getDisplayVersion();
+            String mess = "Starting Talend's platform log system."; //$NON-NLS-1$
+            if (version != null) {
+                mess += ("VERSION= " + version); //$NON-NLS-1$
+            }
+            PresentableBox box = new PresentableBox("TALEND", mess, 0); //$NON-NLS-1$
+            return box.getFullBox();
+    }

 }
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/platform/PluginChecker.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/platform/PluginChecker.java
@@ -20,6 +20,8 @@ import org.osgi.framework.Bundle;
 */
 public final class PluginChecker {

+    public static final String RCP_BUNDLE_ID = "org.talend.rcp";
+
    private static final String TDQ_ID = "org.talend.dataprofiler.core.tdq"; //$NON-NLS-1$

    private static final String TDCP_ID = "org.talend.datacleansing.core"; //$NON-NLS-1$
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/resource/ZipFileStatus.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/resource/ZipFileStatus.java
@@ -15,6 +15,7 @@ package org.talend.commons.utils.resource;
 import java.io.File;
 import java.io.IOException;
 import java.util.Enumeration;
+import java.util.Properties;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
@@ -44,6 +45,8 @@ public class ZipFileStatus {

    String pluginsEntryName = null;

+    private Properties props = new Properties();
+
    public ZipFileStatus(File file) {
        super();
        this.file = file;
@@ -60,6 +63,11 @@ public class ZipFileStatus {
                    judgeZipEntry(zipFile,enumeration.nextElement());
                }

+                ZipEntry propEntry = zipFile.getEntry("patch.properties");
+                if (propEntry != null) {
+                    props.load(zipFile.getInputStream(propEntry));
+                }
+
                judgePathes();

            } catch (ZipException e) {
@@ -140,4 +148,20 @@ public class ZipFileStatus {
        return null; // means no plugins
    }

+    public boolean isHasArtfacts() {
+        return hasArtfacts;
+    }
+
+    public boolean isHasContents() {
+        return hasContents;
+    }
+
+    public boolean isHasPlugins() {
+        return hasPlugins;
+    }
+
+    public Properties getProps() {
+        return props;
+    }
+
 }
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/system/EclipseCommandLine.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/system/EclipseCommandLine.java
@@ -21,10 +21,29 @@
 // ============================================================================
 package org.talend.commons.utils.system;

+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 import org.eclipse.core.runtime.Platform;
+import org.eclipse.osgi.service.datalocation.Location;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Filter;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.util.tracker.ServiceTracker;
+import org.talend.commons.exception.ExceptionHandler;

 /**
 * Creates and updates properties for the eclipse commandline in case of relaunch <br/>
@@ -36,11 +55,13 @@ public class EclipseCommandLine {

    public static final String PROP_VM = "eclipse.vm"; //$NON-NLS-1$

-    static final String PROP_VMARGS = "eclipse.vmargs"; //$NON-NLS-1$
+    public static final String PROP_VMARGS = "eclipse.vmargs"; //$NON-NLS-1$

    static final String PROP_COMMANDS = "eclipse.commands"; //$NON-NLS-1$

    static final String CMD_VMARGS = "-vmargs"; //$NON-NLS-1$
+    
+    static final String CMD_VM = "-vm"; //$NON-NLS-1$

    static final String NEW_LINE = "\n"; //$NON-NLS-1$

@@ -70,6 +91,10 @@ public class EclipseCommandLine {

    static public final String TALEND_CLEAN_UNINSTALLED_BUNDLES = "-talendCleanUninstalledBundles";

+    static public final String PROP_KEY_PROFILE_ID = "eclipse.p2.profile";
+
+    static public final String ARG_BRANCH = "-branch";
+
    static public final String LOGIN_ONLINE_UPDATE = "--loginOnlineUpdate";

    static public final String ARG_TALEND_BUNDLES_CLEANED = "-talend.studio.bundles.cleaned"; //$NON-NLS-1$
@@ -86,6 +111,10 @@ public class EclipseCommandLine {
    static public final String TALEND_DISABLE_EXTERNAL_MODULE_INSTALL_DIALOG_COMMAND = "--disableExternalModuleInstallDialog"; //$NON-NLS-1$

    static public final String TALEND_NOSPLASH_COMMAND = "-nosplash"; //$NON-NLS-1$
+    
+    static public final String TALEND_RESTART_FLAG = "-talendRestart";
+    
+    static public final String TALEND_SKIP_PROJECT_VERSION_CHECK_FLAG = "-skipProjectVersionCheck";

    /**
     * for TUP-2218, enable to open the job auto, when open studio. the args should be name of job. if want to open
@@ -98,6 +127,21 @@ public class EclipseCommandLine {
     * later.
     */
    static public final String TALEND_SHOW_JOB_TYPE_COMMAND = "--showJobType"; //$NON-NLS-1$
+    
+    private static final String HEX_STRING = "0123456789ABCDEF";
+    
+    public static final String SCHEME_FILE = "file"; //$NON-NLS-1$
+
+    private static final String UNC_PREFIX = "//"; //$NON-NLS-1$
+    
+    static private final Set<String> TALEND_ARGS = new HashSet<String>();
+    
+    static {
+        TALEND_ARGS.add(TALEND_CLEAN_UNINSTALLED_BUNDLES);
+        TALEND_ARGS.add(ARG_TALEND_BUNDLES_CLEANED);
+        TALEND_ARGS.add(PROP_TALEND_BUNDLES_DO_CLEAN);
+        TALEND_ARGS.add(TALEND_RELOAD_COMMAND);
+    }

    static public void updateOrCreateExitDataPropertyWithCommand(String command, String value, boolean delete) {
        updateOrCreateExitDataPropertyWithCommand(command, value, delete, false);
@@ -107,6 +151,16 @@ public class EclipseCommandLine {
        if (argName == null || argName.trim().isEmpty()) {
            return null;
        }
+
+        try {
+            if (isWindows() && TALEND_ARGS.contains(argName) && !isPoweredByTalend()) {
+                ExceptionHandler.logDebug("argName: " + argName + ", sysProp: " + argName + ", value: " + System.getProperty(argName));
+                Properties p = loadConfigIni();
+                return p.getProperty(argName);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
        String[] commandLineArgs = Platform.getCommandLineArgs();
        if (commandLineArgs == null || commandLineArgs.length <= 0) {
            return null;
@@ -120,6 +174,152 @@ public class EclipseCommandLine {
        return null;
    }

+    private static boolean isPoweredByTalend() {
+        return !Platform.getProduct().getId().equals("org.talend.rcp.branding.jetl.product") && !Platform.getProduct().getId().equals("org.talend.rcp.branding.jetl.bigdata.product");
+    }
+    
+    private static boolean isWindows() {
+        return EnvironmentUtils.isWindowsSystem();
+    }
+    
+    private static void updateConfigIni(String command, String value, boolean delete) {
+        Properties p = loadConfigIni();
+
+        if (delete) {
+            p.remove(command);
+        } else {
+            p.put(command, value);
+        }
+        try {
+            File f = getConfigFile();
+            try (FileOutputStream fos = new FileOutputStream(f)) {
+                p.store(fos, "updated " + command);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+    
+    private static Properties loadConfigIni() {
+        Properties p = new Properties();
+        try {
+            File f = getConfigFile();
+            try (FileInputStream fis = new FileInputStream(f)) {
+                p.load(fis);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return p;
+    }
+    
+    private static String decode(String bytes) {
+        if (bytes == null) {
+            return null;
+        }
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(bytes.length() / 2);
+        for (int i = 0; i < bytes.length(); i += 2) {
+            baos.write((HEX_STRING.indexOf(bytes.charAt(i)) << 4 | HEX_STRING.indexOf(bytes.charAt(i + 1))));
+        }
+        return new String(baos.toByteArray());
+    }
+    
+    private static File getConfigFile() throws URISyntaxException {
+        // configuration/config.ini
+        File iniFile = new File(getConfigurationFolder(), decode("636F6E6669672E696E69")); //$NON-NLS-1$
+
+        return iniFile;
+    }
+
+    private static Location getConfigLocation(BundleContext context) {
+        Filter filter = null;
+        try {
+            filter = context.createFilter(Location.CONFIGURATION_FILTER);
+        } catch (InvalidSyntaxException e) {
+            // should not happen
+        }
+        ServiceTracker configLocationTracker = new ServiceTracker(context, filter, null);
+        configLocationTracker.open();
+        try {
+            return (Location) configLocationTracker.getService();
+        } finally {
+            configLocationTracker.close();
+        }
+    }
+    
+    /**
+     * Returns the URL as a URI. This method will handle broken URLs that are not properly encoded (for example they
+     * contain unencoded space characters).
+     */
+    private static URI toURI(URL url) throws URISyntaxException {
+        // URL behaves differently across platforms so for file: URLs we parse from string form
+        if (SCHEME_FILE.equals(url.getProtocol())) {
+            String pathString = url.toExternalForm().substring(5);
+            // ensure there is a leading slash to handle common malformed URLs such as file:c:/tmp
+            if (pathString.indexOf('/') != 0)
+                pathString = '/' + pathString;
+            else if (pathString.startsWith(UNC_PREFIX) && !pathString.startsWith(UNC_PREFIX, 2)) {
+                // URL encodes UNC path with two slashes, but URI uses four (see bug 207103)
+                pathString = UNC_PREFIX + pathString;
+            }
+            return new URI(SCHEME_FILE, null, pathString, null);
+        }
+        try {
+            return new URI(url.toExternalForm());
+        } catch (URISyntaxException e) {
+            // try multi-argument URI constructor to perform encoding
+            return new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(), url.getPath(), url.getQuery(),
+                    url.getRef());
+        }
+    }
+
+    private static File toFile(URI uri) {
+        try {
+            if (!SCHEME_FILE.equalsIgnoreCase(uri.getScheme()))
+                return null;
+            // assume all illegal characters have been properly encoded, so use URI class to unencode
+            return new File(uri);
+        } catch (IllegalArgumentException e) {
+            // File constructor does not support non-hierarchical URI
+            String path = uri.getPath();
+            // path is null for non-hierarchical URI such as file:c:/tmp
+            if (path == null)
+                path = uri.getSchemeSpecificPart();
+            return new File(path);
+        }
+    }
+    
+    private static File getConfigurationFolder() {
+        BundleContext configuratorBundleContext = getCurrentBundleContext();
+        final URL url = getConfigLocation(configuratorBundleContext).getURL();
+        try {
+            return toFile(toURI(url));
+        } catch (URISyntaxException e) {
+            //
+        }
+        return null;
+    }
+    
+ // always return a valid bundlesContext or throw a runtimeException
+    private static BundleContext getCurrentBundleContext() {
+        Bundle bundle = FrameworkUtil.getBundle(EclipseCommandLine.class);
+        if (bundle != null) {
+            BundleContext bundleContext = bundle.getBundleContext();
+            if (bundleContext != null) {
+                return bundleContext;
+            } else {
+                throw new RuntimeException(
+                        "could not find current BundleContext, this should never happen, check that the bunlde is activated when this class is accessed");
+            }
+        } else {
+            throw new RuntimeException(
+                    "could not find current Bundle, this should never happen, check that the bunlde is activated when this class is accessed");
+        }
+    }
+    
    /**
     * this creates or updates the org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY by adding or changing
     * the command with value, except if value is null then the command shall be removed.
@@ -130,6 +330,17 @@ public class EclipseCommandLine {
     * @param isOption this flag used to trigger for the option command without any arguments.
     */
    static public void updateOrCreateExitDataPropertyWithCommand(String command, String value, boolean delete, boolean isOption) {
+        try {
+            if (isWindows() && TALEND_ARGS.contains(command) && !isPoweredByTalend()) {
+                ExceptionHandler.logDebug("command: " + command + ", prop: " + command + ", value: " + value + ", delete: " + delete);
+                updateConfigIni(command, value, delete);
+                return;
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+       
+        
        boolean isValueNull = false;
        if (value == null || "".equals(value)) { //$NON-NLS-1$
            isValueNull = true;
@@ -183,9 +394,9 @@ public class EclipseCommandLine {
                                + (isValueNull ? "" : value + EclipseCommandLine.NEW_LINE)
                                + currentProperty.substring(indexOfVmArgs);
                    } else {// vmargs command not found so don't know where to set it to throw Exception
-                        throw new IllegalArgumentException("the property :"
-                                + org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY + "must constain "
-                                + EclipseCommandLine.CMD_VMARGS);
+                        currentProperty = currentProperty.substring(0, indexOfVmArgs) + command + EclipseCommandLine.NEW_LINE
+                                + (isValueNull ? "" : value + EclipseCommandLine.NEW_LINE);
+//                        throw new IllegalArgumentException("the property :" + org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY + "must constain " + EclipseCommandLine.CMD_VMARGS);
                    }
                }
            }
@@ -254,6 +465,44 @@ public class EclipseCommandLine {
                result.append(vmargs);
            }
        }
-        System.setProperty(org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY, result.toString());
+        
+        String exitData = result.toString();
+        
+        ExceptionHandler.logDebug("exitData before duplicated: " + exitData);
+        
+        if (isWindows() && !isPoweredByTalend()) {
+            exitData = removeDuplicated(result).toString();
+        }
+        ExceptionHandler.logDebug("exitData: " + exitData);
+        System.setProperty(org.eclipse.equinox.app.IApplicationContext.EXIT_DATA_PROPERTY, exitData);
+        
+    }
+    
+    private static StringBuilder removeDuplicated(StringBuffer sb) {
+        StringBuilder ret = new StringBuilder();
+        StringTokenizer t = new StringTokenizer(sb.toString(), EclipseCommandLine.NEW_LINE);
+        while (t.hasMoreElements()) {
+            String ele = (String) t.nextElement();
+            boolean add = true;
+            if (ele.equals("-launcher")) {
+                if (ret.indexOf(ele) > 0) {
+                    // dump value of launcher
+                    t.nextElement();
+                    add = false;
+                }
+            } else if (ele.equals(EclipseCommandLine.CMD_VMARGS)) {
+                add = false;
+                break;
+            }
+
+            if (add) {
+                ret.append(ele);
+                ret.append(EclipseCommandLine.NEW_LINE);
+            }
+
+        }
+        
+        return ret;
+
    }
 }
--- a/main/plugins/org.talend.commons.ui/pom.xml
+++ b/main/plugins/org.talend.commons.ui/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.ui</artifactId>
--- a/main/plugins/org.talend.commons.ui/src/main/java/messages_ja.properties
+++ b/main/plugins/org.talend.commons.ui/src/main/java/messages_ja.properties
@@ -131,9 +131,9 @@ StateComposite.SEL_JOBNAME=\u30B8\u30E7\u30D6\u540D\u3092\u8A2D\u5B9A
 StateComposite.STATE=\u5DDE
 StateComposite.TABLE_SELECTION=\u30C6\u30FC\u30D6\u30EB\u9078\u629E
 StateComposite.TEMPLATE_SELECTION=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u9078\u629E
-ArchiveDirectoryChooser.WizardProjectsImportPage_RootSelectTitle=Select roo&t directory:
-ArchiveDirectoryChooser.DataTransfer_browse=&\u53C2\u7167...
-ArchiveDirectoryChooser.WizardProjectsImportPage_ArchiveSelectTitle=Select &archive file:
+ArchiveDirectoryChooser.WizardProjectsImportPage_RootSelectTitle=\u30EB\u30FC\u30C8\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u3092\u9078\u629E(&T)
+ArchiveDirectoryChooser.DataTransfer_browse=\u53C2\u7167(&R)...
+ArchiveDirectoryChooser.WizardProjectsImportPage_ArchiveSelectTitle=\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E(&A):
 ArchiveDirectoryChooser.FileExport_selectDestinationMessage=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u3092\u9078\u629E\u3057\u307E\u3059\u3002
 ArchiveDirectoryChooser.ArchiveExport_description=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u4E0A\u306E\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u306B\u30EA\u30BD\u30FC\u30B9\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002
 DisplayUtils.NotSupportedExceptionOnLinux=Linux/Unit\u3067\u306F\u30DE\u30EB\u30C1\u30C7\u30A3\u30B9\u30D7\u30EC\u30A4\u304C\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
--- a/main/plugins/org.talend.core.repository/plugin.xml
+++ b/main/plugins/org.talend.core.repository/plugin.xml
@@ -285,30 +285,6 @@
                type="INFORMIX">
          </DBType>
       </RepositoryComponent>
-       <RepositoryComponent
-             name="INGRES"
-             withSchema="true"
-             input="tIngresInput"
-             output="tIngresOutput">
-          <Item
-                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
-          </Item>
-          <DBType
-                type="INGRES">
-          </DBType>
-       </RepositoryComponent>
-       <RepositoryComponent
-             name="INTERBASE"
-             withSchema="true"
-             input="tInterbaseInput"
-             output="tInterbaseOutput">
-          <Item
-                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
-          </Item>
-          <DBType
-                type="INTERBASE">
-          </DBType>
-       </RepositoryComponent>
       <RepositoryComponent
             name="JAVADB"
             withSchema="true"
@@ -420,18 +396,6 @@
                type="ORACLESN">
          </DBType>
       </RepositoryComponent>
-       <RepositoryComponent
-             name="PARACCEL"
-             withSchema="true"
-             input="tParAccelInput"
-             output="tParAccelOutput">
-          <Item
-                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
-          </Item>
-          <DBType
-                type="PARACCEL">
-          </DBType>
-       </RepositoryComponent>
       <RepositoryComponent
             name="PLUSPSQL"
             withSchema="true"
@@ -530,18 +494,6 @@
                type="TERADATA">
          </DBType>
       </RepositoryComponent>
-       <RepositoryComponent
-             name="VECTORWISE"
-             withSchema="true"
-             input="tVectorWiseInput"
-             output="tVectorWiseOutput">
-          <Item
-                clazz="org.talend.core.model.properties.DatabaseConnectionItem">
-          </Item>
-          <DBType
-                type="VECTORWISE">
-          </DBType>
-       </RepositoryComponent>
       <RepositoryComponent
             name="VERTICA"
             withSchema="true"
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_fr.properties
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_fr.properties
@@ -42,20 +42,15 @@ CreateSandboxProjectDialog.Failure=\u00C9chec
 CreateSandboxProjectDialog.failureMessage=\u00C9chec de la cr\u00E9ation du projet Sandbox.
 CreateSandboxProjectDialog.ProjectDesc=Description
 CreateSandboxProjectDialog.ProjectLabel=Libell\u00E9
-CreateSandboxProjectDialog.ProjectSvnAdvance=Param\u00E8tres avanc\u00E9s de SVN
 CreateSandboxProjectDialog.successMessage=Cr\u00E9ation r\u00E9ussie du projet Sandbox.
 CreateSandboxProjectDialog.successTitile=Succ\u00E8s
-CreateSandboxProjectDialog.svnUrl=URL
 CreateSandboxProjectDialog.Title=Cr\u00E9er un projet  Sandbox - {0}
 CreateSandboxProjectDialog.userFirstname=Pr\u00E9nom
 CreateSandboxProjectDialog.userLastname=Nom de famille
-CreateSandboxProjectDialog.userLoginMessage=Le nom du projet SVN ne peut \u00EAtre vide
 CreateSandboxProjectDialog.userLoginValidMessage=L'identifiant de l'utilisateur doit \u00EAtre un e-mail valide
 CreateSandboxProjectDialog.userPasswordEmptyMessage=Le mot de passe ne doit pas \u00EAtre vide
 CreateSandboxProjectDialog.Login=Connexion
 CreateSandboxProjectDialog.Password=Mot de passe
-CreateSandboxProjectDialog.URLMessage=Vous devez d\u00E9finir l'URL SVN
-CreateSandboxProjectDialog.userSvnSettingLabel=Param\u00E8tres SVN par d\u00E9faut
 PropertiesWizardPage.Author=Cr\u00E9\u00E9 par :
 PropertiesWizardPage.Locker=Verrouill\u00E9 par
 PropertiesWizardPage.Description=Description
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_ja.properties
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_ja.properties
@@ -42,20 +42,15 @@ CreateSandboxProjectDialog.Failure=\u5931\u6557
 CreateSandboxProjectDialog.failureMessage=Sandbox\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 CreateSandboxProjectDialog.ProjectDesc=\u8AAC\u660E
 CreateSandboxProjectDialog.ProjectLabel=\u30E9\u30D9\u30EB
-CreateSandboxProjectDialog.ProjectSvnAdvance=SVN\u8A73\u7D30\u8A2D\u5B9A
 CreateSandboxProjectDialog.successMessage=Sandbox\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u6B63\u3057\u304F\u3057\u307E\u3057\u305F\u3002
 CreateSandboxProjectDialog.successTitile=\u6210\u529F
-CreateSandboxProjectDialog.svnUrl=URL
 CreateSandboxProjectDialog.Title=Sandbox \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u4F5C\u6210 - -{0}
 CreateSandboxProjectDialog.userFirstname=\u540D
 CreateSandboxProjectDialog.userLastname=\u59D3
-CreateSandboxProjectDialog.userLoginMessage=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8SVN\u30ED\u30B0\u30A4\u30F3\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
 CreateSandboxProjectDialog.userLoginValidMessage=\u30E6\u30FC\u30B6\u30FC\u30ED\u30B0\u30A4\u30F3\u306F\u6709\u52B9\u306A\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
 CreateSandboxProjectDialog.userPasswordEmptyMessage=\u30E6\u30FC\u30B6\u30FC\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
 CreateSandboxProjectDialog.Login=\u30ED\u30B0\u30A4\u30F3
 CreateSandboxProjectDialog.Password=\u30D1\u30B9\u30EF\u30FC\u30C9
-CreateSandboxProjectDialog.URLMessage=SVN\u306EURL\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
-CreateSandboxProjectDialog.userSvnSettingLabel=\u30C7\u30D5\u30A9\u30EB\u30C8SVN\u8A2D\u5B9A
 PropertiesWizardPage.Author=\u4F5C\u6210\u8005
 PropertiesWizardPage.Locker=\u30ED\u30C3\u30AF\u4FDD\u6301\u8005
 PropertiesWizardPage.Description=\u8AAC\u660E
@@ -98,7 +93,7 @@ DeleteAction.action.logicalTitle=\u524A\u9664
 DeleteAction.action.logicalToolTipText=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u3054\u307F\u7BB1\u306B\u5165\u308C\u308B
 DeleteAction.deleteJobAssignedToOneService= \u306F\u30B5\u30FC\u30D3\u30B9\u306E\u64CD\u4F5C\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u3066\u3044\u307E\u3059!\n\u3053\u306E\u30B8\u30E7\u30D6\u3092\u524A\u9664\u3057\u307E\u3059\u304B?
 DeleteAction.deleteSomeJobsAssignedToServices= \u306F\u4E00\u90E8\u306E\u30B5\u30FC\u30D3\u30B9\u306E\u4E00\u90E8\u306E\u64CD\u4F5C\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u3066\u3044\u307E\u3059!\n\u3053\u308C\u3089\u306E\u30B8\u30E7\u30D6\u3092\u524A\u9664\u3057\u307E\u3059\u304B?
-DeleteAction.dialog.message0=\u3054\u307F\u7BB1\u3092\u7A7A\u306B\u3059\u308B\uFF08\u5FA9\u65E7\u3067\u304D\u307E\u305B\u3093\uFF09
+DeleteAction.dialog.message0=\u3054\u307F\u7BB1\u3092\u7A7A\u306B\u3059\u308B(\u5FA9\u65E7\u3067\u304D\u307E\u305B\u3093)
 DeleteAction.dialog.message1=\u9078\u629E\u3057\u305F\u30A8\u30EC\u30E1\u30F3\u30C8\u306F\u5B8C\u5168\u306B\u524A\u9664\u3055\u308C\u307E\u3059\u3002
 DeleteAction.dialog.message2=\u7D9A\u884C\u3057\u307E\u3059\u304B?
 DeleteAction.dialog.messageAllElements=\u30A8\u30EC\u30E1\u30F3\u30C8\u306F\u3059\u3079\u3066\u5B8C\u5168\u306B\u524A\u9664\u3055\u308C\u307E\u3059(\u53D6\u5F97\u4E0D\u53EF\u80FD)\u3002
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_zh_CN.properties
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_zh_CN.properties
@@ -42,20 +42,15 @@ CreateSandboxProjectDialog.Failure=\u5931\u8D25
 CreateSandboxProjectDialog.failureMessage=\u521B\u5EFA\u6C99\u76D2\u5DE5\u7A0B\u5931\u8D25\u3002
 CreateSandboxProjectDialog.ProjectDesc=\u63CF\u8FF0
 CreateSandboxProjectDialog.ProjectLabel=\u6807\u7B7E
-CreateSandboxProjectDialog.ProjectSvnAdvance=SVN \u9AD8\u7EA7\u8BBE\u7F6E
 CreateSandboxProjectDialog.successMessage=\u6210\u529F\u521B\u5EFA\u6C99\u76D2\u5DE5\u7A0B
 CreateSandboxProjectDialog.successTitile=\u6210\u529F
-CreateSandboxProjectDialog.svnUrl=URL
 CreateSandboxProjectDialog.Title=\u521B\u5EFA\u6C99\u76D2 \u5DE5\u7A0B - {0}
 CreateSandboxProjectDialog.userFirstname=\u540D\u5B57
 CreateSandboxProjectDialog.userLastname=\u59D3\u6C0F
-CreateSandboxProjectDialog.userLoginMessage=\u5DE5\u7A0B svn \u767B\u5F55\u540D\u4E0D\u80FD\u4E3A\u7A7A
 CreateSandboxProjectDialog.userLoginValidMessage=\u7528\u6237\u767B\u5F55\u540D\u5FC5\u987B\u662F\u6709\u6548\u7684\u7535\u5B50\u90AE\u4EF6
 CreateSandboxProjectDialog.userPasswordEmptyMessage=\u7528\u6237\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A
 CreateSandboxProjectDialog.Login=\u767B\u5F55\u540D
 CreateSandboxProjectDialog.Password=\u5BC6\u7801
-CreateSandboxProjectDialog.URLMessage=\u5FC5\u987B\u8BBE\u5B9A svn URL
-CreateSandboxProjectDialog.userSvnSettingLabel=\u9ED8\u8BA4 SVN \u8BBE\u7F6E
 PropertiesWizardPage.Author=\u4F5C\u8005
 PropertiesWizardPage.Locker=\u9501\u5B9A\u4EBA
 PropertiesWizardPage.Description=\u63CF\u8FF0
@@ -178,7 +173,7 @@ ProjectRepositoryNode.sapBWDataSource=SAP DataSource
 ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
 ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
-ProjectRepositoryNode.sapContentExtractor=SAP BI Content Extractor
+ProjectRepositoryNode.sapContentExtractor=SAP BI \u5185\u5BB9\u63D0\u53D6\u5668
 RepositoryDropAdapter_copyingItems=\u6B63\u5728\u590D\u5236\u9879\u76EE...
 RepositoryDropAdapter_errorMsg=\u6B64\u76EE\u5F55\u5305\u542B\u9501\u5B9A\u7684\u9879\u76EE\uFF0C\u73B0\u5728\u65E0\u6CD5\u79FB\u52A8
 RepositoryDropAdapter_lockedByOthers=\u6B64\u9879\u76EE\u88AB\u5176\u4ED6\u7528\u6237\u9501\u5B9A\uFF0C\u73B0\u5728\u65E0\u6CD5\u79FB\u52A8\u3002
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java
@@ -2390,16 +2390,32 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
            String str[] = new String[] { getRepositoryContext().getUser() + "", projectManager.getCurrentProject() + "" }; //$NON-NLS-1$ //$NON-NLS-2$
            log.info(Messages.getString("ProxyRepositoryFactory.log.loggedOn", str)); //$NON-NLS-1$
        } catch (LoginException e) {
-            logOffProject();
+            try {
+                logOffProject();
+            } catch (Exception e1) {
+                ExceptionHandler.process(e1);
+            }
            throw e;
        } catch (PersistenceException e) {
-            logOffProject();
+            try {
+                logOffProject();
+            } catch (Exception e1) {
+                ExceptionHandler.process(e1);
+            }
            throw e;
        } catch (BusinessException e) {
-            logOffProject();
+            try {
+                logOffProject();
+            } catch (Exception e1) {
+                ExceptionHandler.process(e1);
+            }
            throw new PersistenceException(e);
        } catch (RuntimeException e) {
-            logOffProject();
+            try {
+                logOffProject();
+            } catch (Exception e1) {
+                ExceptionHandler.process(e1);
+            }
            throw e;
        }
    }
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/services/IGitInfoService.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/services/IGitInfoService.java
@@ -0,0 +1,54 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 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.core.repository.services;
+
+import java.util.Map;
+
+import org.eclipse.core.runtime.IPath;
+import org.talend.core.IService;
+import org.talend.core.model.general.Project;
+import org.talend.core.model.properties.Property;
+
+public interface IGitInfoService extends IService {
+
+    public static final String GIT_AUTHOR = "gitAuthor";
+
+    public static final String GIT_COMMIT_DATE = "gitCommitDate";
+
+    public static final String GIT_COMMIT_ID = "gitCommitId";
+
+    /**
+     * 
+     * DOC hzhao Comment method "getGitInfo".
+     * 
+     * @param path : the path of job/route/service
+     * @param project : the project of the job property path
+     * @return : the Map<String,String> of gitAuthor/gitCommitDate/gitCommitId , can use constants
+     * GIT_AUTHOR/GIT_COMMIT_DATE/GIT_COMMIT_ID as key . NOTE : GIT_COMMIT_DATE is a String type of a millisecond
+     * @throws Exception
+     */
+    public Map<String, String> getGitInfo(IPath path, Project project) throws Exception;
+
+    /**
+     * 
+     * DOC hzhao Comment method "getGitInfo".
+     * 
+     * @param property : the talend model propertry of job/route/service
+     * @return : the Map<String,String> of gitAuthor/gitCommitDate/gitCommitId , can use constants
+     * GIT_AUTHOR/GIT_COMMIT_DATE/GIT_COMMIT_ID as key . NOTE : GIT_COMMIT_DATE is a String type of a millisecond
+     * @throws Exception
+     */
+    public Map<String, String> getGitInfo(Property property) throws Exception;
+
+
+}
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/view/RepositoryLabelProvider.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/view/RepositoryLabelProvider.java
@@ -525,9 +525,6 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
        RepositoryNode node = (RepositoryNode) element;
        switch (node.getType()) {
        case STABLE_SYSTEM_FOLDER:
-            if (node.getLabel().equals(ERepositoryObjectType.SNIPPETS.toString())) {
-                return JFaceResources.getFontRegistry().defaultFont();
-            }
        case SYSTEM_FOLDER:
            return JFaceResources.getFontRegistry().getBold(JFaceResources.DEFAULT_FONT);
        default:
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/XmiResourceManager.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/XmiResourceManager.java
@@ -349,7 +349,7 @@ public class XmiResourceManager {
        return itemResource;
    }

-    private Resource createItemResource(boolean byteArrayResource, URI itemResourceURI) {
+    public Resource createItemResource(boolean byteArrayResource, URI itemResourceURI) {
        Resource itemResource;
        itemResource = getResourceSet().getResource(itemResourceURI, false);
        if (itemResource != null) {
--- a/main/plugins/org.talend.core.runtime/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.core.runtime/META-INF/MANIFEST.MF
@@ -51,6 +51,7 @@ Export-Package: org.talend.analysistask,
 org.talend.core.model.utils,
 org.talend.core.model.xml,
 org.talend.core.nexus,
+ org.talend.core.pendo,
 org.talend.core.prefs,
 org.talend.core.repository,
 org.talend.core.runtime,
--- a/main/plugins/org.talend.core.runtime/mappings/mapping_Ingres.xml
+++ b/main/plugins/org.talend.core.runtime/mappings/mapping_Ingres.xml
@@ -1,216 +0,0 @@
-<?xml version="1.0"?>
-<mapping>
-	<dbms product="INGRES" id="ingres_id" label="Mapping Ingres"
-		default="true">
-		<dbTypes>
-			<dbType type="ANSIDATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="BOOLEAN" ignoreLen="true" ignorePre="true" />
-			<dbType type="BIGINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="BYTE" ignoreLen="true" ignorePre="true" />
-			<dbType type="BYTE VARYING" ignoreLen="true" ignorePre="true" />
-			<dbType type="C" ignoreLen="true" ignorePre="true" />
-			<dbType type="CHAR" ignorePre="true" />
-			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" />
-			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="FLOAT" ignoreLen="true" ignorePre="true" />
-			<dbType type="FLOAT4" ignoreLen="true" ignorePre="true" />
-			<dbType type="INTEGER" ignoreLen="true" ignorePre="true" />
-			<dbType type="INGRESDATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="INTERVAL" ignoreLen="true" ignorePre="true" />
-			<dbType type="LONG NVARCHAR" ignorePre="true" />
-			<dbType type="LONG VARCHAR" ignoreLen="true" ignorePre="true" />
-			<dbType type="MONEY" ignoreLen="true" ignorePre="true" />
-			<dbType type="NCHAR" ignorePre="true" defaultLength="10"/>
-			<dbType type="NVARCHAR" ignorePre="true" defaultLength="10"/>
-			<dbType type="OBJECT_KEY"  ignoreLen="true" ignorePre="true"/>
-			<dbType type="SMALLINT"  ignoreLen="true" ignorePre="true"/>
-			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="TINYINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true"/>
-			<dbType type="TABLE_KEY" ignoreLen="true" ignorePre="true" />
-			<dbType type="VARCHAR" default="true" defaultLength="1200" ignorePre="true"/>
-		</dbTypes>
-
-		<language name="java">
-			<talendToDbTypes><!-- Adviced mappings  -->
-				<talendType type="id_List"/>
-				<talendType type="id_Boolean">
-					<dbType type="BOOLEAN" default="true" />
-				</talendType>
-				<talendType type="id_Byte">
-					<dbType type="BYTE" default="true" />
-					<dbType type="BYTE VARYING" />
-				</talendType>
-				<talendType type="id_byte[]">
-				</talendType>
-				<talendType type="id_Character">
-					<dbType type="CHAR" default="true" />
-					<dbType type="VARCHAR"/>
-					<dbType type="C"/>
-					<dbType type="TEXT"/>
-					<dbType type="LONG VARCHAR"/>
-					<dbType type="NCHAR"/>
-					<dbType type="NVARCHAR"/>
-					<dbType type="LONG NVARCHAR"/>
-				</talendType>
-				<talendType type="id_Date">
-					<dbType type="DATE" default="true" />
-					<dbType type="ANSIDATE" />	
-					<dbType type="INGRESDATE" />
-					<dbType type="TIME" />
-					<dbType type="TIMESTAMP" />		
-					<dbType type="INTERVAL"/>		
-				</talendType>
-				<talendType type="id_BigDecimal">
-					<dbType type="DECIMAL" default="true" />
-					<dbType type="FLOAT4" />
-					<dbType type="FLOAT"/>
-					<dbType type="MONEY"/>
-				</talendType>
-				<talendType type="id_Double">
-					<dbType type="FLOAT" default="true" />
-					<dbType type="FLOAT4" />
-					<dbType type="DECIMAL"/>
-					<dbType type="MONEY"/>
-				</talendType>
-				<talendType type="id_Float">
-					<dbType type="FLOAT4" default="true" />
-					<dbType type="FLOAT"/>
-					<dbType type="DECIMAL" />
-					<dbType type="MONEY"/>
-				</talendType>
-				<talendType type="id_Integer">
-					<dbType type="INTEGER" default="true" />
-					<dbType type="BIGINT" />
-					<dbType type="SMALLINT"/>
-					<dbType type="TINYINT"/>
-				</talendType>
-				<talendType type="id_Long">
-					<dbType type="BIGINT" default="true" />	
-					<dbType type="INTEGER"/>
-					<dbType type="SMALLINT"/>
-					<dbType type="TINYINT"/>	
-				</talendType>
-				<talendType type="id_Object">
-					<dbType type="MONEY" default="true"/>
-					<dbType type="OBJECT_KEY" />
-					<dbType type="TABLE_KEY" />
-				</talendType>
-				<talendType type="id_Short">
-					<dbType type="SMALLINT" default="true" />
-					<dbType type="INTEGER" />
-					<dbType type="BIGINT"/>
-					<dbType type="TINYINT" />
-				</talendType>
-				<talendType type="id_String">
-					<dbType type="VARCHAR" default="true" />
-					<dbType type="LONG VARCHAR" />
-					<dbType type="NCHAR"/>
-					<dbType type="NVARCHAR" />
-					<dbType type="LONG NVARCHAR" />		
-					<dbType type="TEXT" />
-					<dbType type="C"/>
-					<dbType type="CHAR"/>
-				</talendType>
-			</talendToDbTypes>
-			<dbToTalendTypes>
-				<dbType type="ANSIDATE">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="BOOLEAN">
-					<talendType type="id_Boolean" default="true" />
-				</dbType>
-				<dbType type="BIGINT">
-					<talendType type="id_Long" default="true" />
-				</dbType>
-				<dbType type="BYTE">
-					<talendType type="id_Byte" default="true" />
-				</dbType>
-				<dbType type="BYTE VARYING">
-					<talendType type="id_Byte" default="true" />
-				</dbType>
-				<dbType type="C">
-					<talendType type="id_String" default="true" />
-					<talendType type="id_Character"/>
-				</dbType>
-				<dbType type="CHAR">
-					<talendType type="id_String" default="true" />
-					<talendType type="id_Character"/>
-				</dbType>
-				<dbType type="DECIMAL">
-					<talendType type="id_Float"/>
-					<talendType type="id_BigDecimal" default="true"/>
-				</dbType>
-				<dbType type="DATE">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="FLOAT">
-					<talendType type="id_Double" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="FLOAT4">
-					<talendType type="id_Float" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="INTEGER">
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long"/>
-					<talendType type="id_Short"/>
-				</dbType>
-				<dbType type="INGRESDATE">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="INTERVAL">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="LONG NVARCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="LONG VARCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="MONEY">
-					<talendType type="id_Float" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="NCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="NVARCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="OBJECT_KEY">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="SMALLINT">
-					<talendType type="id_Short" default="true" />
-					<talendType type="id_Integer" />
-					<talendType type="id_Long"/>
-				</dbType>
-				<dbType type="TEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="TINYINT">
-					<talendType type="id_Byte" default="true" />
-					<talendType type="id_Integer" />
-					<talendType type="id_Short"/>
-					<talendType type="id_Long" />
-				</dbType>
-				<dbType type="TIME">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="TIMESTAMP">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="TABLE_KEY">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="VARCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-			</dbToTalendTypes>
-		</language>
-	</dbms>
-
-</mapping>
--- a/main/plugins/org.talend.core.runtime/mappings/mapping_Interbase.xml
+++ b/main/plugins/org.talend.core.runtime/mappings/mapping_Interbase.xml
@@ -1,129 +0,0 @@
-<?xml version="1.0"?>
-<mapping>
-	<dbms product="INTERBASE" id="interbase_id" label="Mapping Interbase"
-		default="true">
-		<dbTypes>
-			<dbType type="BLOB" ignorePre="true" />
-			<dbType type="BOOLEAN" ignoreLen="true" ignorePre="true" />
-			<dbType type="CHAR" defaultLength="50" ignorePre="true"/>
-			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" />
-			<dbType type="DOUBLE PRECISION" />
-			<dbType type="FLOAT" ignoreLen="true" ignorePre="true" />
-			<dbType type="INTEGER" ignoreLen="true" ignorePre="true" />
-			<dbType type="NUMERIC" defaultLength="20" defaultPrecision="10" />
-			<dbType type="SMALLINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true" />
-			<dbType type="VARCHAR" default="true" defaultLength="200" ignorePre="true"/>
-		</dbTypes>
-
-		<language name="java">
-			<talendToDbTypes>
-				<!-- Adviced mappings  -->
-				<talendType type="id_List"/>
-				<talendType type="id_Boolean">	
-					<dbType type="BOOLEAN" default="true" />				
-				</talendType>
-				<talendType type="id_Byte">				
-				</talendType>
-				<talendType type="id_byte[]">
-				</talendType>
-				<talendType type="id_Character">
-					<dbType type="CHAR" default="true"/>
-					<dbType type="VARCHAR"/>
-				</talendType>
-				<talendType type="id_Date">
-					<dbType type="DATE" default="true"/>
-					<dbType type="TIME" />
-					<dbType type="TIMESTAMP" />			
-				</talendType>
-				<talendType type="id_BigDecimal">
-					<dbType type="DECIMAL" default="true"/>
-					<dbType type="FLOAT" />
-					<dbType type="DOUBLE PRECISION" />
-					<dbType type="NUMERIC" />				
-				</talendType>
-				<talendType type="id_Double">
-					<dbType type="DOUBLE PRECISION" default="true"/>
-					<dbType type="FLOAT" />
-					<dbType type="DECIMAL" />
-					<dbType type="NUMERIC" />				
-				</talendType>
-				<talendType type="id_Float">
-					<dbType type="FLOAT" default="true"/>
-					<dbType type="DOUBLE PRECISION" />
-					<dbType type="DECIMAL" />
-					<dbType type="NUMERIC" />
-				</talendType>
-				<talendType type="id_Integer">
-					<dbType type="INTEGER" default="true"/>
-				</talendType>
-				<talendType type="id_Long">
-					<dbType type="INTEGER" default="true"/>	
-				</talendType>
-				<talendType type="id_Object">
-					<dbType type="BLOB" default="true"/>
-				</talendType>
-				<talendType type="id_Short">
-					<dbType type="SMALLINT" default="true"/>
-				</talendType>
-				<talendType type="id_String">
-					<dbType type="VARCHAR" default="true"/>
-					<dbType type="CHAR"/>	
-				</talendType>
-			</talendToDbTypes>
-			<dbToTalendTypes>
-				<dbType type="BLOB">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="BOOLEAN">
-					<talendType type="id_Boolean" default="true" />
-				</dbType>
-				<dbType type="CHAR">
-					<talendType type="id_String" default="true" />
-					<talendType type="id_Character"/>
-				</dbType>
-				<dbType type="DATE">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="DECIMAL">
-					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal" default="true"/>
-					<talendType type="id_Float"/>
-				</dbType>
-				<dbType type="DOUBLE PRECISION">
-					<talendType type="id_Double" default="true" />
-					<talendType type="id_BigDecimal"/>
-					<talendType type="id_Float"/>
-				</dbType>
-				<dbType type="FLOAT">
-					<talendType type="id_Float" default="true" />
-					<talendType type="id_BigDecimal"/>
-					<talendType type="id_Double"/>
-				</dbType>
-				<dbType type="INTEGER">
-					<talendType type="id_Integer" default="true" />
-				</dbType>
-				<dbType type="NUMERIC">
-					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal" default="true"/>
-					<talendType type="id_Float"/>
-				</dbType>
-				<dbType type="SMALLINT">
-					<talendType type="id_Short" default="true" />
-				</dbType>
-				<dbType type="TIME">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="TIMESTAMP">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="VARCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-			</dbToTalendTypes>
-		</language>
-	</dbms>
-
-</mapping>
--- a/main/plugins/org.talend.core.runtime/mappings/mapping_ParAccel.xml
+++ b/main/plugins/org.talend.core.runtime/mappings/mapping_ParAccel.xml
@@ -1,567 +0,0 @@
-<?xml version="1.0"?>
-<mapping>
-	<dbms product="PARACCEL" id="paraccel_id" label="Mapping ParAccel"
-		default="true">
-		<dbTypes>
-			<dbType type="ABSTIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="ACLITEM" ignoreLen="true" ignorePre="true" />
-			<dbType type="BIGSERIAL" ignoreLen="true" ignorePre="true" />
-			<dbType type="BIT" ignorePre="true" />
-			<dbType type="BOOL" ignoreLen="true" ignorePre="true" />
-			<dbType type="BOX" ignoreLen="true" ignorePre="true" />
-			<dbType type="BPCHAR" ignoreLen="true" ignorePre="true" />
-			<dbType type="BYTEA" ignoreLen="true" ignorePre="true" />	
-			<dbType type="CHAR" defaultLength="50" ignorePre="true"/>
-			<dbType type="CID" ignoreLen="true" ignorePre="true" />
-			<dbType type="CIDR" ignoreLen="true" ignorePre="true" />
-			<dbType type="CIRCLE" ignoreLen="true" ignorePre="true" />
-			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="FLOAT4" ignoreLen="true" ignorePre="true" />
-			<dbType type="FLOAT8" ignoreLen="true" ignorePre="true" />
-			<dbType type="INET" ignoreLen="true" ignorePre="true" />
-			<dbType type="INT2" ignoreLen="true" ignorePre="true" />
-			<dbType type="INT2VECTOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="INT4" ignoreLen="true" ignorePre="true" />
-			<dbType type="INT8" ignoreLen="true" ignorePre="true" />
-			<dbType type="INTERVAL" ignorePre="true" />
-			<dbType type="LINE" ignoreLen="true" ignorePre="true" />
-			<dbType type="LSEG" ignoreLen="true" ignorePre="true" />
-			<dbType type="MACADDR" ignoreLen="true" ignorePre="true" />
-			<dbType type="MONEY" ignoreLen="true" ignorePre="true" />	
-			<dbType type="NAME" ignoreLen="true" ignorePre="true" />
-			<dbType type="NUMERIC" defaultLength="20" defaultPrecision="10"/>
-			<dbType type="OID" ignoreLen="true" ignorePre="true"  />
-			<dbType type="OIDVECTOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="PATH" ignoreLen="true" ignorePre="true" />
-			<dbType type="POINT" ignoreLen="true" ignorePre="true"  />
-			<dbType type="POLYGON" ignoreLen="true" ignorePre="true"/>
-			<dbType type="REFCURSOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="RELTIME" ignoreLen="true" ignorePre="true" />			
-			<dbType type="REGCLASS" ignoreLen="true" ignorePre="true" />
-			<dbType type="REGOPER" ignoreLen="true" ignorePre="true" />
-			<dbType type="REGOPERATOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="REGPROC" ignoreLen="true" ignorePre="true" />
-			<dbType type="REGPROCEDURE" ignoreLen="true" ignorePre="true" />
-			<dbType type="REGTYPE" ignoreLen="true" ignorePre="true" />
-			<dbType type="SERIAL" ignoreLen="true" ignorePre="true" />
-			<dbType type="SMGR" ignoreLen="true" ignorePre="true" />
-			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="TID" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIME" ignorePre="true" />
-			<dbType type="TINTERVAL" ignoreLen="true" ignorePre="true"  />
-			<dbType type="TIMESTAMPTZ" ignoreLen="true" ignorePre="true"  />
-			<dbType type="TIMESTAMP" ignorePre="true"  />
-			<dbType type="TIMETZ" ignoreLen="true" ignorePre="true"  />
-			<dbType type="VARBIT" ignoreLen="true" ignorePre="true"  />			
-			<dbType type="VARCHAR" defaultLength="200" ignorePre="true" />
-			<dbType type="XID" ignoreLen="true" ignorePre="true"  />
-			
-			<dbType type="_ABSTIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="_ACLITEM" ignoreLen="true" ignorePre="true" />
-			<dbType type="_BIT" ignoreLen="true" ignorePre="true" />
-			<dbType type="_BOX" ignoreLen="true" ignorePre="true" />
-			<dbType type="_BOOL" ignoreLen="true" ignorePre="true" />
-			<dbType type="_BPCHAR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_BYTEA" ignoreLen="true" ignorePre="true" />
-			<dbType type="_CHAR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_CID" ignoreLen="true" ignorePre="true" />
-			<dbType type="_CIDR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_CIRCLE" ignoreLen="true" ignorePre="true" />
-			<dbType type="_DATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="_FLOAT4" ignoreLen="true" ignorePre="true" />
-			<dbType type="_FLOAT8" ignoreLen="true" ignorePre="true" />
-			<dbType type="_INET" ignoreLen="true" ignorePre="true" />
-			<dbType type="_INT2VECTOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_INT4" ignoreLen="true" ignorePre="true" />
-			<dbType type="_INT8" ignoreLen="true" ignorePre="true" />
-			<dbType type="_INTERVAL" ignoreLen="true" ignorePre="true" />
-			<dbType type="_LINE" ignoreLen="true" ignorePre="true" />
-			<dbType type="_LSEG" ignoreLen="true" ignorePre="true" />
-			<dbType type="_MACADDR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_MONEY" ignoreLen="true" ignorePre="true" />
-			<dbType type="_NAME" ignoreLen="true" ignorePre="true" />
-			<dbType type="_NUMERIC" ignoreLen="true" ignorePre="true" />
-			<dbType type="_OID" ignoreLen="true" ignorePre="true" />
-			<dbType type="_OIDVECTOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_PATH" ignoreLen="true" ignorePre="true"/>
-			<dbType type="_POINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="_POLYGON" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REFCURSOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REGCLASS" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REGOPER" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REGOPERATOR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REGPROC" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REGPROCEDURE" ignoreLen="true" ignorePre="true" />
-			<dbType type="_REGTYPE" ignoreLen="true" ignorePre="true" />
-			<dbType type="_RELTIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TID" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TIMESTAMP" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TIMESTAMPTZ" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TIMETZ" ignoreLen="true" ignorePre="true" />
-			<dbType type="_TINTERVAL" ignoreLen="true" ignorePre="true" />
-			<dbType type="_VARBIT" ignoreLen="true" ignorePre="true" />
-			<dbType type="_VARCHAR" ignoreLen="true" ignorePre="true" />
-			<dbType type="_XID" ignoreLen="true" ignorePre="true" />
-		</dbTypes>
-
-		<language name="java">
-			<talendToDbTypes><!-- Adviced mappings  -->
-				<talendType type="id_List"/>
-				<talendType type="id_Boolean">	
-					<dbType type="BOOL" default="true" />				
-				</talendType>
-				<talendType type="id_Byte">		
-				</talendType>
-				<talendType type="id_byte[]">
-					<dbType type="BIT" default="true" />
-					<dbType type="VARBIT" />				
-				</talendType>
-				<talendType type="id_Character">
-					<dbType type="CHAR" default="true" />
-					<dbType type="BPCHAR" />
-					<dbType type="VARCHAR" />
-					<dbType type="TEXT" />							
-				</talendType>
-				<talendType type="id_Date">
-					<dbType type="DATE" default="true" />				
-					<dbType type="ABSTIME" />
-					<dbType type="TIMETZ" />
-					<dbType type="TIME" />
-					<dbType type="TIMESTAMPTZ" />
-					<dbType type="TIMESTAMP" />
-					<dbType type="INTERVAL" />
-					<dbType type="TINTERVAL" />
-					<dbType type="RELTIME" />						
-				</talendType>
-				<talendType type="id_BigDecimal">
-					<dbType type="NUMERIC" default="true" />							
-					<dbType type="FLOAT4" />
-					<dbType type="FLOAT8"/>
-				</talendType>
-				<talendType type="id_Double">
-					<dbType type="FLOAT4" />
-					<dbType type="FLOAT8" default="true" />
-					<dbType type="NUMERIC" />							
-				</talendType>
-				<talendType type="id_Float">
-					<dbType type="FLOAT4" default="true" />
-					<dbType type="FLOAT8" />
-					<dbType type="NUMERIC" />				
-				</talendType>
-				<talendType type="id_Integer">
-					<dbType type="INT2" />
-					<dbType type="INT4" default="true" />
-					<dbType type="SERIAL" />
-					<dbType type="INT8" />
-					<dbType type="BIGSERIAL" />										
-				</talendType>
-				<talendType type="id_Long">
-					<dbType type="INT2" />
-					<dbType type="INT4" />
-					<dbType type="SERIAL" />
-					<dbType type="INT8"  default="true" />
-					<dbType type="BIGSERIAL" />							
-				</talendType>
-				<talendType type="id_Object">
-					<dbType type="_POINT" />
-					<dbType type="_POLYGON" />
-					<dbType type="_FLOAT4" />
-					<dbType type="_REFCURSOR" />
-					<dbType type="_REGCLASS" />
-					<dbType type="_REGOPER" />
-					<dbType type="_REGOPERATOR" />
-					<dbType type="_REGPROC" />
-					<dbType type="_REGPROCEDURE" />
-					<dbType type="_REGTYPE" />
-					<dbType type="_RELTIME" />
-					<dbType type="_TEXT" />
-					<dbType type="_TID" />
-					<dbType type="_TIMETZ" />
-					<dbType type="_TIME" />
-					<dbType type="_TIMESTAMPTZ" />
-					<dbType type="_TIMESTAMP" />
-					<dbType type="_TINTERVAL" />
-					<dbType type="_XID" />						
-					<dbType type="ACLITEM" />			
-					<dbType type="BYTEA" />						
-					<dbType type="CID" />
-					<dbType type="CIDR" />
-					<dbType type="CIRCLE" />						
-					<dbType type="INET" />			
-					<dbType type="MACADDR" />
-					<dbType type="MONEY" />			
-					<dbType type="OID" />
-					<dbType type="PATH" />
-					<dbType type="POLYGON" />			
-					<dbType type="REFCURSOR" />
-					<dbType type="REGCLASS" />
-					<dbType type="REGOPER" />
-					<dbType type="REGOPERATOR" />
-					<dbType type="REGPROC" />
-					<dbType type="REGPROCEDURE" />
-					<dbType type="REGTYPE" />						
-					<dbType type="SMGR" />			
-					<dbType type="TID" />
-					<dbType type="XID" />
-					<dbType type="_CHAR" />
-					<dbType type="_ABSTIME" />
-					<dbType type="_ACLITEM" />
-					<dbType type="_INT8" />
-					<dbType type="_VARBIT" />
-					<dbType type="_BIT" />			
-					<dbType type="_BOOL" />
-					<dbType type="BOX" />
-					<dbType type="_BOX" />
-					<dbType type="_BYTEA" />
-					<dbType type="_VARCHAR" />
-					<dbType type="_BPCHAR" />
-					<dbType type="_CID" />
-					<dbType type="_CIDR" />
-					<dbType type="_CIRCLE" />
-					<dbType type="_DATE" />
-					<dbType type="_FLOAT8" />
-					<dbType type="_INET" />
-					<dbType type="INT2VECTOR" />
-					<dbType type="_INT2VECTOR" />
-					<dbType type="_INT4" />
-					<dbType type="_INTERVAL" />
-					<dbType type="LINE" />
-					<dbType type="_LINE" />
-					<dbType type="LSEG" />
-					<dbType type="_LSEG" />
-					<dbType type="_MACADDR" />
-					<dbType type="_MONEY" />
-					<dbType type="NAME" />
-					<dbType type="_NAME" />
-					<dbType type="_NUMERIC" />
-					<dbType type="_OID" />
-					<dbType type="OIDVECTOR" />
-					<dbType type="_OIDVECTOR" />
-					<dbType type="_PATH" />
-					<dbType type="POINT" default="true" />				
-				</talendType>
-				<talendType type="id_Short">
-					<dbType type="INT2"   default="true" />
-					<dbType type="INT4" />
-					<dbType type="SERIAL" />
-					<dbType type="INT8" />
-					<dbType type="BIGSERIAL" />					
-				</talendType>
-				<talendType type="id_String">
-					<dbType type="BPCHAR" />
-					<dbType type="VARCHAR" default="true" />
-					<dbType type="TEXT" />				
-				</talendType>
-			</talendToDbTypes>
-			<dbToTalendTypes>
-				<dbType type="INT2" >
-					<talendType type="id_Short" default="true" />				
-				</dbType>				
-				<dbType type="INT4" >
-					<talendType type="id_Integer" default="true" />
-				</dbType>				
-				<dbType type="SERIAL" >
-					<talendType type="id_Integer" default="true" />				
-				</dbType>				
-				<dbType type="INT8" >
-					<talendType type="id_Long" default="true" />				
-				</dbType>				
-				<dbType type="BIGSERIAL" >
-					<talendType type="id_Long" default="true" />				
-				</dbType>				
-				<dbType type="FLOAT4" >
-					<talendType type="id_Float" default="true" />				
-					<talendType type="id_BigDecimal"/>			
-				</dbType>				
-				<dbType type="FLOAT8" >
-					<talendType type="id_Double" default="true" />				
-					<talendType type="id_BigDecimal"/>			
-				</dbType>
-				<dbType type="NUMERIC">
-					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal" default="true"/>			
-				</dbType>				
-				<dbType type="BOOL" >
-					<talendType type="id_Boolean" default="true" />				
-				</dbType>				
-				<dbType type="BIT" >
-					<talendType type="id_byte[]" default="true" />	
-				</dbType>				
-				<dbType type="VARBIT" >
-					<talendType type="id_byte[]" default="true" />				
-				</dbType>							
-				<dbType type="CHAR" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
-				<dbType type="BPCHAR" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
-				<dbType type="VARCHAR" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
-				<dbType type="TEXT" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
-				<dbType type="DATE" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
-				<dbType type="ABSTIME" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
-				<dbType type="TIMETZ" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
-				<dbType type="TIME" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
-				<dbType type="TIMESTAMPTZ" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
-				<dbType type="TIMESTAMP" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>
-				<dbType type="INTERVAL" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>								
-				<dbType type="TINTERVAL" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
-				<dbType type="RELTIME" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>							
-				<dbType type="ACLITEM" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
-				<dbType type="BYTEA" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>										
-				<dbType type="CID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="CIDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="CIRCLE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>										
-				<dbType type="INET" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
-				<dbType type="MACADDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="MONEY" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
-				<dbType type="OID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="PATH" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="POLYGON" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
-				<dbType type="REFCURSOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="REGCLASS" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="REGOPER" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="REGOPERATOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="REGPROC" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="REGPROCEDURE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="REGTYPE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>										
-				<dbType type="SMGR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
-				<dbType type="TID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="XID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="BOX" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="INT2VECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="LINE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="LSEG" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="NAME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="OIDVECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="POINT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>	
-				<!-- object -->
-				<dbType type="_OIDVECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_PATH" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_NAME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_NUMERIC" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_OID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_LSEG" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_MACADDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_MONEY" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_LINE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_INT2VECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_INT4" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_INTERVAL" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_BOX" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_BYTEA" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_VARCHAR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_BPCHAR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_CID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_CIDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_CIRCLE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_DATE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_FLOAT8" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_INET" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_CHAR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_ABSTIME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_ACLITEM" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_INT8" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_VARBIT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_BIT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
-				<dbType type="_BOOL" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>
-				<dbType type="_POINT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_POLYGON" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_FLOAT4" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REFCURSOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REGCLASS" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REGOPER" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REGOPERATOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REGPROC" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REGPROCEDURE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_REGTYPE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_RELTIME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TEXT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TIMETZ" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TIME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TIMESTAMPTZ" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TIMESTAMP" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_TINTERVAL" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
-				<dbType type="_XID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>									
-			</dbToTalendTypes>
-		</language>
-	</dbms>
-
-</mapping>
--- a/main/plugins/org.talend.core.runtime/mappings/mapping_VectorWise.xml
+++ b/main/plugins/org.talend.core.runtime/mappings/mapping_VectorWise.xml
@@ -1,211 +0,0 @@
-<?xml version="1.0"?>
-<mapping>
-	<dbms product="VECTORWISE" id="vectorwise_id" label="Mapping VectorWise"
-		default="true">
-		<dbTypes>
-			<dbType type="ANSIDATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="BIGINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="BYTE" ignoreLen="true" ignorePre="true" />
-			<dbType type="BYTE VARYING" ignoreLen="true" ignorePre="true" />
-			<dbType type="C" ignoreLen="true" ignorePre="true" />
-			<dbType type="CHAR" ignorePre="true" />
-			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" />
-			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="FLOAT" ignoreLen="true" ignorePre="true" />
-			<dbType type="FLOAT4" ignoreLen="true" ignorePre="true" />
-			<dbType type="INTEGER" ignoreLen="true" ignorePre="true" />
-			<dbType type="INGRESDATE" ignoreLen="true" ignorePre="true" />
-			<dbType type="INTERVAL" ignoreLen="true" ignorePre="true" />
-			<dbType type="LONG NVARCHAR" ignorePre="true" />
-			<dbType type="LONG VARCHAR" ignoreLen="true" ignorePre="true" />
-			<dbType type="MONEY" ignoreLen="true" ignorePre="true" />
-			<dbType type="NCHAR" ignorePre="true" defaultLength="10"/>
-			<dbType type="NVARCHAR" ignorePre="true" defaultLength="10"/>
-			<dbType type="OBJECT_KEY"  ignoreLen="true" ignorePre="true"/>
-			<dbType type="SMALLINT"  ignoreLen="true" ignorePre="true"/>
-			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
-			<dbType type="TINYINT" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
-			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true"/>
-			<dbType type="TABLE_KEY" ignoreLen="true" ignorePre="true" />
-			<dbType type="VARCHAR" default="true" defaultLength="1200" ignorePre="true"/>
-		</dbTypes>
-
-		<language name="java">
-			<talendToDbTypes><!-- Adviced mappings  -->
-				<talendType type="id_List"/>
-				<talendType type="id_Boolean">	
-				</talendType>
-				<talendType type="id_Byte">
-					<dbType type="BYTE" default="true" />
-					<dbType type="BYTE VARYING" />
-				</talendType>
-				<talendType type="id_byte[]">
-				</talendType>
-				<talendType type="id_Character">
-					<dbType type="CHAR" default="true" />
-					<dbType type="VARCHAR"/>
-					<dbType type="C"/>
-					<dbType type="TEXT"/>
-					<dbType type="LONG VARCHAR"/>
-					<dbType type="NCHAR"/>
-					<dbType type="NVARCHAR"/>
-					<dbType type="LONG NVARCHAR"/>
-				</talendType>
-				<talendType type="id_Date">					
-					<dbType type="ANSIDATE" default="true"/>
-					<dbType type="DATE"/>
-					<dbType type="INGRESDATE" />
-					<dbType type="TIME" />
-					<dbType type="TIMESTAMP" />		
-					<dbType type="INTERVAL"/>		
-				</talendType>
-				<talendType type="id_BigDecimal">
-					<dbType type="DECIMAL" default="true" />
-					<dbType type="FLOAT4" />
-					<dbType type="FLOAT"/>
-					<dbType type="MONEY"/>
-				</talendType>
-				<talendType type="id_Double">
-					<dbType type="FLOAT" default="true" />
-					<dbType type="FLOAT4" />
-					<dbType type="DECIMAL"/>
-					<dbType type="MONEY"/>
-				</talendType>
-				<talendType type="id_Float">
-					<dbType type="FLOAT4" default="true" />
-					<dbType type="FLOAT"/>
-					<dbType type="DECIMAL" />
-					<dbType type="MONEY"/>
-				</talendType>
-				<talendType type="id_Integer">
-					<dbType type="INTEGER" default="true" />
-					<dbType type="BIGINT" />
-					<dbType type="SMALLINT"/>
-					<dbType type="TINYINT"/>
-				</talendType>
-				<talendType type="id_Long">
-					<dbType type="BIGINT" default="true" />	
-					<dbType type="INTEGER"/>
-					<dbType type="SMALLINT"/>
-					<dbType type="TINYINT"/>	
-				</talendType>
-				<talendType type="id_Object">
-					<dbType type="MONEY" default="true"/>
-					<dbType type="OBJECT_KEY" />
-					<dbType type="TABLE_KEY" />
-				</talendType>
-				<talendType type="id_Short">
-					<dbType type="SMALLINT" default="true" />
-					<dbType type="INTEGER" />
-					<dbType type="BIGINT"/>
-					<dbType type="TINYINT" />
-				</talendType>
-				<talendType type="id_String">
-					<dbType type="VARCHAR" default="true" />
-					<dbType type="LONG VARCHAR" />
-					<dbType type="NCHAR"/>
-					<dbType type="NVARCHAR" />
-					<dbType type="LONG NVARCHAR" />		
-					<dbType type="TEXT" />
-					<dbType type="C"/>
-					<dbType type="CHAR"/>
-				</talendType>
-			</talendToDbTypes>
-			<dbToTalendTypes>
-				<dbType type="ANSIDATE">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="BIGINT">
-					<talendType type="id_Long" default="true" />
-				</dbType>
-				<dbType type="BYTE">
-					<talendType type="id_Byte" default="true" />
-				</dbType>
-				<dbType type="BYTE VARYING">
-					<talendType type="id_Byte" default="true" />
-				</dbType>
-				<dbType type="C">
-					<talendType type="id_String" default="true" />
-					<talendType type="id_Character"/>
-				</dbType>
-				<dbType type="CHAR">
-					<talendType type="id_String" default="true" />
-					<talendType type="id_Character"/>
-				</dbType>
-				<dbType type="DECIMAL">
-					<talendType type="id_Float"/>
-					<talendType type="id_BigDecimal" default="true"/>
-				</dbType>
-				<dbType type="DATE">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="FLOAT">
-					<talendType type="id_Double" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="FLOAT4">
-					<talendType type="id_Float" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="INTEGER">
-					<talendType type="id_Integer" default="true" />
-					<talendType type="id_Long"/>
-					<talendType type="id_Short"/>
-				</dbType>
-				<dbType type="INGRESDATE">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="INTERVAL">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="LONG NVARCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="LONG VARCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="MONEY">
-					<talendType type="id_Float" default="true" />
-					<talendType type="id_BigDecimal"/>
-				</dbType>
-				<dbType type="NCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="NVARCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="OBJECT_KEY">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="SMALLINT">
-					<talendType type="id_Short" default="true" />
-					<talendType type="id_Integer" />
-					<talendType type="id_Long"/>
-				</dbType>
-				<dbType type="TEXT">
-					<talendType type="id_String" default="true" />
-				</dbType>
-				<dbType type="TINYINT">
-					<talendType type="id_Byte" default="true" />
-					<talendType type="id_Integer" />
-					<talendType type="id_Short"/>
-					<talendType type="id_Long" />
-				</dbType>
-				<dbType type="TIME">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="TIMESTAMP">
-					<talendType type="id_Date" default="true" />
-				</dbType>
-				<dbType type="TABLE_KEY">
-					<talendType type="id_Object" default="true" />
-				</dbType>
-				<dbType type="VARCHAR">
-					<talendType type="id_String" default="true" />
-				</dbType>
-			</dbToTalendTypes>
-		</language>
-	</dbms>
-
-</mapping>
--- a/main/plugins/org.talend.core.runtime/mappings/mapping_sas.xml
+++ b/main/plugins/org.talend.core.runtime/mappings/mapping_sas.xml
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!-- Similar as db system, but this mapping file is use for SAP -->
-<mapping>
-	<dbms product="SAS" id="sas_id" label="Mapping SAS" default="true">
-		<dbTypes>
-		 <dbType type="CHAR" defaultLength="20" ignoreLen="false" ignorePre="true"/> 
- 		 <dbType type="NUM" defaultLength="20" defaultPrecision="10" ignoreLen="false" ignorePre="false"/> 
-		</dbTypes>
-		<language name="java">
-			<talendToDbTypes><!-- Adviced mappings  -->
-				<talendType type="id_List" />
-				<talendType type="id_Boolean">
-				</talendType>
-				<talendType type="id_Byte">
-				</talendType>
-				<talendType type="id_byte[]">
-				</talendType>
-				<talendType type="id_Character">
-				</talendType>
-				<talendType type="id_Date">
-				</talendType>
-				<talendType type="id_BigDecimal">
-				</talendType>
-				<talendType type="id_Double"> 
- 		            <dbType type="NUM" default="true"/> 
- 		        </talendType>
-				<talendType type="id_Float">
-				</talendType>
-				<talendType type="id_Integer">
-				</talendType>
-				<talendType type="id_Long" />
-				<talendType type="id_Object">
-				</talendType>
-				<talendType type="id_Short">
-				</talendType>
-				<talendType type="id_String">
-				<dbType type="CHAR" default="true"/> 
-				</talendType>
-			</talendToDbTypes>
-			<dbToTalendTypes>
-			<dbType type="CHAR"> 
- 		       <talendType type="id_String" default="true" /> 
- 		        <talendType type="id_Character" /> 
- 		       </dbType> 
- 		     <dbType type="NUM"> 
- 	              <talendType type="id_Double" default="true" /> 
- 		     </dbType> 
-			</dbToTalendTypes>
-		</language>
-	</dbms>
-</mapping>
--- a/main/plugins/org.talend.core.runtime/pom.xml
+++ b/main/plugins/org.talend.core.runtime/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.runtime</artifactId>
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabase4DriverClassName.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabase4DriverClassName.java
@@ -33,9 +33,6 @@ public enum EDatabase4DriverClassName {
    IBMDB2ZOS(EDatabaseTypeName.IBMDB2ZOS, "COM.ibm.db2os390.sqlj.jdbc.DB2SQLJDriver"), //$NON-NLS-1$

    INFORMIX(EDatabaseTypeName.INFORMIX, "com.informix.jdbc.IfxDriver"), //$NON-NLS-1$
-    INGRES(EDatabaseTypeName.INGRES, "com.ingres.jdbc.IngresDriver"), //$NON-NLS-1$
-    INTERBASE(EDatabaseTypeName.INTERBASE, "interbase.interclient.Driver"), //$NON-NLS-1$
-    VECTORWISE(EDatabaseTypeName.VECTORWISE, "com.ingres.jdbc.IngresDriver"), //$NON-NLS-1$

    JAVADB_DERBYCLIENT(EDatabaseTypeName.JAVADB_DERBYCLIENT, "org.apache.derby.jdbc.ClientDriver"), //$NON-NLS-1$
    JAVADB_EMBEDED(EDatabaseTypeName.JAVADB_EMBEDED, "org.apache.derby.jdbc.EmbeddedDriver"), //$NON-NLS-1$
@@ -59,7 +56,6 @@ public enum EDatabase4DriverClassName {
    ORACLE_OCI(EDatabaseTypeName.ORACLE_OCI, "oracle.jdbc.OracleDriver", "oracle.jdbc.driver.OracleDriver"), //$NON-NLS-1$ //$NON-NLS-2$
    ORACLE_CUSTOM(EDatabaseTypeName.ORACLE_CUSTOM, "oracle.jdbc.OracleDriver", "oracle.jdbc.driver.OracleDriver"), //$NON-NLS-1$ //$NON-NLS-2$

-    PARACCEL(EDatabaseTypeName.PARACCEL, "com.paraccel.Driver"), //$NON-NLS-1$
    REDSHIFT(EDatabaseTypeName.REDSHIFT, "com.amazon.redshift.jdbc42.Driver"), //$NON-NLS-1$
    REDSHIFT_SSO(EDatabaseTypeName.REDSHIFT_SSO, "com.amazon.redshift.jdbc42.Driver"),

--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabaseTypeName.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabaseTypeName.java
@@ -75,18 +75,12 @@ public enum EDatabaseTypeName {

    JAVADB(
            "JavaDB", "JavaDB", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    INGRES(
-            "Ingres", "Ingres", Boolean.FALSE, "INGRES", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "INGRES"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    INTERBASE(
-            "Interbase", "Interbase", Boolean.FALSE, "INTERBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INTERBASE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    SQLITE(
            "SQLite", "SQLite", Boolean.FALSE, "SQLITE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "SQLITE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    FIREBIRD(
            "FireBird", "FireBird", Boolean.FALSE, "FIREBIRD", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "FIREBIRD"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    INFORMIX(
            "Informix", "Informix", Boolean.TRUE, "INFORMIX", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INFORMIX"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VECTORWISE(
-            "VectorWise", "VectorWise", Boolean.FALSE, "VECTORWISE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$

    ACCESS(
            "Access", "Access", Boolean.FALSE, "ACCESS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Default_Name), // "ACCESS"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -110,8 +104,6 @@ public enum EDatabaseTypeName {

    GREENPLUM(
            "Greenplum", "Greenplum", Boolean.TRUE, "GREENPLUM", "GREENPLUM", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    PARACCEL(
-            "ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    NETEZZA(
            "Netezza", "Netezza", Boolean.FALSE, "NETEZZA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    SAS("SAS", "SAS", Boolean.TRUE, "SAS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -146,7 +138,9 @@ public enum EDatabaseTypeName {
            "HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

    MAPRDB(
-            "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true),//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    SNOWFLAKE(
+            "SNOWFLAKE","SNOWFLAKE",Boolean.TRUE,"SNOWFLAKE",EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.None);

    // displayName is used in Java code.
    private String displayName;
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/ConnParameterKeys.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/ConnParameterKeys.java
@@ -214,6 +214,36 @@ public class ConnParameterKeys {

    /******************************************/

+    /*********** Azure Synapse keys ***************/
+    
+    public static final String CONN_PARA_KEY_SYNAPSE_HOST = "CONN_PARA_KEY_SYNAPSE_HOST"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_SYNAPSE_AUTH_TOKEN = "CONN_PARA_KEY_SYNAPSE_AUTH_TOKEN"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_SYNAPSE_SPARK_POOLS = "CONN_PARA_KEY_SYNAPSE_SPARK_POOLS"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_SYNAPSE_FS_HOSTNAME = "CONN_PARA_KEY_SYNAPSE_FS_HOSTNAME"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_SYNAPSE_FS_CONTAINER = "CONN_PARA_KEY_SYNAPSE_FS_CONTAINER"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_SYNAPSE_FS_USERNAME = "CONN_PARA_KEY_SYNAPSE_FS_USERNAME"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_SYNAPSE_FS_PASSWORD = "CONN_PARA_KEY_SYNAPSE_FS_PASSWORD"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_SYNAPSE_FS_STORAGE = "CONN_PARA_KEY_SYNAPSE_FS_STORAGE"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_SYNAPSE_DEPLOY_BLOB = "CONN_PARA_KEY_SYNAPSE_DEPLOY_BLOB"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_DRIVER_MEMORY = "CONN_PARA_KEY_DRIVER_MEMORY"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_DRIVER_CORES = "CONN_PARA_KEY_DRIVER_CORES"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_EXECUTOR_MEMORY = "CONN_PARA_KEY_EXECUTOR_MEMORY"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_TUNING_PROPERTIES = "CONN_PARA_KEY_TUNING_PROPERTIES"; //$NON-NLS-1$
+
+    /******************************************/
+
    /**
     * HBase keys.
     */
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/template/EDatabaseConnTemplate.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/template/EDatabaseConnTemplate.java
@@ -112,15 +112,6 @@ public enum EDatabaseConnTemplate {
    SQLITE(new DbConnStr(EDatabaseTypeName.SQLITE, //
            "jdbc:sqlite:/<filename>")), //$NON-NLS-1$

-    INGRES(new DbConnStr(EDatabaseTypeName.INGRES, //
-            "jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
-            "II7")), //$NON-NLS-1$
-    VECTORWISE(new DbConnStr(EDatabaseTypeName.VECTORWISE, //
-            "jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
-            "II7")), //$NON-NLS-1$
-    INTERBASE(new DbConnStr(EDatabaseTypeName.INTERBASE, //
-            "jdbc:interbase://<host>/<sid>?<property>")), //$NON-NLS-1$
-
    FIREBIRD(new DbConnStr(EDatabaseTypeName.FIREBIRD, //
            "jdbc:firebirdsql:<host>/<port>:<filename>?<property>", //$NON-NLS-1$
            "3050")), //$NON-NLS-1$
@@ -174,11 +165,6 @@ public enum EDatabaseConnTemplate {
            "jdbc:sap://<host>:<port>?<property>", //$NON-NLS-1$
            "30015", //$NON-NLS-1$
            "")), //$NON-NLS-1$
-
-    PARACCEL(new DbConnStr(EDatabaseTypeName.PARACCEL, //
-            "jdbc:paraccel://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
-            "5439")), //$NON-NLS-1$
-
    REDSHIFT(new DbConnStr(EDatabaseTypeName.REDSHIFT, //
            "jdbc:redshift://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
            "5439",//$NON-NLS-1$
@@ -385,7 +371,6 @@ public enum EDatabaseConnTemplate {
            case PSQL:
            case PLUSPSQL:
            case GREENPLUM:
-            case PARACCEL:
            case REDSHIFT:
            case REDSHIFT_SSO:
            case IBMDB2:
@@ -430,10 +415,6 @@ public enum EDatabaseConnTemplate {
            case PSQL:
            case PLUSPSQL:
            case GREENPLUM:
-            case PARACCEL:
-            case INGRES:
-            case VECTORWISE:
-            case INTERBASE:
            case FIREBIRD:
            case JAVADB_EMBEDED:
            case JAVADB_JCCJDBC:
@@ -460,8 +441,6 @@ public enum EDatabaseConnTemplate {
            case SYBASEASE_16_SA:
            case IBMDB2:
            case IBMDB2_ZOS:
-            case INGRES:
-            case INTERBASE:
            case MSSQL:
            case INFORMIX:
            case TERADATA:
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java
@@ -47,10 +47,6 @@ public enum EDatabaseVersion4Drivers {
    // AS400
    AS400_V7R1_V7R3(new DbVersion4Drivers(EDatabaseTypeName.AS400, "V7R1 to V7R3", "AS400_V7R1_V7R3", "jt400-9.8.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    AS400_V6R1_V7R2(new DbVersion4Drivers(EDatabaseTypeName.AS400, "V6R1 to V7R2", "AS400_V6R1_V7R2", "jt400_V6R1.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    AS400_V5R3_V6R1(new DbVersion4Drivers(EDatabaseTypeName.AS400, "V5R3 to V6R1", "AS400_V5R3_V6R1", "jt400_V5R3.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    AS400_V5R2_V5R4(new DbVersion4Drivers(EDatabaseTypeName.AS400, "V5R2 to V5R4", "AS400_V5R2_V5R4", "jt400_V5R2.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    //
-    INTERBASE(new DbVersion4Drivers(EDatabaseTypeName.INTERBASE, "interclient.jar")), //$NON-NLS-1$

    //
    HSQLDB(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB, "hsqldb.jar")), //$NON-NLS-1$
@@ -85,22 +81,12 @@ public enum EDatabaseVersion4Drivers {
            "Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1-patch-20190523.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
            "Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.25.jar", "slf4j-log4j12-1.7.25.jar", "adal4j-1.6.5.jar", //$NON-NLS-1$
+            new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", "adal4j-1.6.5.jar", //$NON-NLS-1$
                    "commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.6.jar", "oauth2-oidc-sdk-6.5.jar",
                    "json-smart-2.4.7.jar", "nimbus-jose-jwt-8.11.jar", "javax.mail-1.6.2.jar", "log4j-1.2.17.jar",
                    "accessors-smart-2.4.7.jar", "asm-9.1.jar" })),

    VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_7_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.1.X (Deprecated)", "VERTICA_7_1_X", "vertica-jdbc-7.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_7(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.0.X (Deprecated)", "VERTICA_7_0_X", "vertica-jdbc-7.0.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_6_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 6.1.X (Deprecated)", "VERTICA_6_1_X", "vertica-jdk5-6.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_6(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 6.0 (Deprecated)", "VERTICA_6_0", "vertica-jdk5-6.0.0-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_5_1(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 5.1 (Deprecated)", "VERTICA_5_1", "vertica_5.1.6_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_5(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 5.0 (Deprecated)", "VERTICA_5", "vertica_4.1.14_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_4_1(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 4.1 (Deprecated)", "VERTICA_4_1", "vertica_4.1.7_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_4(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 4 (Deprecated)", "VERTICA_4", "vertica_4.0_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_3_5(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 3.5 (Deprecated)", "VERTICA_3.5", "vertica_3.5_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VERTICA_3(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 3 (Deprecated)", "VERTICA_3", "vertica_3.0_jdk_5.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

    // for bug 0017930
    GREENPLUM_PSQL(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"PostgreSQL", "POSTGRESQL", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$
@@ -121,15 +107,9 @@ public enum EDatabaseVersion4Drivers {
    SYBASEIQ_16_SA(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 16 (SQL Anywhere)", "SYBSEIQ_16_SA", "sajdbc4-17.0.0.jar")),
    SYBASEIQ(new DbVersion4Drivers(EDatabaseTypeName.SYBASEIQ, "jconn3.jar")), //$NON-NLS-1$

-    // for bug 0013127
-    PARACCEL(new DbVersion4Drivers(EDatabaseTypeName.PARACCEL, "paraccel-jdbc.jar")), //$NON-NLS-1$
-    VECTORWISE(new DbVersion4Drivers(EDatabaseTypeName.VECTORWISE, "iijdbc.jar")), //$NON-NLS-1$
-
    EXASOL(new DbVersion4Drivers(EDatabaseTypeName.EXASOL, "exajdbc-6.0.9302.jar")), //$NON-NLS-1$
    MAXDB(new DbVersion4Drivers(EDatabaseTypeName.MAXDB, "sapdbc.jar")), //$NON-NLS-1$

-    INGRES(new DbVersion4Drivers(EDatabaseTypeName.INGRES, "iijdbc.jar")), //$NON-NLS-1$
-
    // HIVE(new DbVersion4Drivers(EDatabaseTypeName.HIVE, "STANDALONE", "STANDALONE", new String[] {
    // "hive-jdbc-0.8.1.jar",
    // "hive-metastore-0.8.1.jar", "hive-exec-0.8.1.jar", "hive-service-0.8.1.jar", "libfb303_new.jar",
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopProperties.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopProperties.java
@@ -102,11 +102,38 @@ public enum EHadoopProperties {

    HD_JOB_RESULT_FOLDER,

+    SYNAPSE_ENDPOINT,
+    
+    SYNAPSE_TOKEN,
+    
+    SPARK_POOL_NAME,
+    
+    SYNAPSE_STORAGE_HOST,
+    
+    SYNAPSE_STORAGE_CONTAINER,
+    
+    SYNAPSE_STORAGE_USERNAME,
+    
+    SYNAPSE_STORAGE_PASSWORD,
+    
+    DEPLOY_FOLDER,
+    
+    SPARK_DRIVER_MEM,
+    
+    SPARK_DRIVER_CORES,
+    
+    SPARK_EXECUTOR_MEMORY,
+    
    DATABRICKS_ENDPOINT,
+    
    DATABRICKS_CLOUD_PROVIDER,
+
    DATABRICKS_RUN_MODE,
+
    DATABRICKS_CLUSTER_ID,
+    
    DATABRICKS_TOKEN,
+    
    DATABRICKS_DBFS_DEP_FOLDER;

    public String getName() {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/EHadoopDistributions.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/EHadoopDistributions.java
@@ -32,6 +32,8 @@ public enum EHadoopDistributions {
    PIVOTAL_HD("Pivotal HD"), //$NON-NLS-1$

    MICROSOFT_HD_INSIGHT("Microsoft HD Insight"), //$NON-NLS-1$
+    
+    AZURE_SYNAPSE("Azure Synapse Runtime for Apache Spark 3.0"), //$NON-NLS-1$

    GOOGLE_CLOUD_DATAPROC("Google Cloud Dataproc"), //$NON-NLS-1$

--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/ESynapseStorage.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/ESynapseStorage.java
@@ -0,0 +1,73 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2020 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.core.hadoop.version;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public enum ESynapseStorage {
+
+	ADLS_GEN2("ADLS Gen2"); //$NON-NLS-1$
+
+    private String displayName;
+
+    ESynapseStorage(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getName() {
+        return name();
+    }
+
+    public String getDisplayName() {
+        return this.displayName;
+    }
+
+    public static List<String> getAllSynapseStorageDisplayNames() {
+        return getAllSynapseStorageNames(true);
+    }
+
+    public static List<String> getAllSynapseStorageNames(boolean display) {
+        List<String> names = new ArrayList<String>();
+        ESynapseStorage[] values = values();
+        for (ESynapseStorage storage : values) {
+            if (display) {
+                names.add(storage.getDisplayName());
+            } else {
+                names.add(storage.getName());
+            }
+        }
+        return names;
+    }
+
+    public static ESynapseStorage getSynapseStoragenByDisplayName(String name) {
+        return getSynapseStorageByName(name, true);
+    }
+
+    public static ESynapseStorage getSynapseStorageByName(String name, boolean display) {
+        if (name != null) {
+            for (ESynapseStorage storage : values()) {
+                if (display) {
+                    if (name.equalsIgnoreCase(storage.getDisplayName())) {
+                        return storage;
+                    }
+                } else {
+                    if (name.equalsIgnoreCase(storage.getName())) {
+                        return storage;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/components/ComponentCategory.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/components/ComponentCategory.java
@@ -21,6 +21,8 @@ import org.talend.core.model.properties.JobletProcessItem;
 import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.service.IMRProcessService;
 import org.talend.core.service.IStormProcessService;
+import org.talend.core.ui.ISparkJobletProviderService;
+import org.talend.core.ui.ISparkStreamingJobletProviderService;
 import org.talend.designer.core.ICamelDesignerCoreService;

 /**
@@ -83,6 +85,10 @@ public enum ComponentCategory {
    }

    public static ComponentCategory getComponentCategoryFromItem(Item item) {
+        return getComponentCategoryFromItem(item, false);
+    }
+
+    public static ComponentCategory getComponentCategoryFromItem(Item item, boolean isJoblet) {
        if (GlobalServiceRegister.getDefault().isServiceRegistered(ICamelDesignerCoreService.class)) {
            ICamelDesignerCoreService camelService = (ICamelDesignerCoreService) GlobalServiceRegister.getDefault().getService(
                    ICamelDesignerCoreService.class);
@@ -111,6 +117,23 @@ public enum ComponentCategory {
            }
        }
        if (item instanceof ProcessItem || item instanceof JobletProcessItem) {
+            if (isJoblet) {
+                if (GlobalServiceRegister.getDefault().isServiceRegistered(ISparkJobletProviderService.class)) {
+                    ISparkJobletProviderService sparkJobletService = GlobalServiceRegister.getDefault()
+                            .getService(ISparkJobletProviderService.class);
+                    if (sparkJobletService.isSparkJobletItem(item)) {
+                        return ComponentCategory.CATEGORY_4_SPARK;
+                    }
+                }
+                if (GlobalServiceRegister.getDefault().isServiceRegistered(ISparkStreamingJobletProviderService.class)) {
+                    ISparkStreamingJobletProviderService sparkStrJobletService = GlobalServiceRegister.getDefault()
+                            .getService(ISparkStreamingJobletProviderService.class);
+                    if (sparkStrJobletService.isSparkStreamingJobletItem(item)) {
+                        return ComponentCategory.CATEGORY_4_SPARKSTREAMING;
+                    }
+                }
+            }
+
            return ComponentCategory.CATEGORY_4_DI;
        }
        return null;
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/ContextUtils.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/ContextUtils.java
@@ -71,6 +71,9 @@ public class ContextUtils {
            "instanceof", "return", "transient", "catch", "extends", "int", "short", "try", "char", "final", "interface", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
            "static", "void", "class", "finally", "long", "strictfp", "volatile", "const", "float", "native", "super", "while")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$

+    private static final Set<String> SECURE_SENSITIVE_CONTEXT_NAMES_EXP = new HashSet<String>(Arrays.asList("resource_flow_temp_folder", "resource_webhook_payload", "resource_file_[\\w]+", 
+           "resource_directory_[\\w]+", "connection_[a-zA-Z0-9]+_[\\w]+"));
+    

    /**
     *
@@ -90,6 +93,22 @@ public class ContextUtils {
        return false;
    }

+    /**
+    *
+    * ggu Comment method "isSecureSensitiveParam".
+    *
+    */
+    public static boolean isSecureSensitiveParam (final String name) {
+       
+        for (String regexp : SECURE_SENSITIVE_CONTEXT_NAMES_EXP) {
+            if (name.matches(regexp)) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+
    /**
     *
     * update the JobContextParameter form repository ContextItem by context name.
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataToolHelper.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataToolHelper.java
@@ -26,8 +26,6 @@ import java.util.Vector;
 import java.util.regex.Pattern;

 import org.apache.avro.Schema;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.EMap;
@@ -67,10 +65,8 @@ import org.talend.core.model.process.INode;
 import org.talend.core.model.properties.ConnectionItem;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.impl.ConnectionItemImpl;
-import org.talend.core.model.repository.IRepositoryPrefConstants;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.routines.IRoutinesService;
-import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.core.runtime.services.IGenericWizardService;
@@ -297,6 +293,7 @@ public final class MetadataToolHelper {
        boolean isKeyword = KeywordsValidator.isKeyword(originalColumnName);

        StringBuilder sb = new StringBuilder();
+        int[] charBit = new int[columnName.length()];
        if (!isKeyword) {
            boolean isAllowSpecific = isAllowSpecificCharacters();

@@ -312,14 +309,16 @@ public final class MetadataToolHelper {
                        sb.append(car);
                    } else {
                        sb.append(underLine);
+                        charBit[i] = 1;
                    }
                } else {
                    sb.append(car);
                }
            }
        }
-        String returnedColumnName = trimBeginEnd_(sb.toString());
-        if (isKeyword || "".equals(returnedColumnName)) {
+        String returnedColumnName = trimBeginEnd_(sb.toString(), charBit);
+        if (isKeyword || "".equals(returnedColumnName) || org.apache.commons.lang.StringUtils.countMatches(returnedColumnName,
+                underLine) == originalColumnName.length()) {
            returnedColumnName = "Column" + index; //$NON-NLS-1$
        }

@@ -332,29 +331,28 @@ public final class MetadataToolHelper {
    // abc -> abc
    // _abc -> _abc
    // _____ -> ""
-    public static String trimBeginEnd_(String columnName) {
+    private static String trimBeginEnd_(String columnName, int[] charBit) {
        if (columnName == null) {
            return null;
        }
-        int len = columnName.length();
        int st = 0;
+        int len = charBit.length;
        char[] val = columnName.toCharArray(); /* avoid getfield opcode */

-        while ((st < len) && (val[st] == '_')) {
+        while (st < len && charBit[st] == 1) {
            st++;
        }
-        while ((st < len) && (val[len - 1] == '_')) {
+        while (st < len && charBit[len - 1] == 1) {
            len--;
        }
        if ((st > 0) || (len < columnName.length())) {
            if (st == columnName.length()) {
                return "";
            }
-            if (st > 0) {
-                return columnName.substring(st - 1, len);
-            } else {
-                return columnName.substring(st, len);
+            if (st > 0 && val[st] != '_') {
+                st--;
            }
+            return columnName.substring(st, len);
        } else {
            return columnName;
        }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/SparkBatchMetadataTalendTypeFilter.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/SparkBatchMetadataTalendTypeFilter.java
@@ -0,0 +1,42 @@
+package org.talend.core.model.metadata;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.talend.core.model.process.IElementParameter;
+import org.talend.core.model.process.INode;
+
+public class SparkBatchMetadataTalendTypeFilter extends SparkMetadataTalendTypeFilter{
+
+    private INode node;
+
+    public static List<String> dynamicTypeCompatibleComponents = Arrays.asList(
+            "tDeltaLakeInput",
+            "tDeltaLakeOutput",
+            "tFileInputParquet",
+            "tFileOutputParquet",
+            "tJDBCInput",
+            "tJDBCOutput", "tLogRow", "tSqlRow"
+            );
+
+    public SparkBatchMetadataTalendTypeFilter(INode node) {
+        super(node.getComponent().getName());
+        this.node = node;
+    }
+
+    @Override
+    public List<String> getComponentSpecificTypes() {
+        // For the moment only dynamic type is a component specific type
+        // dynamic type is available under 2 conditions : job uses Dataset API and component is listed in
+        // dynamicTypeCompatibleComponents
+        INode configNode = node.getProcess().getNodesOfType("tSparkConfiguration").get(0);
+        IElementParameter param = configNode.getElementParameter("USE_DATASET_API");
+        if (Boolean.FALSE.equals(param.getValue())) {
+            return null;
+        }
+        if (dynamicTypeCompatibleComponents.contains(node.getComponent().getName())) {
+            return  Arrays.asList(SparkMetadataTalendTypeFilter.DYNAMIC);
+        }
+        return null;
+    }
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/SparkMetadataTalendTypeFilter.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/SparkMetadataTalendTypeFilter.java
@@ -22,7 +22,7 @@ public class SparkMetadataTalendTypeFilter extends MetadataTalendTypeFilter {

    private final static List<String> UNSUPPORTED_TYPES = Arrays.asList(new String[] { "Document", "Dynamic" }); //$NON-NLS-1$ //$NON-NLS-2$

-    private final static String ROWGENERATOR_COMPONENT_NAME = "tRowGenerator"; //$NON-NLS-1$
+    public final static String ROWGENERATOR_COMPONENT_NAME = "tRowGenerator"; //$NON-NLS-1$

    protected final static String INPUTPARQUET_COMPONENT_NAME = "tFileInputParquet", INPUTSTREAMPARQUET_COMPONENT_NAME = "tFileStreamInputParquet", OUTPUTPARQUET_COMPONENT_NAME = "tFileOutputParquet"; //$NON-NLS-1$; //$NON-NLS-2$ //$NON-NLS-3$

@@ -53,21 +53,35 @@ public class SparkMetadataTalendTypeFilter extends MetadataTalendTypeFilter {
        COMPONENT_UNSUPPORTED_TYPES.put(OUTPUTKUDU_COMPONENT_NAME, Arrays.asList(new String[] { "Object", "List", "Vector", "byte[]", "BigDecimal" })); //$NON-NLS-1$ //$NON-NLS-2$
    }

+    public static String DYNAMIC = "Dynamic";
+
    public SparkMetadataTalendTypeFilter(String componentName) {
        this.mComponentName = componentName;
    }

    @Override
    protected List<String> getUnsupportedTypes() {
+        List<String> unsupportedTypes = new ArrayList<String>(UNSUPPORTED_TYPES);
+
+        // Add component specific unsupported types
        List<String> currentComponentUnsupportedType = COMPONENT_UNSUPPORTED_TYPES.get(this.mComponentName);
        if (currentComponentUnsupportedType != null) {
-            List<String> unionList = new ArrayList<>();
-            unionList.addAll(currentComponentUnsupportedType);
-            unionList.addAll(UNSUPPORTED_TYPES);
-            return unionList;
-        } else {
-            return UNSUPPORTED_TYPES;
+            unsupportedTypes.addAll(currentComponentUnsupportedType);
        }
+
+        // Remove component specific supported types
+        List<String> componentSpecificTypes = getComponentSpecificTypes();
+        if (componentSpecificTypes != null) {
+            unsupportedTypes.removeIf(item -> componentSpecificTypes.contains(item));
+        }
+
+        return unsupportedTypes;
    }

+    /**
+     * Get a list of types that are specifically supported by the component
+     */
+    protected List<String> getComponentSpecificTypes() {
+        return null;
+    }
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/ComponentToRepositoryProperty.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/ComponentToRepositoryProperty.java
@@ -433,16 +433,6 @@ public class ComponentToRepositoryProperty {
            connection.setDatabaseType(EDatabaseTypeName.IBMDB2.getDisplayName());
            connection.setProductId(EDatabaseTypeName.IBMDB2.getProduct());
        }
-        // Ingres
-        else if (EDatabaseTypeName.INGRES.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
-            connection.setDatabaseType(EDatabaseTypeName.INGRES.getDisplayName());
-            connection.setProductId(EDatabaseTypeName.INGRES.getProduct());
-        }
-        // Interbase
-        else if (EDatabaseTypeName.INTERBASE.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
-            connection.setDatabaseType(EDatabaseTypeName.INTERBASE.getDisplayName());
-            connection.setProductId(EDatabaseTypeName.INTERBASE.getProduct());
-        }
        // Sqlite
        else if (EDatabaseTypeName.SQLITE.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
            connection.setDatabaseType(EDatabaseTypeName.SQLITE.getDisplayName());
@@ -488,11 +478,6 @@ public class ComponentToRepositoryProperty {
            connection.setDatabaseType(EDatabaseTypeName.MAXDB.getDisplayName());
            connection.setProductId(EDatabaseTypeName.MAXDB.getProduct());
        }
-        // Paraccel
-        else if (EDatabaseTypeName.PARACCEL.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
-            connection.setDatabaseType(EDatabaseTypeName.PARACCEL.getDisplayName());
-            connection.setProductId(EDatabaseTypeName.PARACCEL.getProduct());
-        }
        // Redshift
        else if (EDatabaseTypeName.REDSHIFT.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
            connection.setProductId(EDatabaseTypeName.REDSHIFT.getProduct());
@@ -600,11 +585,6 @@ public class ComponentToRepositoryProperty {
            connection.setDatabaseType(EDatabaseTypeName.SAPHana.getDisplayName());
            connection.setProductId(EDatabaseTypeName.SAPHana.getProduct());
        }
-        // VECTORWISE
-        else if (EDatabaseTypeName.VECTORWISE.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
-            connection.setDatabaseType(EDatabaseTypeName.VECTORWISE.getDisplayName());
-            connection.setProductId(EDatabaseTypeName.VECTORWISE.getProduct());
-        }
        // SAX
        // can not find corresponding component. also not exist in EDatabaseType.java.

--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java
@@ -2286,7 +2286,7 @@ public class RepositoryToComponentProperty {
                for (int j = 0; j < schemaTargets.size(); j++) {
                    SchemaTarget schemaTarget = schemaTargets.get(j);
                    if (schemaTarget.getTagName() != null && !schemaTarget.getTagName().equals("")) { //$NON-NLS-1$
-                        tagName = "" + schemaTarget.getTagName().trim().replaceAll(" ", "_"); //$NON-NLS-1$ //$NON-NLS-2$
+                        tagName = "" + schemaTarget.getTagName().trim(); //$NON-NLS-1$ //$NON-NLS-2$
                        tagName = MetadataToolHelper.validateColumnName(tagName, j);
                        Map<String, Object> map = new HashMap<String, Object>();
                        map.put("SCHEMA_COLUMN", tagName); //$NON-NLS-1$
@@ -2361,7 +2361,8 @@ public class RepositoryToComponentProperty {
                    for (IMetadataColumn metadataColumn : listColumns) {
                        if (metadataColumn.getLabel().equals(schemaTarget.getTagName())) {
                            foundColumn = true;
-                            tagName = "" + schemaTarget.getTagName().trim().replaceAll(" ", "_"); //$NON-NLS-1$ //$NON-NLS-2$
+                            tagName = "" + schemaTarget.getTagName().trim(); //$NON-NLS-1$
+                            // //$NON-NLS-2$
                            tagName = MetadataToolHelper.validateColumnName(tagName, j);
                            Map<String, Object> map = new HashMap<String, Object>();
                            map.put("SCHEMA_COLUMN", tagName); //$NON-NLS-1$
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/types/ContextParameterJavaTypeManager.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/types/ContextParameterJavaTypeManager.java
@@ -240,6 +240,11 @@ public class ContextParameterJavaTypeManager {
        if (javaType == null) {
            return null;
        }
+        
+        if(javaType.equals(JavaTypesManager.PASSWORD)) {
+        	return "Password";
+        }
+        
        Class primitiveClass = javaType.getPrimitiveClass();
        Class nullableClass = javaType.getNullableClass();
        if (nullable) {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/NodeUtil.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/NodeUtil.java
@@ -34,6 +34,7 @@ import org.talend.core.model.metadata.DummyMetadataTalendTypeFilter;
 import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.MetadataTalendTypeFilter;
 import org.talend.core.model.metadata.MrMetadataTalendTypeFilter;
+import org.talend.core.model.metadata.SparkBatchMetadataTalendTypeFilter;
 import org.talend.core.model.metadata.SparkMetadataTalendTypeFilter;
 import org.talend.core.model.metadata.StormMetadataTalendTypeFilter;
 import org.talend.core.model.process.AbstractNode;
@@ -427,8 +428,9 @@ public class NodeUtil {
     * @return
     */
    public static List<? extends IConnection> getFirstIncomingLineConnectionsOfType(INode node, String type) {
-        if (type == null)
+        if (type == null) {
            return new ArrayList<IConnection>();
+        }

        Set<String> uniqueNamesDone = new HashSet<String>();
        List<? extends IConnection> allIncomingConnections = getFirstIncomingLineConnectionsOfType(node, uniqueNamesDone, type);
@@ -450,7 +452,7 @@ public class NodeUtil {
                if (!uniqueNamesDone.contains(nextNode.getUniqueName())) {
                    uniqueNamesDone.add(nextNode.getUniqueName());

-                    if (type.equals((String)nextNode.getElementParameter("COMPONENT_NAME").getValue())) {
+                    if (type.equals(nextNode.getElementParameter("COMPONENT_NAME").getValue())) {
                        conns.add(connection);
                    } else {
                        conns.addAll(getFirstIncomingLineConnectionsOfType(nextNode, uniqueNamesDone, type)); // follow this way
@@ -807,7 +809,7 @@ public class NodeUtil {

                for (INode tnode : listDepartitioner) {
                    if (tnode.getUniqueName().equals(departitionerName)) { // find the tDepartitioner corresponding to
-                                                                           // tRecollector
+                        // tRecollector
                        INode startNode = getSubProcessStartNode(tnode); // find the tCollector
                        List<? extends IConnection> inConns = startNode.getIncomingConnections(EConnectionType.STARTS);
                        if (inConns != null && inConns.size() > 0) {
@@ -916,8 +918,8 @@ public class NodeUtil {
        }
        throw new IllegalArgumentException();
    }
-    
-    
+
+
    public static String getRuntimeParameterValue(INode node, IElementParameter ep) {
        if (EParameterFieldType.TABLE.equals(ep.getFieldType())) {
            Map<String, IElementParameter> types = new HashMap<String, IElementParameter>();
@@ -980,23 +982,23 @@ public class NodeUtil {
            return getRuntimeParameterValue(value, ep, false);
        }
    }
-    
+
    private static String getRuntimeParameterValue(String value, IElementParameter ep, boolean itemFromTable) {
        if (value == null) {
            value = "";
        }
-        
+
        value = value.trim();
-        
+
        boolean isMemo = false;
-        
+
        List<EParameterFieldType> needRemoveCRLFList = Arrays.asList(EParameterFieldType.MEMO, EParameterFieldType.MEMO_JAVA,
                EParameterFieldType.MEMO_SQL, EParameterFieldType.MEMO_IMPORT, EParameterFieldType.MEMO_MESSAGE);
        if (needRemoveCRLFList.contains(ep.getFieldType())) {
            isMemo = true;
            value = value.replaceAll("[\r\n]", " ");
        }
-        
+
        List<EParameterFieldType> needQuoteList = Arrays.asList(EParameterFieldType.CLOSED_LIST,
                EParameterFieldType.COMPONENT_LIST, EParameterFieldType.COLUMN_LIST, EParameterFieldType.PREV_COLUMN_LIST,
                EParameterFieldType.CONNECTION_LIST, EParameterFieldType.LOOKUP_COLUMN_LIST,
@@ -1022,13 +1024,13 @@ public class NodeUtil {
                value = value.substring(0, value.length() - 1);
            }
        }
-        
+
        if("".equals(value) || "\"\"".equals(value)) {
            return "\"\"";
        } else if("null".equals(value)) {
            return "(Object)null";
        }
-        
+
        // copied it from Log4jFileUtil.javajet but need more comment for this script
        if ("\"\\n\"".equals(value) || "\"\\r\"".equals(value) || "\"\\r\\n\"".equals(value)) {
            // for the value is "\n" "\r" "\r\n"
@@ -1048,7 +1050,7 @@ public class NodeUtil {
        else if ("BUILDIN".equals(ep.getName())) {
            return value.toLowerCase();
        }
-        
+
        //suppose all memo fields are processed well already, no need to go though this with dangerous
        if (!isMemo && !org.talend.core.model.utils.ContextParameterUtils.isDynamic(value)) {
            //https://jira.talendforge.org/browse/TDI-45563
@@ -1059,7 +1061,7 @@ public class NodeUtil {
                    return "\"\"";//return empty string as can't get the real runtime value
                }
            }
-            
+
            if(value.length() > 1 && value.startsWith("\"") && value.endsWith("\"")) {
                if(itemFromTable && "ARGS".equals(ep.getName())) {
                    value = value.substring(1, value.length());
@@ -1073,19 +1075,19 @@ public class NodeUtil {
                return "\"" + checkStringQuotationMarks(value) + "\"";
            }
        }
-        
+
        //TODO remove it
        if (value.endsWith("*")) {
            return value.substring(0, value.length() - 1) + "\"*\"";
        }
-        
+
        return value;
    }
-    
+
    private static boolean isValidLiteralValue(String value) {
        return ContextParameterUtils.isValidLiteralValue(value);
    }
-    
+
    private static String checkStringQuotationMarks(String str) {
        String result = str;
        if (result.contains("\"")) {
@@ -1212,52 +1214,52 @@ public class NodeUtil {
            fakeRightQuotes = getFakeRightQuotes( original,fakeRightQuotes);
        }
        int leftPrev = 0;
-    		while (leftQuotes >= 0 && rightQuotes > leftQuotes) {
-      			if (leftQuotes > leftPrev) {//Outside of double quote
-      				  result.append(original.substring(leftPrev, leftQuotes));
-      			}
+        while (leftQuotes >= 0 && rightQuotes > leftQuotes) {
+            if (leftQuotes > leftPrev) {//Outside of double quote
+                result.append(original.substring(leftPrev, leftQuotes));
+            }

-      			if (leftQuotes < rightQuotes) {//Inside of double quote
-        				//split string for better appearance and avoid compile error when string exceed 64k
-        			  if(needSplit) {
-            				int current = leftQuotes;
-            				int Offset = 120;
-            				int count = 0;
-            				while (rightQuotes + 1 - current > 120) {
-            				    //[\u0000] or [\000]
-            				    Matcher matcher = invalid_unicode_character_regex.matcher(original.substring(current, current + Offset));
-              				  if(matcher.matches()) {
-              				      Offset = Offset - matcher.group(1).length();
-              				  }
-              				  /*
+            if (leftQuotes < rightQuotes) {//Inside of double quote
+                //split string for better appearance and avoid compile error when string exceed 64k
+                if(needSplit) {
+                    int current = leftQuotes;
+                    int Offset = 120;
+                    int count = 0;
+                    while (rightQuotes + 1 - current > 120) {
+                        //[\u0000] or [\000]
+                        Matcher matcher = invalid_unicode_character_regex.matcher(original.substring(current, current + Offset));
+                        if(matcher.matches()) {
+                            Offset = Offset - matcher.group(1).length();
+                        }
+                        /*
              				  else {
                  				  matcher = invalid_octal_character_regex.matcher(original.substring(current, current + Offset));
                            if(matcher.matches()) {
                                Offset = Offset - matcher.group(1).length();
                            }
              				  }
-              				  */
+                         */

-              					while (original.charAt(current + Offset - 1) == '\\') {//avoid split special character e.g. \"
-              						  Offset--;
-              					}
+                        while (original.charAt(current + Offset - 1) == '\\') {//avoid split special character e.g. \"
+                            Offset--;
+                        }

-              					if(count>500){//This is the code that really solve TDI-39968 others are only for good appearance.
-                						result.append(original.substring(current, current + Offset).replace("\r", "").replace("\n", "\\n")).append("\" + new String()\n+\"");
-                						count = 0;
-              					}else{
-              						  result.append(original.substring(current, current + Offset).replace("\r", "").replace("\n", "\\n")).append("\"\n+\"");
-              					}
+                        if(count>500){//This is the code that really solve TDI-39968 others are only for good appearance.
+                            result.append(original.substring(current, current + Offset).replace("\r", "").replace("\n", "\\n")).append("\" + new String()\n+\"");
+                            count = 0;
+                        }else{
+                            result.append(original.substring(current, current + Offset).replace("\r", "").replace("\n", "\\n")).append("\"\n+\"");
+                        }

-              					current += Offset;
-              					Offset = 120;
-              					count++;
-            				}
-            				result.append(original.substring(current, rightQuotes + 1).replace("\r", "").replace("\n", "\\n"));
-        			  } else {
-            				result.append(original.substring(leftQuotes, rightQuotes + 1).replace("\r", "").replace("\n", "\\n"));
-        			  }
-      			}
+                        current += Offset;
+                        Offset = 120;
+                        count++;
+                    }
+                    result.append(original.substring(current, rightQuotes + 1).replace("\r", "").replace("\n", "\\n"));
+                } else {
+                    result.append(original.substring(leftQuotes, rightQuotes + 1).replace("\r", "").replace("\n", "\\n"));
+                }
+            }

            leftQuotes = original.indexOf("\"", rightQuotes + 1);
            leftPrev = rightQuotes + 1;
@@ -1394,7 +1396,10 @@ public class NodeUtil {
            if (ComponentCategory.CATEGORY_4_MAPREDUCE == cat) {
                return new MrMetadataTalendTypeFilter();
            }
-            if (ComponentCategory.CATEGORY_4_SPARK == cat || ComponentCategory.CATEGORY_4_SPARKSTREAMING == cat) {
+            if (ComponentCategory.CATEGORY_4_SPARK == cat) {
+                return new SparkBatchMetadataTalendTypeFilter(node);
+            }
+            if (ComponentCategory.CATEGORY_4_SPARKSTREAMING == cat) {
                return new SparkMetadataTalendTypeFilter(node.getComponent().getName());
            }
            if (ComponentCategory.CATEGORY_4_STORM == cat) {
@@ -1492,4 +1497,29 @@ public class NodeUtil {
        }
        return false;
    }
+    
+    /**
+     * TUP-32758:Used to judge if two components are compatible from name 
+     * for example tAmazonMysqlConnection and tMysqlConnection ,tAmazonOracleCommit and tOracleCommit
+     */
+    public static boolean isCompatibleByName(String componentName1, String componentName2) {
+        boolean isCompatable = false;
+        if ( componentName1 ==null || componentName2 == null 
+                || componentName1.length()<1 || componentName2.length() < 1) return false;
+        if (componentName1.replaceFirst("t", "tAmazon").equals(componentName2) ||
+                componentName2.replaceFirst("t", "tAmazon").equals(componentName1)) {
+            isCompatable = true;
+        }
+        return isCompatable;
+    }
+    
+    public static boolean isDatabaseFamily(String orginalFamilyName) {
+        boolean isDatabaseFamily = false;
+        String rootFamily = "";
+        rootFamily = orginalFamilyName != null ? orginalFamilyName.split("/")[0] : "";
+        if (rootFamily.equals("Databases")) {
+            isDatabaseFamily = true;
+        }
+        return isDatabaseFamily;
+    }
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoEventEntity.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoEventEntity.java
@@ -0,0 +1,147 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 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.core.pendo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoEventEntity {
+
+    @JsonProperty("type")
+    private String type;
+
+    @JsonProperty("event")
+    private String event;
+
+    @JsonProperty("visitorId")
+    private String visitorId;
+
+    @JsonProperty("accountId")
+    private String accountId;
+
+    @JsonProperty("timestamp")
+    private long timestamp;
+
+    @JsonProperty("properties")
+    private Object properties;
+
+    /**
+     * Getter for type.
+     * 
+     * @return the type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the type.
+     * 
+     * @param type the type to set
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * Getter for event.
+     * 
+     * @return the event
+     */
+    public String getEvent() {
+        return event;
+    }
+
+    /**
+     * Sets the event.
+     * 
+     * @param event the event to set
+     */
+    public void setEvent(String event) {
+        this.event = event;
+    }
+
+    /**
+     * Getter for visitorId.
+     * 
+     * @return the visitorId
+     */
+    public String getVisitorId() {
+        return visitorId;
+    }
+
+    /**
+     * Sets the visitorId.
+     * 
+     * @param visitorId the visitorId to set
+     */
+    public void setVisitorId(String visitorId) {
+        this.visitorId = visitorId;
+    }
+
+    /**
+     * Getter for accountId.
+     * 
+     * @return the accountId
+     */
+    public String getAccountId() {
+        return accountId;
+    }
+
+    /**
+     * Sets the accountId.
+     * 
+     * @param accountId the accountId to set
+     */
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
+    /**
+     * Getter for timestamp.
+     * 
+     * @return the timestamp
+     */
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    /**
+     * Sets the timestamp.
+     * 
+     * @param timestamp the timestamp to set
+     */
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+
+    /**
+     * Getter for properties.
+     * @return the properties
+     */
+    public Object getProperties() {
+        return properties;
+    }
+
+
+    /**
+     * Sets the properties.
+     * @param properties the properties to set
+     */
+    public void setProperties(Object properties) {
+        this.properties = properties;
+    }
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoLoginProperties.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoLoginProperties.java
@@ -0,0 +1,87 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 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.core.pendo;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoLoginProperties {
+
+    @JsonProperty("studio_version")
+    private String studioVersion;
+
+    @JsonProperty("studio_patch")
+    private String studioPatch;
+
+    @JsonProperty("enabled_features")
+    private List<String> enabledFeatures;
+
+    /**
+     * Getter for studio_version.
+     * 
+     * @return the studio_version
+     */
+    public String getStudioVersion() {
+        return studioVersion;
+    }
+
+    /**
+     * Sets the studio_version.
+     * 
+     * @param studio_version the studio_version to set
+     */
+    public void setStudioVersion(String studioVersion) {
+        this.studioVersion = studioVersion;
+    }
+
+    /**
+     * Getter for studio_patch.
+     * 
+     * @return the studio_patch
+     */
+    public String getStudioPatch() {
+        return studioPatch;
+    }
+
+    /**
+     * Sets the studio_patch.
+     * 
+     * @param studio_patch the studio_patch to set
+     */
+    public void setStudioPatch(String studioPatch) {
+        this.studioPatch = studioPatch;
+    }
+
+    /**
+     * Getter for enabled_features.
+     * 
+     * @return the enabled_features
+     */
+    public List<String> getEnabledFeatures() {
+        return enabledFeatures;
+    }
+
+    /**
+     * Sets the enabled_features.
+     * 
+     * @param enabled_features the enabled_features to set
+     */
+    public void setEnabledFeatures(List<String> enabledFeatures) {
+        this.enabledFeatures = enabledFeatures;
+    }
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackSender.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackSender.java
@@ -0,0 +1,304 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 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.core.pendo;
+
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.StatusLine;
+import org.apache.http.client.entity.EntityBuilder;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.entity.ContentType;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.apache.log4j.Level;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.utils.VersionUtils;
+import org.talend.commons.utils.network.NetworkUtil;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.context.Context;
+import org.talend.core.context.RepositoryContext;
+import org.talend.core.runtime.CoreRuntimePlugin;
+import org.talend.core.service.IRemoteService;
+import org.talend.core.service.IStudioLiteP2Service;
+import org.talend.core.ui.IInstalledPatchService;
+import org.talend.repository.model.RepositoryConstants;
+import org.talend.utils.json.JSONObject;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoTrackSender {
+    
+    private static final String PREFIX_API = "api";
+
+    private static final String PENDO_INFO = "/monitoring/pendo/info";
+
+    private static final String PENDO_TRACK = "/monitoring/pendo/track";
+
+    private static final String HEAD_AUTHORIZATION = "Authorization";
+
+    private static final String HEAD_CONTENT_TYPE = "Content-Type";
+
+    private static final String HEAD_PENDO_KEY = "x-pendo-integration-key";
+
+    private static final String FEATURE_PREFIX = "org.talend.lite.";
+
+    private static final String FEATURE_TAIL = ".feature.feature.group";
+
+    private static PendoTrackSender instance;
+
+    private static String adminUrl;
+
+    private static String apiBaseUrl;
+
+    public static PendoTrackSender getInstance() {
+        if (instance == null) {
+            instance = new PendoTrackSender();
+        }
+        if (StringUtils.isBlank(adminUrl)) {
+            adminUrl = getRepositoryContext().getFields().get(RepositoryConstants.REPOSITORY_URL);
+        }
+        return instance;
+    }
+
+    public void sendToPendo() {
+        Job job = new Job("send pendo track") {
+
+            @Override
+            protected IStatus run(IProgressMonitor monitor) {
+                try {
+                    sendTrackData();
+                } catch (Exception e) {
+                    // warning only
+                    ExceptionHandler.process(e, Level.WARN);
+                }
+                return Status.OK_STATUS;
+            }
+        };
+        job.setUser(false);
+        job.setPriority(Job.INTERACTIVE);
+        job.schedule();
+    }
+
+    public void sendTrackData() throws Exception {
+        if (!checkTokenUsed(adminUrl) || !NetworkUtil.isNetworkValid()) {
+            return;
+        }
+
+        CloseableHttpClient client = null;
+        CloseableHttpResponse response = null;
+        try {
+            String pendoInfo = getPendoInfo();
+            if (StringUtils.isBlank(pendoInfo)) {
+                throw new Exception("Pendo information is empty");
+            }
+            String pendoKey = getPendoKeyFromLicense();
+            if (StringUtils.isBlank(pendoKey)) {
+                throw new Exception("Pendo key is empty");
+            }
+            
+            client = HttpClients.createDefault();
+            String url = getBaseUrl() + PENDO_TRACK;
+            HttpPost httpPost = new HttpPost(url);
+            httpPost.setHeader(HEAD_CONTENT_TYPE, ContentType.APPLICATION_JSON.getMimeType());
+            httpPost.setHeader(HEAD_PENDO_KEY, pendoKey);
+            EntityBuilder entityBuilder = EntityBuilder.create();
+            entityBuilder.setText(generateTrackData(pendoInfo)).setContentType(ContentType.APPLICATION_JSON);
+            HttpEntity entity = entityBuilder.build();
+            httpPost.setEntity(entity);
+            response = client.execute(httpPost, HttpClientContext.create());
+            StatusLine statusLine = response.getStatusLine();
+            String responseStr = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+            if (HttpURLConnection.HTTP_OK != statusLine.getStatusCode()) {
+                throw new Exception(statusLine.toString() + ", server message: [" + responseStr + "]");
+            }
+        } finally {
+            if (response != null) {
+                try {
+                    response.close();
+                } catch (Throwable e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+            if (client != null) {
+                try {
+                    client.close();
+                } catch (Throwable e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+        }
+    }
+
+    // TODO maybe we will have more event handler later
+    private String generateTrackData(String pendoInfo) throws Exception {
+        JSONObject infoJson = new JSONObject(pendoInfo);
+        String visitorId = ((JSONObject) infoJson.get("visitor")).getString("id");
+        String accountId = ((JSONObject) infoJson.get("account")).getString("id");
+
+        String studioPatch = null;
+        Date date = new Date();
+        IInstalledPatchService installedPatchService = IInstalledPatchService.get();
+        if (installedPatchService != null) {
+            studioPatch = installedPatchService.getLatestInstalledPatchVersion();
+        }
+        List<String> enabledFeatures = new ArrayList<String>();
+        IStudioLiteP2Service studioLiteP2Service = IStudioLiteP2Service.get();
+        if (studioLiteP2Service != null) {
+            List<String> enabledFeaturesList = studioLiteP2Service.getCurrentProjectEnabledFeatures();
+            enabledFeaturesList.stream().forEach(feature -> {
+                String result = feature;
+                if (result.startsWith(FEATURE_PREFIX)) {
+                    result = result.substring(FEATURE_PREFIX.toCharArray().length);
+                }
+                if (result.endsWith(FEATURE_TAIL)) {
+                    result = result.substring(0, result.lastIndexOf(FEATURE_TAIL));
+                }
+                enabledFeatures.add(result);
+            });
+        }
+        PendoLoginProperties loginEvent = new PendoLoginProperties();
+        loginEvent.setStudioVersion(VersionUtils.getInternalMajorVersion());
+        loginEvent.setStudioPatch(studioPatch);
+        loginEvent.setEnabledFeatures(enabledFeatures);
+
+        PendoEventEntity entity = new PendoEventEntity();
+        entity.setType("track");
+        entity.setEvent("Project Login");
+        entity.setVisitorId(visitorId);
+        entity.setAccountId(accountId);
+        entity.setTimestamp(date.getTime());
+        entity.setProperties(loginEvent);
+
+        ObjectMapper mapper = new ObjectMapper();
+        String content = mapper.writeValueAsString(entity);
+        return content;
+    }
+
+    private String getPendoInfo() throws Exception {
+        CloseableHttpClient client = null;
+        CloseableHttpResponse response = null;
+        try {
+            client = HttpClients.createDefault();
+            String url = getBaseUrl() + PENDO_INFO;
+
+            HttpGet httpGet = new HttpGet(url);
+            httpGet.setHeader(HEAD_AUTHORIZATION, "Bearer " + getToken());
+            response = client.execute(httpGet, HttpClientContext.create());
+            StatusLine statusLine = response.getStatusLine();
+            String responseStr = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+            if (HttpURLConnection.HTTP_OK != statusLine.getStatusCode()) {
+                throw new Exception(statusLine.toString() + ", server message: [" + responseStr + "]");
+            }
+            return responseStr;
+        } finally {
+            if (response != null) {
+                try {
+                    response.close();
+                } catch (Throwable e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+            if (client != null) {
+                try {
+                    client.close();
+                } catch (Throwable e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+        }
+    }
+
+    private boolean checkTokenUsed(String adminUrl) throws Exception {
+        if (StringUtils.isNotBlank(adminUrl) && GlobalServiceRegister.getDefault().isServiceRegistered(IRemoteService.class)) {
+            IRemoteService service = GlobalServiceRegister.getDefault().getService(IRemoteService.class);
+            return service.isTokenUsed(adminUrl);
+        }
+        return false;
+    }
+
+    public String getBaseUrl() throws Exception {
+        if (StringUtils.isNotBlank(apiBaseUrl)) {
+            return apiBaseUrl;
+        }
+
+        try {
+            URL url = new URL(adminUrl);
+            // tmc.int.cloud.talend.com
+            String authority = url.getAuthority();
+            String regex = "(\\w*\\-*\\w*\\.?){2}\\.(talend.com)";
+            Pattern  pattern= Pattern.compile(regex);
+            Matcher match = pattern.matcher(authority);
+            if (match.find()) {
+                // int.cloud.talend.com
+                authority = match.group(0);
+                URL apiURL = new URL(url.getProtocol(), PREFIX_API + "." + authority, "");
+                // https://api.int.cloud.talend.com
+                apiBaseUrl = apiURL.toString();
+            } else {
+                throw new Exception("Can't match pendo url from " + adminUrl);
+            }
+        } catch (MalformedURLException e) {
+            throw new Exception("Invalid url " + adminUrl, e.getCause());
+        }
+
+        return apiBaseUrl;
+    }
+
+    private String getToken() {
+        return getRepositoryContext().getClearPassword();
+    }
+
+    private String getPendoKeyFromLicense() throws Exception {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRemoteService.class)) {
+            IRemoteService service = GlobalServiceRegister.getDefault().getService(IRemoteService.class);
+            return service.getPendoKeyFromLicense();
+        }
+        return null;
+    }
+
+    private static RepositoryContext getRepositoryContext() {
+        RepositoryContext repositoryContext = (RepositoryContext) CoreRuntimePlugin.getInstance().getContext()
+                .getProperty(Context.REPOSITORY_CONTEXT_KEY);
+        return repositoryContext;
+    }
+
+    public void setAdminUrl(String adminUrl) {
+        PendoTrackSender.adminUrl = adminUrl;
+    }
+
+    public void setApiBaseUrl(String apiBaseUrl) {
+        PendoTrackSender.apiBaseUrl = apiBaseUrl;
+    }
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_fr.properties
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_fr.properties
@@ -1,3 +1,4 @@
+
 AbstractBrandingService_job_license_header_content=Copyright (c) 2005-2010, Talend SA.\n//\n// Ce code source a \u00E9t\u00E9 automatiquement g\u00E9n\u00E9r\u00E9 par_\n\n// (CodeGenerator version{0}\n// Vous pouvez trouver plus d'informations \u00E0 propos des produits Talend sur https://www.talend.com/\nfr/. {1}// Vous pouvez distribuer ce code suivant les termes de la licence\nGNU LGPL\n// http://www.gnu.org/licenses/lgpl.\nhtml\n).
 AbstractBrandingService.routines_license_header_content2014=Copyright (c) 2006-2014, Talend SA.\n//\n// Ce code source a \u00E9t\u00E9 automatiquement g\u00E9n\u00E9r\u00E9 par_{0}\n// (CodeGenerator version {1}\n// Vous pouvez trouver plus d'informations \u00E0 propos des produits Talend sur https://www.talend.com/fr/.\n// Vous pouvez distribuer ce code suivant les termes de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).
 AbstractComponentsProvider.folderNotExist=Le dossier {0} n'existe pas.
@@ -98,7 +99,6 @@ EComponentCategory_properties=Propri\u00E9t\u00E9s
 EComponentCategory_rulerAndGrid=Rulers & Grid
 EComponentCategory_sqlTemplate=Mod\u00E8le SQL
 EComponentCategory_statsAndLogs=Stats & Logs
-EComponentCategory_svnHistory=Historique SVN
 EComponentCategory_gitHistory=Historique Git
 EComponentCategory_technical=Technique
 EComponentCategory_version=Version
@@ -427,7 +427,6 @@ repository.service=Services
 repository.query=Requ\u00EAte
 repository.CDC=CDC
 repository.gitroot=GIT
-repository.svnroot=SVN
 repository.referencedProjects=Projet r\u00E9f\u00E9renc\u00E9
 repository.beans=Beans
 repository.snippets=Snippets
@@ -636,3 +635,22 @@ DynamicPlugin.addExtension.empty=Le champ ExtensionPoint ou ID est vide.
 BigDataBasicUtil.loadDynamicDistribution.IDynamicDistributionManager.notFound=Instance de {0} introuvable
 TalendLibsServerManager.connectUserLibraryFailureMessage=\u00C9chec de la connexion au r\u00E9f\u00E9rentiel d'artefacts des bilioth\u00E8ques utilisateurs configur\u00E9 en tant qu'administrateur\u00A0: Connexion \u00E0 {0} refus\u00E9e.
 TalendLibsServerManager.cannotGetUserLibraryServer=Impossible d'obtenir le serveur de la biblioth\u00E8que utilisateur depuis l'administrateur distant
+MigrationReportAccessDialog.title=Migration des \u00E9l\u00E9ments du projet
+MigrationReportAccessDialog.migrateSuccess=Les \u00E9l\u00E9ments du projet ont bien \u00E9t\u00E9 migr\u00E9s.
+MigrationReportAccessDialog.completeReportAvailable=Consulter le rapport
+MigrationReportAccessDialog.accessReport=ici
+MigrationReportAccessDialog.provideAnalysisTool=Vous pouvez ex\u00E9cuter une analyse de projet pour analyser votre projet migr\u00E9. Cet outil exp\u00E9rimental va g\u00E9n\u00E9rer un rapport contenant\u00A0:
+MigrationReportAccessDialog.listOfProblems=- la liste des \u00E9l\u00E9ments \u00E0 corriger manuellement,
+MigrationReportAccessDialog.listItems=- la liste des \u00E9l\u00E9ments \u00E0 v\u00E9rifier.
+MigrationReportAccessDialog.analysisToolCanTrigger=Note : Vous pouvez \u00E9galement g\u00E9n\u00E9rer un rapport d'analyse depuis la vue Param\u00E8tres du projet > Audit.
+MigrationReportAccessDialog.doNotShowAnymore=Ne plus afficher
+MigrationReportAccessDialog.runAnalysisButton=Ex\u00E9cuter l'analyse
+MigrationReportAccessDialog.notNowButton=Pas maintenant
+ItemAnalysisReportManager.Information.title=Informations
+ItemAnalysisReportManager.Information.message=Analyse du projet termin\u00E9e. Aucun enregistrement d'exception g\u00E9n\u00E9r\u00E9.
+ItemAnalysisReportManager.Warning.title=Avertissement
+ItemAnalysisReportManager.Warning.message=Impossible d'ex\u00E9cuter une analyse. Attendez la fin de l'analyse courante et r\u00E9essayez.
+AnalysisReportAccessDialog.shellTitle=Analyse du projet
+AnalysisReportAccessDialog.generateSuccess=Analyse du projet termin\u00E9e.
+AnalysisReportAccessDialog.completeReportAvailable=Consulter le rapport
+AnalysisReportAccessDialog.accessReport=ici
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_ja.properties
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_ja.properties
@@ -1,5 +1,6 @@
-AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2010, Talend Inc.\n//\n//\u3053\u306E\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306F_{0}\n\u306B\u3088\u3063\u3066\u81EA\u52D5\u7684\u306B\u751F\u6210\u3055\u308C\u307E\u3057\u305F// JobDesigner (CodeGenerator\u30D0\u30FC\u30B8\u30E7\u30F3{1})\n// Talend\u88FD\u54C1\u306B\u3064\u3044\u3066\u8A73\u3057\u304F\u306F\u3001www.talend.com\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002\n//\u3053\u306E\u30B3\u30FC\u30C9\u306FGNU LGPL\u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u6761\u4EF6\u306B\u57FA\u3065\u3044\u3066\u914D\u5E03\u3067\u304D\u307E\u3059\n// http://www.gnu.org/licenses/lgpl.html)\u3002\n//\n// ============================================================================
-AbstractBrandingService.routines_license_header_content2014=Copyright (c) 2006-2014, Talend Inc.\n//\n//\u3053\u306E\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306F_{0}\n\u306B\u3088\u3063\u3066\u81EA\u52D5\u7684\u306B\u751F\u6210\u3055\u308C\u307E\u3057\u305F// CodeGenerator\u30D0\u30FC\u30B8\u30E7\u30F3{1}\n// Talend\u88FD\u54C1\u306B\u95A2\u3059\u308B\u8A73\u7D30\u306Fwww.talend.com\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002\n//\u3053\u306E\u30B3\u30FC\u30C9\u306FGNU LGPL\u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u6761\u4EF6\u306B\u57FA\u3065\u3044\u3066\u914D\u5E03\u304C\u53EF\u80FD\u3067\u3059\u3002\n// http://www.gnu.org/licenses/lgpl.html)
+
+AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2010, Talend Inc.\n//\n//\u3053\u306E\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306F_{0}\u306B\u3088\u3063\u3066\u81EA\u52D5\u7684\u306B\u751F\u6210\u3055\u308C\u307E\u3057\u305F\n// JobDesigner (CodeGenerator\u30D0\u30FC\u30B8\u30E7\u30F3{1})\n// Talend\u88FD\u54C1\u306B\u3064\u3044\u3066\u8A73\u3057\u304F\u306F\u3001www.talend.com\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002\n//\u3053\u306E\u30B3\u30FC\u30C9\u306FGNU LGPL\u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u6761\u4EF6\u306B\u57FA\u3065\u3044\u3066\u914D\u5E03\u3067\u304D\u307E\u3059\n// http://www.gnu.org/licenses/lgpl.html)\u3002\n//\n// ============================================================================
+AbstractBrandingService.routines_license_header_content2014=Copyright (c) 2006-2014, Talend Inc.\n//\n//\u3053\u306E\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306F_{0}\u306B\u3088\u3063\u3066\u81EA\u52D5\u7684\u306B\u751F\u6210\u3055\u308C\u307E\u3057\u305F\n// CodeGenerator\u30D0\u30FC\u30B8\u30E7\u30F3{1}\n// Talend\u88FD\u54C1\u306B\u95A2\u3059\u308B\u8A73\u7D30\u306Fwww.talend.com\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002\n//\u3053\u306E\u30B3\u30FC\u30C9\u306FGNU LGPL\u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u6761\u4EF6\u306B\u57FA\u3065\u3044\u3066\u914D\u5E03\u304C\u53EF\u80FD\u3067\u3059\u3002\n// http://www.gnu.org/licenses/lgpl.html)
 AbstractComponentsProvider.folderNotExist=\u30D5\u30A9\u30EB\u30C0\u30FC{0}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
 AbstractItemMigrationTask.taskFailed=\u30A2\u30A4\u30C6\u30E0{1}\u4E0A\u306E\u79FB\u884C\u30BF\u30B9\u30AF{0}\u304C\u5931\u6557\u3057\u307E\u3057\u305F
 AdvancedSocketFactory.failedInitial=\u30A8\u30E9\u30FC : \u521D\u671F\u5316\u306B\u5931\u6557\u3057\u307E\u3057\u305F :
@@ -15,7 +16,7 @@ ColorsCodeViewerPreferencePage.Literal2Color=\u30EA\u30C6\u30E9\u30EB2\u8272
 ColorsCodeViewerPreferencePage.MarkupColor=\u30DE\u30FC\u30AF\u30A2\u30C3\u30D7\u8272
 ColorsCodeViewerPreferencePage.OperatorColor=\u30AA\u30DA\u30EC\u30FC\u30BF\u30FC\u8272
 ColorsCodeViewerPreferencePage.defaultColor=\u30C7\u30D5\u30A9\u30EB\u30C8\u8272
-ColorsCodeViewerPreferencePage.fieldTip=&Bold
+ColorsCodeViewerPreferencePage.fieldTip=\u592A\u5B57(&B)
 ColorsCodeViewerPreferencePage.keyword1Color=\u30AD\u30FC\u30EF\u30FC\u30C91\u8272
 ColorsCodeViewerPreferencePage.keyword2Color=\u30AD\u30FC\u30EF\u30FC\u30C92\u8272
 ColorsCodeViewerPreferencePage.keyword3Color=\u30AD\u30FC\u30EF\u30FC\u30C93\u8272
@@ -76,11 +77,11 @@ CorePreferencePage.componentDefaultFileDirectory=\u30B3\u30F3\u30DD\u30FC\u30CD\
 CorePreferencePage.groupBySource=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u5185\u3067[\u30BD\u30FC\u30B9\u3054\u3068\u306B\u30B0\u30EB\u30FC\u30D7\u30A1\u5316]
 CorePreferencePage.iReportPath=iReport\u30D1\u30B9
 CorePreferencePage.alwaysWelcome=\u8D77\u52D5\u6642\u306B\u30A6\u30A7\u30EB\u30AB\u30E0\u30D3\u30E5\u30FC\u3092\u5E38\u306B\u8868\u793A
-CorePreferencePage.javaInterpreter=&Java interpreter
+CorePreferencePage.javaInterpreter=Java\u30A4\u30F3\u30BF\u30FC\u30D7\u30EA\u30BF\u30FC(&J)
 CorePreferencePage.perlInterpreter=Perl\u30A4\u30F3\u30BF\u30FC\u30D7\u30EA\u30BF\u30FC
 CorePreferencePage.previewLimit=\u30D7\u30EC\u30D3\u30E5\u30FC\u5236\u9650
 CorePreferencePage.runInMultiThread=\u30DE\u30EB\u30C1\u30B9\u30EC\u30C3\u30C9\u5B9F\u884C(\u30B8\u30E7\u30D6\u751F\u6210\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024)
-CorePreferencePage.temporaryFiles=&\u4E00\u6642\u30D5\u30A1\u30A4\u30EB
+CorePreferencePage.temporaryFiles=\u4E00\u6642\u30D5\u30A1\u30A4\u30EB(&T)
 DbTableSelectorDialog.textContent=\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u9078\u629E
 ECodeLanguage.unknowLanguage=\u672A\u77E5\u306E\u8A00\u8A9E
 EComponentCategory_advanceSetting=\u8A73\u7D30\u8A2D\u5B9A
@@ -95,10 +96,9 @@ EComponentCategory_extra=\u8FFD\u52A0
 EComponentCategory_logs=\u30ED\u30B0
 EComponentCategory_main=\u30E1\u30A4\u30F3
 EComponentCategory_properties=\u30D7\u30ED\u30D1\u30C6\u30A3
-EComponentCategory_rulerAndGrid=Rulers & Grid
+EComponentCategory_rulerAndGrid=\u30EB\u30FC\u30E9\u30FC\u3068\u30B0\u30EA\u30C3\u30C9
 EComponentCategory_sqlTemplate=SQL\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
 EComponentCategory_statsAndLogs=\u7D71\u8A08\u3068\u30ED\u30B0
-EComponentCategory_svnHistory=SVN\u5C65\u6B74
 EComponentCategory_gitHistory=GIT\u5C65\u6B74
 EComponentCategory_technical=\u30C6\u30AF\u30CB\u30AB\u30EB
 EComponentCategory_version=\u30D0\u30FC\u30B8\u30E7\u30F3
@@ -150,7 +150,7 @@ EConnectionType.endblock=\u30EB\u30FC\u30C8
 EMetadataEncoding.Arabic=\u30A2\u30E9\u30D3\u30A2\u8A9E
 EMetadataEncoding.Big5=Big5(\u7E41\u4F53\u5B57)
 EMetadataEncoding.Cyrillic=\u30AD\u30EA\u30EB\u8A9E
-EMetadataEncoding.EUC_CN=\u7C21\u4F53\u5B57\u4E2D\u56FD\u8A9E\uFF08Unix\u30B3\u30FC\u30C9CN\u62E1\u5F35\uFF09
+EMetadataEncoding.EUC_CN=\u7C21\u4F53\u5B57\u4E2D\u56FD\u8A9E(Unix\u30B3\u30FC\u30C9CN\u62E1\u5F35)
 EMetadataEncoding.GB18030=\u4E2D\u56FD\u8A9E\u56FD\u5BB6\u57FA\u6E96
 EMetadataEncoding.GB2312=\u4E2D\u56FD\u8A9E
 EMetadataEncoding.Greek=\u30AE\u30EA\u30B7\u30E3\u8A9E
@@ -233,7 +233,7 @@ MetadataTableEditorView.PrecisionTitle=\u7CBE\u5EA6
 MetadataTableEditorView.TypleTitle=\u30BF\u30A4\u30D7
 MetadataTalendType.dbIdNotFound=DBMS Id : {0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093!
 MetadataTalendType.DBMSNotSetted=\u672A\u8A2D\u5B9A\u306EDBMS
-MetadataTalendTypeEditor.button.edit=E&dit
+MetadataTalendTypeEditor.button.edit=\u7DE8\u96C6(&D)
 MetadataTalendTypeEditor.button.export=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8(&X)
 MetadataTalendTypeEditor.button.import=\u30A4\u30F3\u30DD\u30FC\u30C8(&M)
 MetadataTalendTypeEditor.column1.Name=\u30E1\u30BF\u30C7\u30FC\u30BF\u30DE\u30C3\u30D4\u30F3\u30B0\u30D5\u30A1\u30A4\u30EB
@@ -241,7 +241,7 @@ MetadataTalendTypeEditor.editMappingDialog.title=\u30DE\u30C3\u30D4\u30F3\u30B0\
 MetadataTalendTypeEditor.error.message=\u30A8\u30E9\u30FC\u30E1\u30C3\u30BB\u30FC\u30B8
 MetadataTalendTypeEditor.fileIsImported=\u3053\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u65E2\u306B\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\u3002
 MetadataTalendTypeEditor.fileIsInvalid=\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u304C\u7121\u52B9\u3067\u3059\u3002
-MetadataTalendTypeEditor.fileNameStartRule=\u30D5\u30A1\u30A4\u30EB\u540D\u306F 'mapping_' \u3067\u59CB\u3081\u3066\u304F\u3060\u3055\u3044.
+MetadataTalendTypeEditor.fileNameStartRule=\u30D5\u30A1\u30A4\u30EB\u540D\u306F 'mapping_' \u3067\u59CB\u3081\u3066\u304F\u3060\u3055\u3044\u3002
 MetadataTool.errorMessage=\u73FE\u5728\u306E\u6587\u5B57\u3092\u5165\u529B\u3067\u304D\u307E\u305B\u3093\u3002
 MetadataTool.invalid=\u7121\u52B9\u306A\u5024
 MetadataTool.invalidChar=\u7121\u52B9\u306A\u6587\u5B57
@@ -270,7 +270,7 @@ PerlDynamicProposalUtil.autoConvert= would be automatically converted to {0}->[i
 PerlGlobalVariableProposal.Description=\u8AAC\u660E: {0}
 PerlGlobalVariableProposal.VariableName=\n\n\u5909\u6570\u540D: {1}
 PerspectiveMenuManager.dummy=\u30C0\u30DF\u30FC
-PerspectiveMenuManager.perspectiveLabel=&Perspective
+PerspectiveMenuManager.perspectiveLabel=\u30D1\u30FC\u30B9\u30DA\u30AF\u30C6\u30A3\u30D6 (&P)
 ProcessorUtilities.finalizeBuild=\u30D3\u30EB\u30C9\u3092\u7D42\u4E86\u4E2D...
 ProcessorUtilities.generatingJob=\u30B8\u30E7\u30D6\u3092\u751F\u6210\u4E2D...
 ProcessorUtilities.loadingJob=\u30B8\u30E7\u30D6\u3092\u30ED\u30FC\u30C9\u4E2D...
@@ -365,7 +365,7 @@ TalendDataCollectorUploadingPreferencePage_Days=\u65E5
 TalendTabbedPropertyComposite.compactButton.toolTip=\u30B3\u30F3\u30D1\u30AF\u30C8\u30D3\u30E5\u30FC
 TalendTabbedPropertyComposite.tableButton.toolTip=\u30C6\u30FC\u30D6\u30EB\u30D3\u30E5\u30FC
 TalendType.TypeName=\u30BF\u30A4\u30D7\u540D{0}
-VariableItemEditor.insertVariable=Insert &Variable Placeholder...
+VariableItemEditor.insertVariable=\u633F\u5165\u3068\u5909\u6570\u30D7\u30EC\u30FC\u30B9\u30DB\u30EB\u30C0\u30FC(&V)...
 VariableItemEditor.name=\u540D\u524D
 VariableItemEditor.new=\u65B0\u898F
 VariableItemEditor.remove=\u524A\u9664
@@ -427,7 +427,6 @@ repository.service=\u30B5\u30FC\u30D3\u30B9
 repository.query=\u30AF\u30A8\u30EA\u30FC
 repository.CDC=CDC
 repository.gitroot=GIT
-repository.svnroot=SVN
 repository.referencedProjects=\u53C2\u7167\u3055\u308C\u308B\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
 repository.beans=Beans
 repository.snippets=\u30B9\u30CB\u30DA\u30C3\u30C8
@@ -534,13 +533,13 @@ ModuleListCellEditor.selectLabel=\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u9078\u629
 ModuleListCellEditor.title=\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u9078\u629E
 MultiStringSelectionDialog.nameEmpty=\u540D\u524D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 PromptDialog.stringTip=\u5165\u529B\u30C6\u30AD\u30B9\u30C8\u3092\u4E00\u91CD\u5F15\u7528\u7B26\u3067\u56F2\u3080\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-ApplicationActionBarAdvisor.menuFileLabel=&\u30D5\u30A1\u30A4\u30EB
-ApplicationActionBarAdvisor.menuEditLabel=&\u7DE8\u96C6
-ApplicationActionBarAdvisor.navigateLabel=&\u30CA\u30D3\u30B2\u30FC\u30C8
-ApplicationActionBarAdvisor.gotoLabel=&Go to
-ApplicationActionBarAdvisor.projectLabel=&Project
-ApplicationActionBarAdvisor.menuWindowLabel=&Window
-ApplicationActionBarAdvisor.menuHelpLabel=&\u30D8\u30EB\u30D7
+ApplicationActionBarAdvisor.menuFileLabel=\u30D5\u30A1\u30A4\u30EB(&F)
+ApplicationActionBarAdvisor.menuEditLabel=\u7DE8\u96C6(&E)
+ApplicationActionBarAdvisor.navigateLabel=\u30CA\u30D3\u30B2\u30FC\u30C8(&N)
+ApplicationActionBarAdvisor.gotoLabel=\u79FB\u52D5(&G)
+ApplicationActionBarAdvisor.projectLabel=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8(&P)
+ApplicationActionBarAdvisor.menuWindowLabel=\u30A6\u30A3\u30F3\u30C9\u30A6(&W)
+ApplicationActionBarAdvisor.menuHelpLabel=\u30D8\u30EB\u30D7(&H)
 BusinessAppearanceComposite.textAlignmentGroup=\u30C6\u30AD\u30B9\u30C8\u306E\u914D\u7F6E
 BusinessAppearanceComposite.textAlignment.horizontal=\u6C34\u5E73
 BusinessAppearanceComposite.textAlignment.vertical=\u5782\u76F4
@@ -595,7 +594,7 @@ HadoopVersionDialog.distribution=\u30C7\u30A3\u30B9\u30C8\u30EA\u30D3\u30E5\u30F
 HadoopVersionDialog.distribution.tooltip=Hadoop\u30C7\u30A3\u30B9\u30C8\u30EA\u30D3\u30E5\u30FC\u30B7\u30E7\u30F3\u3092\u8A2D\u5B9A
 HadoopVersionDialog.version=\u30D0\u30FC\u30B8\u30E7\u30F3:
 HadoopVersionDialog.version.tooltip=\u30C7\u30A3\u30B9\u30C8\u30EA\u30D3\u30E5\u30FC\u30B7\u30E7\u30F3\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8A2D\u5B9A
-HadoopVersionDialog.browseBtn=&\u53C2\u7167...
+HadoopVersionDialog.browseBtn=\u53C2\u7167(&R)...
 HadoopVersionDialog.confirmMsg=\u73FE\u5728\u306E\u30AB\u30B9\u30BF\u30E0\u8A2D\u5B9A\u304C\u7F6E\u63DB\u3055\u308C\u307E\u3059\u3002\u7D9A\u884C\u3057\u307E\u3059\u304B?
 HadoopCustomLibrariesUtil.cannotCreate={0}\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
 HadoopCustomLibrariesUtil.importFailed=\u30AB\u30B9\u30BF\u30E0\u5B9A\u7FA9\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
@@ -636,3 +635,22 @@ DynamicPlugin.addExtension.empty=ExtensionPoint\u307E\u305F\u306FID\u304C\u7A7A\
 BigDataBasicUtil.loadDynamicDistribution.IDynamicDistributionManager.notFound={0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 TalendLibsServerManager.connectUserLibraryFailureMessage=\u7BA1\u7406\u8005\u30E2\u30FC\u30C9\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304C\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3002{0}\u3078\u306E\u63A5\u7D9A\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F
 TalendLibsServerManager.cannotGetUserLibraryServer=\u30EA\u30E2\u30FC\u30C8\u7BA1\u7406\u8005\u304B\u3089\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30B5\u30FC\u30D0\u30FC\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
+MigrationReportAccessDialog.title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30A2\u30A4\u30C6\u30E0\u306E\u79FB\u884C
+MigrationReportAccessDialog.migrateSuccess=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30A2\u30A4\u30C6\u30E0\u304C\u6B63\u3057\u304F\u79FB\u884C\u3055\u308C\u307E\u3057\u305F\u3002
+MigrationReportAccessDialog.completeReportAvailable=\u30EC\u30DD\u30FC\u30C8\u3092\u30C1\u30A7\u30C3\u30AF
+MigrationReportAccessDialog.accessReport=\u3053\u3061\u3089
+MigrationReportAccessDialog.provideAnalysisTool=\u4ECA\u3059\u3050\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790\u3092\u5B9F\u884C\u3057\u3066\u3001\u79FB\u884C\u3055\u308C\u305F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5206\u6790\u3067\u304D\u307E\u3059\u3002\u3053\u306E\u8A66\u9A13\u7684\u306A\u30C4\u30FC\u30EB\u306B\u3088\u3063\u3066\u3001\u4EE5\u4E0B\u304C\u542B\u307E\u308C\u308B\u30EC\u30DD\u30FC\u30C8\u304C\u751F\u6210\u3055\u308C\u307E\u3059:
+MigrationReportAccessDialog.listOfProblems=- \u624B\u52D5\u3067\u4FEE\u6B63\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u306E\u30EA\u30B9\u30C8\u3002
+MigrationReportAccessDialog.listItems=- \u30C1\u30A7\u30C3\u30AF\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u306E\u30EA\u30B9\u30C8\u3002
+MigrationReportAccessDialog.analysisToolCanTrigger=\u6CE8: [\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u8A2D\u5B9A] > [\u76E3\u67FB\u30D3\u30E5\u30FC]\u304B\u3089\u3082\u5206\u6790\u30EC\u30DD\u30FC\u30C8\u3092\u751F\u6210\u3067\u304D\u307E\u3059\u3002
+MigrationReportAccessDialog.doNotShowAnymore=\u4EE5\u5F8C\u8868\u793A\u3057\u306A\u3044
+MigrationReportAccessDialog.runAnalysisButton=\u5B9F\u884C
+MigrationReportAccessDialog.notNowButton=\u5F8C\u3067
+ItemAnalysisReportManager.Information.title=\u60C5\u5831
+ItemAnalysisReportManager.Information.message=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790\u304C\u6B63\u3057\u304F\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002\u4F8B\u5916\u30EC\u30B3\u30FC\u30C9\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+ItemAnalysisReportManager.Warning.title=\u8B66\u544A
+ItemAnalysisReportManager.Warning.message=\u65B0\u3057\u3044\u5206\u6790\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3002\u73FE\u5728\u306E\u5206\u6790\u304C\u5B8C\u4E86\u3057\u3066\u304B\u3089\u3001\u3082\u3046\u4E00\u5EA6\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+AnalysisReportAccessDialog.shellTitle=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790
+AnalysisReportAccessDialog.generateSuccess=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790\u304C\u6B63\u3057\u304F\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002
+AnalysisReportAccessDialog.completeReportAvailable=\u30EC\u30DD\u30FC\u30C8\u3092\u30C1\u30A7\u30C3\u30AF
+AnalysisReportAccessDialog.accessReport=\u3053\u3061\u3089
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_zh_CN.properties
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_zh_CN.properties
@@ -1,5 +1,6 @@
-AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// \u7248\u6743\u6240\u6709 (c) 2005-2010, Talend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0}\n\u81EA\u52A8\u751F\u6210// / JobDesigner (CodeGenerator \u7248\u672C {1})\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3\u6709\u5173 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002.\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
-AbstractBrandingService.routines_license_header_content2014=\u7248\u6743\u6240\u6709 (c) 2006-2015, Talend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0}\n \u81EA\u52A8\u751F\u6210// CodeGenerator \u7248\u672C {1}\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3\u6709\u5173 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002
+
+AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// \u7248\u6743\u6240\u6709 (c) 2005-2010, Talend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0}\u81EA\u52A8\u751F\u6210\n// / JobDesigner (CodeGenerator \u7248\u672C {1})\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3\u6709\u5173 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002.\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
+AbstractBrandingService.routines_license_header_content2014=\u7248\u6743\u6240\u6709 (c) 2006-2015, Talend Inc.\n//\n// \u6B64\u6E90\u4EE3\u7801\u5DF2\u7531_{0}\u81EA\u52A8\u751F\u6210 \n// CodeGenerator \u7248\u672C {1}\n// \u60A8\u53EF\u4EE5\u8BBF\u95EE www.talend.com \u4E86\u89E3\u6709\u5173 Talend \u4EA7\u54C1\u7684\u66F4\u591A\u4FE1\u606F\u3002\n// \u60A8\u53EF\u4EE5\u6839\u636E GNU LGPL \u8BB8\u53EF\u8BC1\u6761\u6B3E\u5206\u53D1\u6B64\u4EE3\u7801\n// http://www.gnu.org/licenses/lgpl.html)\u3002
 AbstractComponentsProvider.folderNotExist=\u6587\u4EF6\u5939 {0} \u4E0D\u5B58\u5728\u3002
 AbstractItemMigrationTask.taskFailed=\u8FC1\u79FB\u4EFB\u52A1 {0} \u5728\u8FC1\u79FB\u9879\u76EE {1} \u65F6\u5931\u8D25
 AdvancedSocketFactory.failedInitial=\u9519\u8BEF\uFF1A\u65E0\u6CD5\u521D\u59CB\u5316\uFF1A
@@ -98,7 +99,6 @@ EComponentCategory_properties=\u5C5E\u6027
 EComponentCategory_rulerAndGrid=\u6807\u5C3A\u548C\u7F51\u683C
 EComponentCategory_sqlTemplate=SQL \u6A21\u677F
 EComponentCategory_statsAndLogs=\u7EDF\u8BA1\u53CA\u65E5\u5FD7
-EComponentCategory_svnHistory=SVN \u5386\u53F2\u8BB0\u5F55
 EComponentCategory_gitHistory=Git \u5386\u53F2\u8BB0\u5F55
 EComponentCategory_technical=\u6280\u672F
 EComponentCategory_version=\u7248\u672C
@@ -427,7 +427,6 @@ repository.service=\u670D\u52A1
 repository.query=\u67E5\u8BE2
 repository.CDC=CDC
 repository.gitroot=GIT
-repository.svnroot=SVN
 repository.referencedProjects=\u5F15\u7528\u7684\u5DE5\u7A0B
 repository.beans=Beans
 repository.snippets=\u7247\u65AD
@@ -564,7 +563,7 @@ RepositoryContentProvider.repositoryLabel.Queries=\u67E5\u8BE2
 RepositoryContentProvider.repositoryLabel.sapBapi=SAP Bapi
 RepositoryContentProvider.repositoryLabel.sapBapi.input=\u8F93\u5165
 RepositoryContentProvider.repositoryLabel.sapBapi.output=\u8F93\u51FA
-RepositoryContentProvider.repositoryLabel.sapContentExtractor=SAP BI Content Extractor
+RepositoryContentProvider.repositoryLabel.sapContentExtractor=SAP BI \u5185\u5BB9\u63D0\u53D6\u5668
 RepositoryContentProvider.repositoryLabel.sapTable=SAP \u8868
 RepositoryContentProvider.repositoryLabel.sapDataSource=SAP DataSource
 RepositoryContentProvider.repositoryLabel.sapDSO=SAP DSO
@@ -636,3 +635,22 @@ DynamicPlugin.addExtension.empty=ExtensionPoint \u6216 Id \u4E3A\u7A7A\uFF01
 BigDataBasicUtil.loadDynamicDistribution.IDynamicDistributionManager.notFound=\u672A\u627E\u5230 {0} \u7684\u5B9E\u4F8B
 TalendLibsServerManager.connectUserLibraryFailureMessage=\u65E0\u6CD5\u8FDE\u63A5 Administrator \u4E2D\u7684\u7528\u6237\u5E93\u6784\u4EF6\u5E93\u96C6\uFF1A\u5230 {0} \u7684\u8FDE\u63A5\u88AB\u62D2
 TalendLibsServerManager.cannotGetUserLibraryServer=\u65E0\u6CD5\u4ECE\u8FDC\u7A0B\u7BA1\u7406\u5458\u83B7\u53D6\u7528\u6237\u5E93\u670D\u52A1\u5668
+MigrationReportAccessDialog.title=\u5DE5\u7A0B\u9879\u76EE\u8FC1\u79FB
+MigrationReportAccessDialog.migrateSuccess=\u5DE5\u7A0B\u9879\u76EE\u8FC1\u79FB\u6210\u529F\u3002
+MigrationReportAccessDialog.completeReportAvailable=\u8BF7\u68C0\u67E5\u62A5\u544A
+MigrationReportAccessDialog.accessReport=\u6B64\u5904
+MigrationReportAccessDialog.provideAnalysisTool=\u60A8\u73B0\u5728\u53EF\u4EE5\u8FD0\u884C\u5DE5\u7A0B\u5206\u6790\u4EE5\u5206\u6790\u8FC1\u79FB\u7684\u5DE5\u7A0B\u3002\u6B64\u5B9E\u9A8C\u6027\u5DE5\u5177\u5C06\u751F\u6210\u4E00\u4EFD\u5206\u6790\u62A5\u544A\uFF0C\u5176\u4E2D\u5305\u542B:
+MigrationReportAccessDialog.listOfProblems=- \u9700\u8981\u624B\u52A8\u4FEE\u590D\u7684\u9879\u76EE\u6E05\u5355\u3002
+MigrationReportAccessDialog.listItems=- \u9700\u8981\u68C0\u67E5\u7684\u9879\u76EE\u6E05\u5355\u3002
+MigrationReportAccessDialog.analysisToolCanTrigger=\u6CE8\uFF1A\u60A8\u8FD8\u53EF\u4EE5\u5728\u5DE5\u7A0B\u8BBE\u7F6E > \u5BA1\u8BA1\u9875\u9762\u751F\u6210\u5206\u6790\u62A5\u544A\u3002
+MigrationReportAccessDialog.doNotShowAnymore=\u4E0D\u518D\u663E\u793A\u6B64\u6D88\u606F
+MigrationReportAccessDialog.runAnalysisButton=\u8FD0\u884C\u5206\u6790
+MigrationReportAccessDialog.notNowButton=\u6682\u4E0D\u91CD\u542F
+ItemAnalysisReportManager.Information.title=\u4FE1\u606F
+ItemAnalysisReportManager.Information.message=\u5DE5\u7A0B\u5206\u6790\u6210\u529F\u5B8C\u6210\uFF0C\u672A\u751F\u6210\u5F02\u5E38\u8BB0\u5F55\u3002
+ItemAnalysisReportManager.Warning.title=\u8B66\u544A
+ItemAnalysisReportManager.Warning.message=\u73B0\u5728\u65E0\u6CD5\u8FD0\u884C\u65B0\u7684\u5206\u6790\uFF0C\u8BF7\u7B49\u5F85\u5F53\u524D\u6B63\u5728\u8FD0\u884C\u7684\u5206\u6790\u7ED3\u675F\u7136\u540E\u91CD\u8BD5\u3002
+AnalysisReportAccessDialog.shellTitle=\u5DE5\u7A0B\u5206\u6790
+AnalysisReportAccessDialog.generateSuccess=\u5DE5\u7A0B\u5206\u6790\u6210\u529F\u5B8C\u6210\u3002
+AnalysisReportAccessDialog.completeReportAvailable=\u8BF7\u68C0\u67E5\u62A5\u544A
+AnalysisReportAccessDialog.accessReport=\u6B64\u5904
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/JobInfoProperties.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/JobInfoProperties.java
@@ -61,6 +61,12 @@ public class JobInfoProperties extends Properties {

    public static final String ADD_STATIC_CODE = "statistics"; //$NON-NLS-1$

+    public static final String GIT_AUTHOR = "gitAuthor";
+
+    public static final String GIT_COMMIT_ID = "gitCommitId";
+
+    public static final String GIT_COMMIT_DATE = "gitCommitDate";
+
    private final ProcessItem processItem;

    private final String contextName;
@@ -114,6 +120,9 @@ public class JobInfoProperties extends Properties {
            setProperty(ADD_STATIC_CODE, Boolean.TRUE.toString()); // TDI-23641, in studio, false always.
        }
        setProperty(COMMANDLINE_VERSION, VersionUtils.getVersion());
-
+        // add init git info for jobInfo
+        setProperty(GIT_AUTHOR, "");
+        setProperty(GIT_COMMIT_ID, "");
+        setProperty(GIT_COMMIT_DATE, "");
    }
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/TalendProcessArgumentConstant.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/TalendProcessArgumentConstant.java
@@ -66,6 +66,8 @@ public interface TalendProcessArgumentConstant {

    static final String ARG_AVOID_BRANCH_NAME = "AVOID_BRANCH_NAME";

+    static final String ARG_CLEAR_PASSWORD_CONTEXT_PARAMETERS = "CLEAR_PASSWORD_CONTEXT_PARAMETERS";
+
    static final String CMD_ARG_STATS_PORT_PARAM = "stat_port";

    static final String CMD_ARG_TRACE_PORT_PARAM = "trace_port";
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IDQJarManagementService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IDQJarManagementService.java
@@ -0,0 +1,27 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2021 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.core.service;
+
+import org.talend.core.IService;
+
+/**
+ * Manage the download of sqlexplorer and top.chart jar files.
+ */
+public interface IDQJarManagementService extends IService {
+
+    /**
+     * check and show the download page, this method should be called in TOP only.
+     */
+    public void checkSqlexplorerTopchartLibraries();
+
+}
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IRemoteService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IRemoteService.java
@@ -34,4 +34,8 @@ public interface IRemoteService extends IService {
            LoginException, JSONException;

    boolean isAuthorized(String value);
+
+    boolean isTokenUsed(String adminUrl) throws Exception;
+
+    String getPendoKeyFromLicense() throws Exception;
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IStudioLiteP2Service.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IStudioLiteP2Service.java
@@ -15,6 +15,7 @@ package org.talend.core.service;
 import java.net.URI;
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;

 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -27,8 +28,6 @@ import org.talend.core.model.general.Project;
 */
 public interface IStudioLiteP2Service extends IService {

-    public static final String PROP_USE_NEW_UPDATE_SYSTEM = "talend.studio.update.useNewUpdateSystem";
-
    public static final String CONFIG_STORAGE_FOLDER = "talend/studioLite/";

    public static final String BUNDLES_INFOS_STORAGE_FOLDER = CONFIG_STORAGE_FOLDER + "bundlesInfo/";
@@ -80,6 +79,17 @@ public interface IStudioLiteP2Service extends IService {

    int installRequiredFeatures(IProgressMonitor monitor, ValidateRequiredFeaturesHook hook, Project proj) throws Exception;

+    ValidateMergingFeaturesHook validateMergingFeatures(IProgressMonitor monitor, Project proj, Set<String> backupedFeaturesTempFiles) throws Exception;
+    
+    /**
+     * show merging features wizard
+     * 
+     * @return {@link IStudioLiteP2Service#RESULT_DONE}<br/>
+     * {@link IStudioLiteP2Service#RESULT_SKIP}<br/>
+     * {@link IStudioLiteP2Service#RESULT_CANCEL}<br/>
+     */
+    int showMergingFeaturesWizard(ValidateMergingFeaturesHook hook, Project proj) throws Exception;
+    
    /**
     * selected features will be write into the required feature list of project
     * 
@@ -96,6 +106,22 @@ public interface IStudioLiteP2Service extends IService {

    void setLocalPatches(Collection<String> localPatchUris) throws Exception;

+    URI toURI(String path) throws Exception;
+    
+    Set<String> getStudioInstalledFeatures(IProgressMonitor monitor, boolean includeTransitive) throws Exception;
+
+    void registCheckUpdateListener(AbsCheckUpdateListener listener) throws Exception;
+
+    void unregistCheckUpdateListener(AbsCheckUpdateListener listener) throws Exception;
+
+    void resetRestartParams();
+
+    void closingStudioGUI(boolean restart);
+
+    List<String> getCurrentProjectEnabledFeatures() throws Exception;
+
+    boolean checkProjectCompatibility(IProgressMonitor monitor, Project proj) throws Exception;
+
    public static IStudioLiteP2Service get() {
        if (GlobalServiceRegister.getDefault().isServiceRegistered(IStudioLiteP2Service.class)) {
            return GlobalServiceRegister.getDefault().getService(IStudioLiteP2Service.class);
@@ -103,14 +129,16 @@ public interface IStudioLiteP2Service extends IService {
        return null;
    }

+    public static abstract class AbsCheckUpdateListener {
+
+        abstract public void beforeCheckUpdate(IProgressMonitor monitor) throws Exception;
+
+    }
+
    public static interface IInstallableUnitInfo {

-        String getName();
-
        String getId();

-        List<String> getRequired();
-
    }

    public static interface CheckUpdateHook {
@@ -131,7 +159,6 @@ public interface IStudioLiteP2Service extends IService {
        Collection<?> getUninstalledIUs();

        boolean performUpdate(IProgressMonitor monitor) throws Exception;
-
    }

    public static interface ValidatePotentialFeaturesHook {
@@ -149,6 +176,15 @@ public interface IStudioLiteP2Service extends IService {
        List<IInstallableUnitInfo> getMissingRequiredFeatures();

    }
+    
+    public static interface ValidateMergingFeaturesHook {
+
+        boolean showWizard();
+
+        Set<IInstallableUnitInfo> getNewlyActivatedFeatures();
+        Set<IInstallableUnitInfo> getDeActivatedFeatures();
+
+    }

    public static interface UpdateSiteConfig {

@@ -164,6 +200,43 @@ public interface IStudioLiteP2Service extends IService {

        void setUpdates(IProgressMonitor monitor, Collection<URI> uris) throws Exception;

+        void resetToDefault(IProgressMonitor monitor) throws Exception;
+
+    }
+    
+    
+    Set<IInstallableUnitInfo> calAllRequiredFeature(IProgressMonitor monitor, String projectPath, boolean isFilteByLicense) throws Exception;
+    
+    public boolean showMissingFeatureWizard(IProgressMonitor monitor, Set<IInstallableUnitInfo> requiredFeatureSet) throws Exception;
+
+    public static abstract class AbsStudioLiteP2Exception extends Exception {
+
+        public final static String ERR_CODE_UPDATE_REQUIRED = "UPDATE_REQUIRED";
+
+        private String errorCode;
+
+        /**
+         * if it is a critical issue which need to break/forbid the process
+         */
+        private boolean breakProcess = false;
+
+        public AbsStudioLiteP2Exception(String errCode, String errMessage) {
+            super(errMessage);
+            this.errorCode = errCode;
+        }
+
+        public String getErrorCode() {
+            return this.errorCode;
+        }
+
+        public void setBreakProcess(boolean breakProcess) {
+            this.breakProcess = breakProcess;
+        }
+
+        public boolean needBreakProcess() {
+            return breakProcess;
+        }
+
    }

 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IUpdateService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IUpdateService.java
@@ -20,9 +20,7 @@ public interface IUpdateService extends IService {
    boolean checkComponentNexusUpdate();
    
    public boolean syncSharedStudioLibraryInPatch(IProgressMonitor monitor) throws Exception;
-    
-    public String getSharedStudioMissingPatchVersion();
-    
+
    public boolean updateArtifactsFileSha256Hex(IProgressMonitor monitor, String studioArtifactsFileShaCodeHex);

    public void checkThirdPartyLibraries();
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/sqlbuilder/util/TextUtil.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/sqlbuilder/util/TextUtil.java
@@ -262,9 +262,8 @@ public class TextUtil {
    public static boolean isDoubleQuotesNeededDbType(String dbType) {
        boolean isPostgresql = dbType.equalsIgnoreCase(EDatabaseTypeName.PSQL.getXmlName());
        boolean isGreenplum = dbType.equalsIgnoreCase(EDatabaseTypeName.GREENPLUM.getXmlName());
-        boolean isParaccel = dbType.equalsIgnoreCase(EDatabaseTypeName.PARACCEL.getXmlName());
        boolean isH2 = dbType.equalsIgnoreCase(EDatabaseTypeName.H2.getXmlName());
-        return isPostgresql || isGreenplum || isParaccel || isH2;
+        return isPostgresql || isGreenplum || isH2;
    }

    /**
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/IInstalledPatchService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/IInstalledPatchService.java
@@ -12,6 +12,9 @@
 // ============================================================================
 package org.talend.core.ui;

+import java.io.IOException;
+
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.runtime.maven.MavenArtifact;

@@ -25,4 +28,15 @@ public interface IInstalledPatchService extends IService {
 	
    public MavenArtifact getLastIntalledP2Patch();

+    void updatePatchInstalled(String installedName, String installedVersion, String comment) throws IOException;
+
+    String getLatestInstalledPatchVersion();
+
+    public static IInstalledPatchService get() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IInstalledPatchService.class)) {
+            return GlobalServiceRegister.getDefault().getService(IInstalledPatchService.class);
+        }
+        return null;
+    }
+
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/branding/IBrandingService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/branding/IBrandingService.java
@@ -50,6 +50,10 @@ public interface IBrandingService extends IService {

    public boolean isPoweredOnlyCamel();

+    public default boolean isCloudLicense() {
+        return false;
+    }
+
    public String getStartingBrowserId();

    public URL getStartingHtmlURL();
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/utils/TalendCacheUtils.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/utils/TalendCacheUtils.java
@@ -15,8 +15,6 @@ package org.talend.core.utils;
 import org.apache.commons.lang.ArrayUtils;
 import org.eclipse.core.runtime.Platform;
 import org.talend.commons.utils.system.EclipseCommandLine;
-import org.talend.core.BrandingChecker;
-import org.talend.core.model.utils.TalendPropertiesUtil;

 /**
 * DOC ggu class global comment. Detailled comment <br/>
@@ -37,7 +35,8 @@ public final class TalendCacheUtils {
    }

    public static boolean cleanComponentCache() {
-        return TalendPropertiesUtil.isCleanCache() || isSetCleanComponentCache() || isSetClean()
-                || BrandingChecker.isBrandingChanged();
+        // return TalendPropertiesUtil.isCleanCache() || isSetCleanComponentCache() || isSetClean()
+        // || BrandingChecker.isBrandingChanged();
+        return Boolean.getBoolean("talend.clean.index");
    }
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/utils/TalendQuoteUtils.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/utils/TalendQuoteUtils.java
@@ -264,6 +264,40 @@ public final class TalendQuoteUtils {
        }
    }

+    public static boolean isStartEndsWithQuotation(String expression, boolean checkStart, boolean checkEnd) {
+        if (StringUtils.isBlank(expression)) {
+            return false;
+        }
+        boolean startsWith = false;
+        boolean endsWith = false;
+
+        ECodeLanguage language = LanguageManager.getCurrentLanguage();
+        switch (language) {
+        case JAVA:
+            startsWith = expression.startsWith(QUOTATION_MARK);
+            endsWith = expression.endsWith(QUOTATION_MARK);
+            if (checkStart && checkEnd) {
+                return startsWith & endsWith;
+            } else if (checkStart) {
+                return startsWith;
+            } else if (checkEnd) {
+                return endsWith;
+            }
+        default: // PERL
+            startsWith = expression.startsWith(SINGLE_QUOTE);
+            endsWith = expression.endsWith(SINGLE_QUOTE);
+            if (checkStart && checkEnd) {
+                return startsWith & endsWith;
+            } else if (checkStart) {
+                return startsWith;
+            } else if (checkEnd) {
+                return endsWith;
+            }
+        }
+
+        return false;
+    }
+
    public static String removeQuotes(String text, String quotation) {
        if (text == null) {
            return null;
@@ -404,8 +438,6 @@ public final class TalendQuoteUtils {
            return QUOTATION_MARK;
        case IBMDB2:
            return QUOTATION_MARK;
-        case INGRES:
-            return QUOTATION_MARK;
        case MSODBC:
            return QUOTATION_MARK;
        case MSSQL:
@@ -419,15 +451,12 @@ public final class TalendQuoteUtils {
            return QUOTATION_MARK;
        case PSQL:
        case GREENPLUM:
-        case PARACCEL:
        case PLUSPSQL:
            return QUOTATION_MARK;
        case SYBASEASE:
            return QUOTATION_MARK;
        case SYBASEIQ:
            return QUOTATION_MARK;
-        case INTERBASE:
-            return QUOTATION_MARK;
        case SQLITE:
            return QUOTATION_MARK;
        case FIREBIRD:
@@ -440,6 +469,8 @@ public final class TalendQuoteUtils {
            return QUOTATION_MARK;
        case H2:
            return QUOTATION_ESC_MARK;
+        case SNOWFLAKE:
+            return QUOTATION_MARK;
            // case JAVADB_DERBYCLIENT:
            // return QUOTATION_MARK;
            // case JAVADB_JCCJDBC:
--- a/main/plugins/org.talend.core.ui/pom.xml
+++ b/main/plugins/org.talend.core.ui/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.ui</artifactId>
@@ -30,17 +30,17 @@
 								<artifactItem>
 									<groupId>com.github.oshi</groupId>
 									<artifactId>oshi-core</artifactId>
-									<version>5.2.5</version>
+									<version>5.8.3</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>net.java.dev.jna</groupId>
 									<artifactId>jna</artifactId>
-									<version>5.6.0</version>
+									<version>5.9.0</version>
 								</artifactItem>
 								<artifactItem>
 									<groupId>net.java.dev.jna</groupId>
 									<artifactId>jna-platform</artifactId>
-									<version>5.6.0</version>
+									<version>5.9.0</version>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
--- a/main/plugins/org.talend.core.ui/src/main/java/messages_fr.properties
+++ b/main/plugins/org.talend.core.ui/src/main/java/messages_fr.properties
@@ -74,7 +74,6 @@ EComponentCategory_properties=Propri\u00E9t\u00E9s
 EComponentCategory_rulerAndGrid=Rulers & Grid
 EComponentCategory_sqlTemplate=Mod\u00E8le SQL
 EComponentCategory_statsAndLogs=Stats & Logs
-EComponentCategory_svnHistory=Historique SVN
 EComponentCategory_technical=Technique
 EComponentCategory_version=Version
 EComponentCategory_headerFooter=En-t\u00EAte/Pied de page
@@ -286,7 +285,6 @@ VersionSection.Status=Statut
 XmlArray.InvalidFile=Fichier invalide.
 XPathQueryMetadataTableEditorViewExt.xpathQuerys=Requ\u00EAtes sch\u00E9ma XPath
 XSDValidater.IllegalArgument=Le fichier XSD d'entr\u00E9e n'existe pas.
-repository.businessProcess=Business Models
 repository.context=Contextes
 repository.documentation=Documentation
 repository.folder=Dossier
@@ -343,7 +341,6 @@ repository.metadataSalesforceSchema.alias=Salesforce CRM
 repository.process=Jobs
 repository.query=Requ\u00EAte
 repository.CDC=CDC
-repository.svnroot=SVN
 repository.referencedProjects=Projet r\u00E9f\u00E9renc\u00E9
 repository.routines=Routines
 repository.snippets=Snippets
@@ -408,7 +405,7 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=Centre
 ConnectionBean.Local=Local
 ConnectionBean.DefaultConnection=Connexion par d\u00E9faut
 InegerCellEditorListener.NegativeNumberMessage=La valeur de {0} ne peut \u00EAtre un nombre n\u00E9gatif.
-InegerCellEditorListener.NumeralMessage=La valeur de {0} doit \u00EAre num\u00E9rique.
+InegerCellEditorListener.NumeralMessage=La valeur de {0} doit \u00EAtre num\u00E9rique.
 OpenXSDFileDialog.cancel=Annuler
 OpenXSDFileDialog.confirm=Confirmer
 OpenXSDFileDialog.fileName=Nom de fichier\u00A0:
--- a/main/plugins/org.talend.core.ui/src/main/java/messages_ja.properties
+++ b/main/plugins/org.talend.core.ui/src/main/java/messages_ja.properties
@@ -1,5 +1,5 @@
 AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2011, Talend Inc.\n//\n//\u3053\u306E\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306F_{0}\n\u306B\u3088\u3063\u3066\u81EA\u52D5\u7684\u306B\u751F\u6210\u3055\u308C\u307E\u3057\u305F// JobDesigner (CodeGenerator\u30D0\u30FC\u30B8\u30E7\u30F3{1})\n// Talend\u88FD\u54C1\u306B\u3064\u3044\u3066\u8A73\u3057\u304F\u306F\u3001www.talend.com\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002\n//\u3053\u306E\u30B3\u30FC\u30C9\u306FGNU LGPL\u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u6761\u4EF6\u306B\u57FA\u3065\u3044\u3066\u914D\u5E03\u3067\u304D\u307E\u3059\n// http://www.gnu.org/licenses/lgpl.html)\u3002\n//\n// ============================================================================
-AbstractBrandingService.routines_license_header_content=Copyright (c) 2005-2011, Talend Inc.\n//\n//\u3053\u306E\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306F_{0}\n\u306B\u3088\u3063\u3066\u81EA\u52D5\u7684\u306B\u751F\u6210\u3055\u308C\u307E\u3057\u305F// CodeGenerator\u30D0\u30FC\u30B8\u30E7\u30F3{1}\n// Talend\u88FD\u54C1\u306E\u8A73\u7D30\u306F\u3001www.talend.com\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002\n//\u3053\u306E\u30B3\u30FC\u30C9\u306FGNU LGPL\u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u6761\u4EF6\u306B\u57FA\u3065\u3044\u3066\u914D\u5E03\u3067\u304D\u307E\u3059\u3002\n// http://www.gnu.org/licenses/lgpl.html)
+AbstractBrandingService.routines_license_header_content=Copyright (c) 2005-2011, Talend Inc.\n//\n// \u3053\u306E\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306F\u6B21\u306E\u30E6\u30FC\u30B6\u30FC\u306B\u3088\u3063\u3066\u81EA\u52D5\u7684\u306B\u751F\u6210\u3055\u308C\u307E\u3057\u305F: _{0}\n // CodeGenerator\u30D0\u30FC\u30B8\u30E7\u30F3{1}\n// Talend\u88FD\u54C1\u306E\u8A73\u7D30\u306F\u3001www.talend.com\u3092\u3054\u89A7\u304F\u3060\u3055\u3044\u3002\n//\u3053\u306E\u30B3\u30FC\u30C9\u306FGNU LGPL\u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u6761\u4EF6\u306B\u57FA\u3065\u3044\u3066\u914D\u5E03\u3067\u304D\u307E\u3059\u3002\n// http://www.gnu.org/licenses/lgpl.html)
 AbstractComponentsProvider.folderNotExist=\u30D5\u30A9\u30EB\u30C0\u30FC{0}\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
 AbstractItemMigrationTask.taskFailed=\u30A2\u30A4\u30C6\u30E0{1}\u4E0A\u306E\u79FB\u884C\u30BF\u30B9\u30AF{0}\u304C\u5931\u6557\u3057\u307E\u3057\u305F
 AdvancedSocketFactory.failedInitial=\u30A8\u30E9\u30FC:\u521D\u671F\u5316\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
@@ -52,11 +52,11 @@ CorePreferencePage.groupBySource=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u5185\u306
 CorePreferencePage.iReportPath=iReport\u30D1\u30B9
 CorePreferencePage.alwaysWelcome.v2=\u8D77\u52D5\u6642\u306B\u30A6\u30A7\u30EB\u30AB\u30E0\u30D3\u30E5\u30FC\u3092\u5E38\u306B\u8868\u793A
 CorePreferencePage.alwaysAskAtStartup=\u8D77\u52D5\u6642\u306B\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30C0\u30A4\u30A2\u30ED\u30B0\u3092\u5E38\u306B\u8868\u793A
-CorePreferencePage.javaInterpreter=&Java interpreter
+CorePreferencePage.javaInterpreter=Java\u30A4\u30F3\u30BF\u30FC\u30D7\u30EA\u30BF\u30FC(&J)
 CorePreferencePage.perlInterpreter=Perl\u30A4\u30F3\u30BF\u30FC\u30D7\u30EA\u30BF\u30FC
 CorePreferencePage.previewLimit=\u30D7\u30EC\u30D3\u30E5\u30FC\u5236\u9650
 CorePreferencePage.runInMultiThread=\u30DE\u30EB\u30C1\u30B9\u30EC\u30C3\u30C9\u5B9F\u884C(\u30B8\u30E7\u30D6\u751F\u6210\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024)
-CorePreferencePage.temporaryFiles=&\u4E00\u6642\u30D5\u30A1\u30A4\u30EB
+CorePreferencePage.temporaryFiles=\u4E00\u6642\u30D5\u30A1\u30A4\u30EB(&T)
 DbTableSelectorDialog.textContent=\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u9078\u629E
 ECodeLanguage.unknowLanguage=\u672A\u77E5\u306E\u8A00\u8A9E
 EComponentCategory_advanceSetting=\u8A73\u7D30\u8A2D\u5B9A
@@ -71,10 +71,9 @@ EComponentCategory_extra=\u8FFD\u52A0
 EComponentCategory_logs=\u30ED\u30B0
 EComponentCategory_main=\u30E1\u30A4\u30F3
 EComponentCategory_properties=\u30D7\u30ED\u30D1\u30C6\u30A3
-EComponentCategory_rulerAndGrid=Rulers & Grid
+EComponentCategory_rulerAndGrid=\u30EB\u30FC\u30E9\u30FC\u3068\u30B0\u30EA\u30C3\u30C9
 EComponentCategory_sqlTemplate=SQL\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
 EComponentCategory_statsAndLogs=\u7D71\u8A08\u3068\u30ED\u30B0
-EComponentCategory_svnHistory=SVN\u5C65\u6B74
 EComponentCategory_technical=\u30C6\u30AF\u30CB\u30AB\u30EB
 EComponentCategory_version=\u30D0\u30FC\u30B8\u30E7\u30F3
 EComponentCategory_headerFooter=\u30D8\u30C3\u30C0\u30FC\uFF0F\u30D5\u30C3\u30BF\u30FC
@@ -101,7 +100,7 @@ EConnectionType.parallelize=\u4E26\u5217
 EMetadataEncoding.Arabic=\u30A2\u30E9\u30D3\u30A2\u8A9E
 EMetadataEncoding.Big5=Big Five (\u7E41\u4F53\u5B57\u4E2D\u56FD\u8A9E)
 EMetadataEncoding.Cyrillic=\u30AD\u30EA\u30EB\u8A9E
-EMetadataEncoding.EUC_CN=\u7C21\u4F53\u5B57\u4E2D\u56FD\u8A9E\uFF08Unix\u30B3\u30FC\u30C9CN\u62E1\u5F35\uFF09
+EMetadataEncoding.EUC_CN=\u7C21\u4F53\u5B57\u4E2D\u56FD\u8A9E(Unix\u30B3\u30FC\u30C9CN\u62E1\u5F35)
 EMetadataEncoding.GB18030=\u4E2D\u56FD\u8A9E\u56FD\u5BB6\u57FA\u6E96
 EMetadataEncoding.GB2312=\u4E2D\u56FD\u8A9E
 EMetadataEncoding.Greek=\u30AE\u30EA\u30B7\u30E3\u8A9E
@@ -198,7 +197,7 @@ PerlDynamicProposalUtil.autoConvert= would be automatically converted to {0}->[i
 PerlGlobalVariableProposal.Description=\u8AAC\u660E: {0}
 PerlGlobalVariableProposal.VariableName=\n\n\u5909\u6570\u540D: {1}
 PerspectiveMenuManager.dummy=\u30C0\u30DF\u30FC
-PerspectiveMenuManager.perspectiveLabel=&Perspective
+PerspectiveMenuManager.perspectiveLabel=\u30D1\u30FC\u30B9\u30DA\u30AF\u30C6\u30A3\u30D6 (&P)
 ProcessorUtilities.finalizeBuild=\u30D3\u30EB\u30C9\u3092\u7D42\u4E86\u4E2D...
 ProcessorUtilities.generatingJob=\u30B8\u30E7\u30D6\u3092\u751F\u6210\u4E2D...
 ProcessorUtilities.loadingJob=\u30B8\u30E7\u30D6\u3092\u30ED\u30FC\u30C9\u4E2D...
@@ -273,7 +272,7 @@ SelectRepositoryContextGroupDialog.Title=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3
 TalendTabbedPropertyComposite.compactButton.toolTip=\u30B3\u30F3\u30D1\u30AF\u30C8\u30D3\u30E5\u30FC
 TalendTabbedPropertyComposite.tableButton.toolTip=\u30C6\u30FC\u30D6\u30EB\u30D3\u30E5\u30FC
 TalendType.TypeName=\u30BF\u30A4\u30D7\u540D{0}
-VariableItemEditor.insertVariable=Insert &Variable Placeholder...
+VariableItemEditor.insertVariable=\u633F\u5165\u3068\u5909\u6570\u30D7\u30EC\u30FC\u30B9\u30DB\u30EB\u30C0\u30FC(&V)...
 VariableItemEditor.name=\u540D\u524D
 VariableItemEditor.new=\u65B0\u898F
 VariableItemEditor.remove=\u524A\u9664
@@ -286,7 +285,6 @@ VersionSection.Status=\u30B9\u30C6\u30FC\u30BF\u30B9
 XmlArray.InvalidFile=\u7121\u52B9\u306A\u30D5\u30A1\u30A4\u30EB\u3002
 XPathQueryMetadataTableEditorViewExt.xpathQuerys=\u30B9\u30AD\u30FC\u30DEXPathQuerys
 XSDValidater.IllegalArgument=\u5165\u529BXSD\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
-repository.businessProcess=\u30D3\u30B8\u30CD\u30B9\u30E2\u30C7\u30EB
 repository.context=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8
 repository.documentation=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3
 repository.folder=\u30D5\u30A9\u30EB\u30C0\u30FC
@@ -343,7 +341,6 @@ repository.metadataSalesforceSchema.alias=Salesforce CRM
 repository.process=\u30B8\u30E7\u30D6\u30C7\u30B6\u30A4\u30F3
 repository.query=\u30AF\u30A8\u30EA\u30FC
 repository.CDC=CDC
-repository.svnroot=SVN
 repository.referencedProjects=\u53C2\u7167\u3055\u308C\u308B\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
 repository.routines=\u30EB\u30FC\u30C1\u30F3
 repository.snippets=\u30B9\u30CB\u30DA\u30C3\u30C8
@@ -389,13 +386,13 @@ ModuleListCellEditor.warningTitle=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C9\u30
 ModuleListCellEditor.warningMessage=jar\u304C\u5B58\u5728\u3057\u307E\u3059\u3002
 MultiStringSelectionDialog.nameEmpty=\u540D\u524D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 PromptDialog.stringTip=\u5165\u529B\u30C6\u30AD\u30B9\u30C8\u3092\u4E00\u91CD\u5F15\u7528\u7B26\u3067\u56F2\u3080\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-ApplicationActionBarAdvisor.menuFileLabel=&\u30D5\u30A1\u30A4\u30EB
-ApplicationActionBarAdvisor.menuEditLabel=&\u7DE8\u96C6
-ApplicationActionBarAdvisor.navigateLabel=&\u30CA\u30D3\u30B2\u30FC\u30C8
-ApplicationActionBarAdvisor.gotoLabel=&Go to
-ApplicationActionBarAdvisor.projectLabel=&Project
-ApplicationActionBarAdvisor.menuWindowLabel=&Window
-ApplicationActionBarAdvisor.menuHelpLabel=&\u30D8\u30EB\u30D7
+ApplicationActionBarAdvisor.menuFileLabel=\u30D5\u30A1\u30A4\u30EB(&F)
+ApplicationActionBarAdvisor.menuEditLabel=\u7DE8\u96C6(&E)
+ApplicationActionBarAdvisor.navigateLabel=\u30CA\u30D3\u30B2\u30FC\u30C8(&N)
+ApplicationActionBarAdvisor.gotoLabel=\u79FB\u52D5(&G)
+ApplicationActionBarAdvisor.projectLabel=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8(&P)
+ApplicationActionBarAdvisor.menuWindowLabel=\u30A6\u30A3\u30F3\u30C9\u30A6(&W)
+ApplicationActionBarAdvisor.menuHelpLabel=\u30D8\u30EB\u30D7(&H)
 BusinessAppearanceComposite.textAlignmentGroup=\u30C6\u30AD\u30B9\u30C8\u306E\u914D\u7F6E
 BusinessAppearanceComposite.textAlignment.horizontal=\u6C34\u5E73
 BusinessAppearanceComposite.textAlignment.vertical=\u5782\u76F4
@@ -464,7 +461,7 @@ EMetadataEncoding.Latin9=Latin9
 HDFS=HDFS
 HCAT=HCAT
 EConnectionType.startsMenu=\u958B\u59CB
-MetadataTalendTypeEditor.button.edit=E&dit
+MetadataTalendTypeEditor.button.edit=\u7DE8\u96C6(&D)
 MetadataTalendTypeEditor.button.export=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8(&X)
 MetadataTalendTypeEditor.button.import=\u30A4\u30F3\u30DD\u30FC\u30C8(&M)
 MetadataTalendTypeEditor.column.Name=\u30E1\u30BF\u30C7\u30FC\u30BF\u30DE\u30C3\u30D4\u30F3\u30B0\u30D5\u30A1\u30A4\u30EB
@@ -472,7 +469,7 @@ MetadataTalendTypeEditor.editMappingDialog.title=\u30DE\u30C3\u30D4\u30F3\u30B0\
 MetadataTalendTypeEditor.error.message=\u30A8\u30E9\u30FC\u30E1\u30C3\u30BB\u30FC\u30B8
 MetadataTalendTypeEditor.fileIsImported=\u3053\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u65E2\u306B\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\u3002
 MetadataTalendTypeEditor.fileIsInvalid=\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u304C\u7121\u52B9\u3067\u3059\u3002
-MetadataTalendTypeEditor.fileNameStartRule=\u30D5\u30A1\u30A4\u30EB\u540D\u306F 'mapping_' \u3067\u59CB\u3081\u3066\u304F\u3060\u3055\u3044.
+MetadataTalendTypeEditor.fileNameStartRule=\u30D5\u30A1\u30A4\u30EB\u540D\u306F 'mapping_' \u3067\u59CB\u3081\u3066\u304F\u3060\u3055\u3044\u3002
 MetadataTypeLengthPreferencePage.VALUE=NULL\u5024\u3092\u542B\u3080\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A
 MetadataTypeLengthPreferencePage.FIELD=\u5168\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u8A2D\u5B9A
 MetadataTypeLengthPreferencePage.DBTYPE=\u30C7\u30FC\u30BF\u30BF\u30A4\u30D7\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u9577\u3055
@@ -543,13 +540,13 @@ ContextParameterProposal.ContextVariable.v1=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E
 ContextParameterProposal.Type.v1=\u30BF\u30A4\u30D7: {2}
 ContextParameterProposal.VariableName.v1=\u5024: {3}
 ArchiveFileExportOperationFullPath.cannotCreateDir='{0}'\u3068\u3044\u3046\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093
-WorkingSetConfigurationDialog_new_label=&New...
-WorkingSetConfigurationDialog_edit_label=&Edit...
-WorkingSetConfigurationDialog_remove_label=&Remove
-WorkingSetConfigurationDialog_up_label=&Up
-WorkingSetConfigurationDialog_down_label=&Down
-WorkingSetConfigurationDialog_selectAll_label=Select &All
-WorkingSetConfigurationDialog_deselectAll_label=Dese&lect All
+WorkingSetConfigurationDialog_new_label=\u65B0\u898F(&N)...
+WorkingSetConfigurationDialog_edit_label=\u7DE8\u96C6(&E)
+WorkingSetConfigurationDialog_remove_label=\u524A\u9664(&R)
+WorkingSetConfigurationDialog_up_label=\u4E0A\u3078(&U)
+WorkingSetConfigurationDialog_down_label=\u4E0B\u3078(&D)
+WorkingSetConfigurationDialog_selectAll_label=\u3059\u3079\u3066\u9078\u629E(&A)
+WorkingSetConfigurationDialog_deselectAll_label=\u3059\u3079\u3066\u9078\u629E\u89E3\u9664(&L)
 WorkbenchMessages.FilteredTree_FilterMessage=\u30D5\u30A3\u30EB\u30BF\u30FC\u30C6\u30AD\u30B9\u30C8\u3092\u5165\u529B
 WorkbenchMessages.FilteredTree_ClearToolTip=\u30AF\u30EA\u30A2
 ContextTreeValuesComposite.Menu=\u30E1\u30CB\u30E5\u30FC
@@ -563,18 +560,18 @@ ContextNebulaComposite.ContextsUnAvailable=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\
 ContextNebulaComposite.ContextGroupLabel=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u74B0\u5883
 ContextTreeTable.PromptToolTips=\u5909\u6570\u306E\u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u6709\u52B9\u5316
 ContextValidator.ParameterNotValid=\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u540D\u304C\u7121\u52B9\u3067\u3059\u3002
-WorkspaceMnu.switch.text=Switch &Workspace
+WorkspaceMnu.switch.text=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u5207\u308A\u63DB\u3048(&W)
 WorkspaceMnu.switch.tooltip=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u958B\u304F
-WorkspaceMnu.choose.text=&Choose...
+WorkspaceMnu.choose.text=\u9078\u629E(&C)...
 WorkspaceMnu.choose.tooltip=\u4ED6\u306E\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u9078\u629E
 WorkspaceMnu.restart.error.title=\u30B7\u30B9\u30C6\u30E0\u30D7\u30ED\u30D1\u30C6\u30A3\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 WorkspaceMnu.restart.error.message={0}\u30D7\u30ED\u30D1\u30C6\u30A3\u304C\u672A\u8A2D\u5B9A\u306E\u305F\u3081\u3001\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3092\u518D\u8D77\u52D5\u3067\u304D\u307E\u305B\u3093\u3002
 WorkspaceDlg.title=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u9078\u629E
 WorkspaceDlg.Message=Talend Studio\u306F\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3068\u3044\u3046\u540D\u524D\u306E\u30D5\u30A9\u30EB\u30C0\u30FC\u5185\u306B\u30C7\u30FC\u30BF\u3092\u4FDD\u7BA1\u3057\u307E\u3059\u3002\n\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 WorkspaceDlg.workspace.label=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9
-WorkspaceDlg.browse.button=&Browse...
+WorkspaceDlg.browse.button=\u53C2\u7167(&B)...
 WorkspaceDlg.browse.folder.title=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u9078\u629E
-WorkspaceDlg.use.this.as.default.cb.message=&Use this workspace as the default and do not ask again
+WorkspaceDlg.use.this.as.default.cb.message=\u3053\u306E\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u3092\u30C7\u30D5\u30A9\u30EB\u30C8\u3068\u3057\u3066\u4F7F\u7528\u3057\u3001\u78BA\u8A8D\u3092\u8868\u793A\u3057\u306A\u3044(&U)
 I18nPreferencePage.needRestart=\u30ED\u30FC\u30AB\u30EB\u8A00\u8A9E(\u518D\u8D77\u52D5\u304C\u5FC5\u8981)
 I18nPreferencePage.translationInformation=Babili\u306B\u3088\u308B\u30C6\u30B9\u30C8\u7FFB\u8A33(\u73FE\u5728\u306E\u8A00\u8A9E\u306B\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\u4ED6\u306E\u8A00\u8A9E\u3092\u9078\u629E\u3057\u305F\u5834\u5408\u306F\u518D\u8D77\u52D5\u304C\u5FC5\u8981\u3067\u3059)
 I18nPreferencePage.importBabili=Babili\u304B\u3089\u7FFB\u8A33\u306E\u30A4\u30F3\u30DD\u30FC\u30C8
--- a/main/plugins/org.talend.core.ui/src/main/java/messages_zh_CN.properties
+++ b/main/plugins/org.talend.core.ui/src/main/java/messages_zh_CN.properties
@@ -74,7 +74,6 @@ EComponentCategory_properties=\u5C5E\u6027
 EComponentCategory_rulerAndGrid=\u6807\u5C3A\u548C\u7F51\u683C
 EComponentCategory_sqlTemplate=SQL \u6A21\u677F
 EComponentCategory_statsAndLogs=\u7EDF\u8BA1\u53CA\u65E5\u5FD7
-EComponentCategory_svnHistory=SVN \u5386\u53F2\u8BB0\u5F55
 EComponentCategory_technical=\u6280\u672F
 EComponentCategory_version=\u7248\u672C
 EComponentCategory_headerFooter=\u6587\u4EF6\u5934/\u6587\u4EF6\u5C3E
@@ -286,7 +285,6 @@ VersionSection.Status=\u72B6\u6001
 XmlArray.InvalidFile=\u65E0\u6548\u7684\u6587\u4EF6\u3002
 XPathQueryMetadataTableEditorViewExt.xpathQuerys=Schema XPathQuery
 XSDValidater.IllegalArgument=\u8F93\u5165 XSD \u6587\u4EF6\u4E0D\u5B58\u5728
-repository.businessProcess=\u4E1A\u52A1\u6A21\u578B
 repository.context=\u4E0A\u4E0B\u6587
 repository.documentation=\u6587\u6863
 repository.folder=\u6587\u4EF6\u5939
@@ -343,7 +341,6 @@ repository.metadataSalesforceSchema.alias=Salesforce CRM
 repository.process=\u4F5C\u4E1A\u8BBE\u8BA1
 repository.query=\u67E5\u8BE2
 repository.CDC=CDC
-repository.svnroot=SVN
 repository.referencedProjects=\u5F15\u7528\u7684\u5DE5\u7A0B
 repository.routines=\u4F8B\u7A0B
 repository.snippets=\u7247\u65AD
--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/preference/collector/TalendDataCollectorPreferenceInitializer.java
+++ b/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/preference/collector/TalendDataCollectorPreferenceInitializer.java
@@ -16,6 +16,7 @@ import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.ui.CoreUIPlugin;
+import org.talend.core.ui.branding.IBrandingService;

 /**
 * ggu class global comment. Detailled comment
@@ -32,6 +33,9 @@ public class TalendDataCollectorPreferenceInitializer extends AbstractPreference
        IPreferenceStore preferenceStore = CoreUIPlugin.getDefault().getPreferenceStore();
        preferenceStore.setDefault(ITalendCorePrefConstants.DATA_COLLECTOR_ENABLED, true);
        preferenceStore.setDefault(ITalendCorePrefConstants.DATA_COLLECTOR_UPLOAD_PERIOD, 5);
+        if(IBrandingService.get().isCloudLicense()) {
+            preferenceStore.setValue(ITalendCorePrefConstants.DATA_COLLECTOR_ENABLED, true);
+        }
    }

 }
--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/preference/collector/TalendDataCollectorPreferencePage.java
+++ b/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/preference/collector/TalendDataCollectorPreferencePage.java
@@ -25,6 +25,7 @@ import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.ui.CoreUIPlugin;
+import org.talend.core.ui.branding.IBrandingService;
 import org.talend.core.ui.i18n.Messages;
 import org.talend.core.ui.token.TokenCollectorFactory;

@@ -46,8 +47,10 @@ public class TalendDataCollectorPreferencePage extends FieldEditorPreferencePage

    @Override
    protected void createFieldEditors() {
-        addField(new BooleanFieldEditor(ITalendCorePrefConstants.DATA_COLLECTOR_ENABLED,
-                Messages.getString("TalendDataCollectorPreferencePage_EnableCapture"), getFieldEditorParent())); //$NON-NLS-1$
+        if(!IBrandingService.get().isCloudLicense()) {
+            addField(new BooleanFieldEditor(ITalendCorePrefConstants.DATA_COLLECTOR_ENABLED,
+                    Messages.getString("TalendDataCollectorPreferencePage_EnableCapture"), getFieldEditorParent())); //$NON-NLS-1$
+        }
        if (Boolean.getBoolean("talend.DataCollector.visibleSendButton")) {//$NON-NLS-1$
            createSendDataButton(getFieldEditorParent());
        }
--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/token/AdditionalPackagesTokenCollector.java
+++ b/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/token/AdditionalPackagesTokenCollector.java
@@ -12,29 +12,38 @@
 // ============================================================================
 package org.talend.core.ui.token;

+import org.apache.commons.lang3.StringUtils;
 import org.talend.commons.utils.time.PropertiesCollectorUtil;
+import org.talend.core.service.IStudioLiteP2Service;

+import us.monoid.json.JSONArray;
 import us.monoid.json.JSONObject;

 public class AdditionalPackagesTokenCollector extends AbstractTokenCollector {

-    public AdditionalPackagesTokenCollector() {
-        // TODO Auto-generated constructor stub
-    }
-
    @Override
    public JSONObject collect() throws Exception {
-        String records = PropertiesCollectorUtil.getAdditionalPackageRecording();
-
-        JSONObject allRecords;
-        try {
-            allRecords = new JSONObject(records);
-        } catch (Exception e) {
-            // the value is not set, or is empty
-            allRecords = new JSONObject();
-            allRecords.put(PropertiesCollectorUtil.getAdditionalPackagePreferenceNode(), new JSONObject());
+        // String records = PropertiesCollectorUtil.getAdditionalPackageRecording();
+        //
+        // JSONObject allRecords;
+        // try {
+        // allRecords = new JSONObject(records);
+        // } catch (Exception e) {
+        // // the value is not set, or is empty
+        // allRecords = new JSONObject();
+        // allRecords.put(PropertiesCollectorUtil.getAdditionalPackagePreferenceNode(), new JSONObject());
+        // }
+        //
+        // return allRecords;
+        JSONObject allRecords = new JSONObject();
+        if (IStudioLiteP2Service.get() != null) {
+            JSONArray jsonArray = new JSONArray();
+            IStudioLiteP2Service.get().getStudioInstalledFeatures(null, false).stream()
+                    .map(id -> StringUtils.substringBeforeLast(id, ".feature.group"))
+                    .sorted().forEach(id -> jsonArray.put(id));
+            allRecords.put(PropertiesCollectorUtil.getAdditionalPackagePreferenceNode(), jsonArray);
        }
-
        return allRecords;
    }
+
 }
--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/token/DefaultTokenCollector.java
+++ b/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/token/DefaultTokenCollector.java
@@ -64,7 +64,7 @@ public class DefaultTokenCollector extends AbstractTokenCollector {
    public JSONObject collect() throws Exception {
        JSONObject tokenStudioObject = new JSONObject();
        // version
-        tokenStudioObject.put(VERSION.getKey(), VersionUtils.getInternalVersion());
+        tokenStudioObject.put(VERSION.getKey(), VersionUtils.getInternalMajorVersion());
        // uniqueId
        tokenStudioObject.put(UNIQUE_ID.getKey(), hashUniqueId());

--- a/main/plugins/org.talend.core/pom.xml
+++ b/main/plugins/org.talend.core/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>8.0.1-SNAPSHOT</version>
+    <version>8.0.1</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core</artifactId>
--- a/main/plugins/org.talend.core/src/main/java/brandingmessages_fr.properties
+++ b/main/plugins/org.talend.core/src/main/java/brandingmessages_fr.properties
@@ -0,0 +1,4 @@
+productfullname=Talend
+productshortname=Talend
+loginimagehigh=icons/login_h.jpg
+loginimageleft=icons/login_v.jpg
--- a/main/plugins/org.talend.core/src/main/java/brandingmessages_ja.properties
+++ b/main/plugins/org.talend.core/src/main/java/brandingmessages_ja.properties
@@ -0,0 +1,4 @@
+productfullname=Talend
+productshortname=Talend
+loginimagehigh=icons/login_h.jpg
+loginimageleft=icons/login_v.jpg
--- a/main/plugins/org.talend.core/src/main/java/brandingmessages_zh_CN.properties
+++ b/main/plugins/org.talend.core/src/main/java/brandingmessages_zh_CN.properties
@@ -0,0 +1,4 @@
+productfullname=Talend
+productshortname=Talend
+loginimagehigh=icons/login_h.jpg
+loginimageleft=icons/login_v.jpg
--- a/main/plugins/org.talend.core/src/main/java/messages_fr.properties
+++ b/main/plugins/org.talend.core/src/main/java/messages_fr.properties
@@ -61,7 +61,6 @@ EComponentCategory_properties=Propri\u00E9t\u00E9s
 EComponentCategory_rulerAndGrid=Rulers & Grid
 EComponentCategory_sqlTemplate=Mod\u00E8le SQL
 EComponentCategory_statsAndLogs=Stats & Logs
-EComponentCategory_svnHistory=Historique SVN
 EComponentCategory_technical=Technique
 EComponentCategory_version=Version
 EComponentCategory_headerFooter=En-t\u00EAte/Pied de page
--- a/main/plugins/org.talend.core/src/main/java/messages_ja.properties
+++ b/main/plugins/org.talend.core/src/main/java/messages_ja.properties
@@ -40,11 +40,11 @@ CorePreferencePage.componentDefaultFileDirectory=\u30B3\u30F3\u30DD\u30FC\u30CD\
 CorePreferencePage.groupBySource=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u5185\u3067[\u30BD\u30FC\u30B9\u3054\u3068\u306B\u30B0\u30EB\u30FC\u30D7\u30A1\u5316]
 CorePreferencePage.iReportPath=iReport\u30D1\u30B9
 CorePreferencePage.alwaysWelcome=\u8D77\u52D5\u6642\u306B\u30A6\u30A7\u30EB\u30AB\u30E0\u30D3\u30E5\u30FC\u3092\u5E38\u306B\u8868\u793A
-CorePreferencePage.javaInterpreter=&Java interpreter
+CorePreferencePage.javaInterpreter=Java\u30A4\u30F3\u30BF\u30FC\u30D7\u30EA\u30BF\u30FC(&J)
 CorePreferencePage.perlInterpreter=Perl\u30A4\u30F3\u30BF\u30FC\u30D7\u30EA\u30BF\u30FC
 CorePreferencePage.previewLimit=\u30D7\u30EC\u30D3\u30E5\u30FC\u5236\u9650
 CorePreferencePage.runInMultiThread=\u30DE\u30EB\u30C1\u30B9\u30EC\u30C3\u30C9\u5B9F\u884C(\u30B8\u30E7\u30D6\u751F\u6210\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024)
-CorePreferencePage.temporaryFiles=&\u4E00\u6642\u30D5\u30A1\u30A4\u30EB
+CorePreferencePage.temporaryFiles=\u4E00\u6642\u30D5\u30A1\u30A4\u30EB(&T)
 ECodeLanguage.unknowLanguage=\u672A\u77E5\u306E\u8A00\u8A9E
 EComponentCategory_advanceSetting=\u8A73\u7D30\u8A2D\u5B9A
 EComponentCategory_appearance=\u5916\u89B3
@@ -58,10 +58,9 @@ EComponentCategory_extra=\u8FFD\u52A0
 EComponentCategory_logs=\u30ED\u30B0
 EComponentCategory_main=\u30E1\u30A4\u30F3
 EComponentCategory_properties=\u30D7\u30ED\u30D1\u30C6\u30A3
-EComponentCategory_rulerAndGrid=Rulers & Grid
+EComponentCategory_rulerAndGrid=\u30EB\u30FC\u30E9\u30FC\u3068\u30B0\u30EA\u30C3\u30C9
 EComponentCategory_sqlTemplate=SQL\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
 EComponentCategory_statsAndLogs=\u7D71\u8A08\u3068\u30ED\u30B0
-EComponentCategory_svnHistory=SVN\u5C65\u6B74
 EComponentCategory_technical=\u30C6\u30AF\u30CB\u30AB\u30EB
 EComponentCategory_version=\u30D0\u30FC\u30B8\u30E7\u30F3
 EComponentCategory_headerFooter=\u30D8\u30C3\u30C0\u30FC\uFF0F\u30D5\u30C3\u30BF\u30FC
@@ -88,7 +87,7 @@ EConnectionType.parallelize=\u4E26\u5217
 EMetadataEncoding.Arabic=\u30A2\u30E9\u30D3\u30A2\u8A9E
 EMetadataEncoding.Big5=Big5(\u7E41\u4F53\u5B57)
 EMetadataEncoding.Cyrillic=\u30AD\u30EA\u30EB\u8A9E
-EMetadataEncoding.EUC_CN=\u7C21\u4F53\u5B57\u4E2D\u56FD\u8A9E\uFF08Unix\u30B3\u30FC\u30C9CN\u62E1\u5F35\uFF09
+EMetadataEncoding.EUC_CN=\u7C21\u4F53\u5B57\u4E2D\u56FD\u8A9E(Unix\u30B3\u30FC\u30C9CN\u62E1\u5F35)
 EMetadataEncoding.GB18030=\u4E2D\u56FD\u8A9E\u56FD\u5BB6\u57FA\u6E96
 EMetadataEncoding.GB2312=\u4E2D\u56FD\u8A9E
 EMetadataEncoding.Greek=\u30AE\u30EA\u30B7\u30E3\u8A9E
@@ -208,13 +207,13 @@ UpdatesConstants.JobVersion=\u30B8\u30E7\u30D6\u30D0\u30FC\u30B8\u30E7\u30F3
 ProjectSettingsWizard.EditProjectPageTitle=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u7DE8\u96C6
 MultiStringSelectionDialog.nameEmpty=\u540D\u524D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 PromptDialog.stringTip=\u5165\u529B\u30C6\u30AD\u30B9\u30C8\u3092\u4E00\u91CD\u5F15\u7528\u7B26\u3067\u56F2\u3080\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-ApplicationActionBarAdvisor.menuFileLabel=&\u30D5\u30A1\u30A4\u30EB
-ApplicationActionBarAdvisor.menuEditLabel=&\u7DE8\u96C6
-ApplicationActionBarAdvisor.navigateLabel=&\u30CA\u30D3\u30B2\u30FC\u30C8
-ApplicationActionBarAdvisor.gotoLabel=&Go to
-ApplicationActionBarAdvisor.projectLabel=&Project
-ApplicationActionBarAdvisor.menuWindowLabel=&Window
-ApplicationActionBarAdvisor.menuHelpLabel=&\u30D8\u30EB\u30D7
+ApplicationActionBarAdvisor.menuFileLabel=\u30D5\u30A1\u30A4\u30EB(&F)
+ApplicationActionBarAdvisor.menuEditLabel=\u7DE8\u96C6(&E)
+ApplicationActionBarAdvisor.navigateLabel=\u30CA\u30D3\u30B2\u30FC\u30C8(&N)
+ApplicationActionBarAdvisor.gotoLabel=\u79FB\u52D5(&G)
+ApplicationActionBarAdvisor.projectLabel=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8(&P)
+ApplicationActionBarAdvisor.menuWindowLabel=\u30A6\u30A3\u30F3\u30C9\u30A6(&W)
+ApplicationActionBarAdvisor.menuHelpLabel=\u30D8\u30EB\u30D7(&H)
 BusinessAppearanceComposite.textAlignmentGroup=\u30C6\u30AD\u30B9\u30C8\u306E\u914D\u7F6E
 BusinessAppearanceComposite.textAlignment.horizontal=\u6C34\u5E73
 BusinessAppearanceComposite.textAlignment.vertical=\u5782\u76F4
@@ -309,11 +308,11 @@ ConnectionParameterName.PasswordLabel=\u30D1\u30B9\u30EF\u30FC\u30C9
 ConnectionParameterName.DbfileLabel=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
 ConnectionParameterName.DbPathLabel=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30EB\u30FC\u30C8\u30D1\u30B9
 ImportExternalJarAction.title=\u5916\u90E8JAR\u3092\u8FFD\u52A0
-ActionBarBuildHelper.CloseEditorAction_text=&Close
+ActionBarBuildHelper.CloseEditorAction_text=\u9589\u3058\u308B(&C)
 ActionBarBuildHelper.CloseEditorAction_toolTip=\u9589\u3058\u308B
-ActionBarBuildHelper.CloseAllAction_text=C&lose All
+ActionBarBuildHelper.CloseAllAction_text=\u3059\u3079\u3066\u9589\u3058\u308B(&L)
 ActionBarBuildHelper.CloseAllAction_toolTip=\u3059\u3079\u3066\u9589\u3058\u308B
-ActionBarBuildHelper.SaveAll_text=Sav&e All
+ActionBarBuildHelper.SaveAll_text=\u3059\u3079\u3066\u4FDD\u5B58(&E)
 ActionBarBuildHelper.SaveAll_toolTip=\u3059\u3079\u3066\u4FDD\u5B58
 ContextOrderProperty.BuiltInComment=\u7D44\u307F\u8FBC\u307F\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u5909\u6570
 ContextOrderProperty.RepositoryComment=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u304B\u3089\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u5909\u6570:
--- a/main/plugins/org.talend.core/src/main/java/messages_zh_CN.properties
+++ b/main/plugins/org.talend.core/src/main/java/messages_zh_CN.properties
@@ -61,7 +61,6 @@ EComponentCategory_properties=\u5C5E\u6027
 EComponentCategory_rulerAndGrid=\u6807\u5C3A\u548C\u7F51\u683C
 EComponentCategory_sqlTemplate=SQL \u6A21\u677F
 EComponentCategory_statsAndLogs=\u7EDF\u8BA1\u53CA\u65E5\u5FD7
-EComponentCategory_svnHistory=SVN \u5386\u53F2\u8BB0\u5F55
 EComponentCategory_technical=\u6280\u672F
 EComponentCategory_version=\u7248\u672C
 EComponentCategory_headerFooter=\u6587\u4EF6\u5934/\u6587\u4EF6\u5C3E
--- a/main/plugins/org.talend.core/src/main/java/org/talend/core/CoreService.java
+++ b/main/plugins/org.talend.core/src/main/java/org/talend/core/CoreService.java
@@ -519,6 +519,7 @@ public class CoreService implements ICoreService {
        List<IComponentInstallerTask> tasks = ComponentInstallerTaskRegistryReader.getInstance().getTasks();
        tasks.forEach(task -> {
            try {
+                ExceptionHandler.logDebug(task.getClass().getCanonicalName() + ", " + task.getComponentType() + "" + task.getComponentGAV().toString());
                task.install(monitor);
            } catch (Exception e) {
                ExceptionHandler.process(e);
--- a/main/plugins/org.talend.core/src/main/java/org/talend/core/model/metadata/query/GenerateQueryFactory.java
+++ b/main/plugins/org.talend.core/src/main/java/org/talend/core/model/metadata/query/GenerateQueryFactory.java
@@ -63,7 +63,6 @@ public final class GenerateQueryFactory {
        case IBMDB2ZOS:
        case MYSQL:
        case AMAZON_AURORA:
-        case INGRES:
            return new NonDatabaseDefaultQueryGenerator(dbType);
        case ORACLE_OCI:
        case ORACLEFORSID:
@@ -81,7 +80,6 @@ public final class GenerateQueryFactory {
        case HSQLDB_SERVER:
        case HSQLDB_WEBSERVER:
        case INFORMIX:
-        case INTERBASE:
        case JAVADB:
        case JAVADB_DERBYCLIENT:
        case JAVADB_EMBEDED:
@@ -89,7 +87,6 @@ public final class GenerateQueryFactory {
        case MAXDB:
        case MSODBC:
        case MSSQL:
-        case PARACCEL:
        case REDSHIFT:
        case REDSHIFT_SSO:
        case SQLITE:
--- a/main/plugins/org.talend.core/src/main/java/org/talend/core/model/utils/ComponentInstallerTaskRegistryReader.java
+++ b/main/plugins/org.talend.core/src/main/java/org/talend/core/model/utils/ComponentInstallerTaskRegistryReader.java
@@ -21,6 +21,7 @@ import java.util.stream.Collectors;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.SafeRunner;
 import org.osgi.framework.FrameworkUtil;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.utils.RegistryReader;

 /**
@@ -78,6 +79,7 @@ public class ComponentInstallerTaskRegistryReader extends RegistryReader {
            readRegistry();
            Collections.sort(ret, new TaskComparator());
        }
+        ExceptionHandler.logDebug("ComponentInstallerTaskRegistryReader, num of tasks: " + ret.size());
        return ret;
    }

--- a/main/plugins/org.talend.core/src/main/java/org/talend/core/model/utils/TalendTextUtils.java
+++ b/main/plugins/org.talend.core/src/main/java/org/talend/core/model/utils/TalendTextUtils.java
@@ -614,7 +614,7 @@ public class TalendTextUtils {
     */
    private static boolean isPSQLSimilar(EDatabaseTypeName name) {
        return !name.equals(EDatabaseTypeName.PSQL) && !name.equals(EDatabaseTypeName.PLUSPSQL)
-                && !name.equals(EDatabaseTypeName.GREENPLUM) && !name.equals(EDatabaseTypeName.PARACCEL);
+                && !name.equals(EDatabaseTypeName.GREENPLUM);
    }

    /**
--- a/main/plugins/org.talend.core/src/main/java/org/talend/core/services/ICoreTisService.java
+++ b/main/plugins/org.talend.core/src/main/java/org/talend/core/services/ICoreTisService.java
@@ -87,7 +87,7 @@ public interface ICoreTisService extends IService {
    boolean hasNewPatchInPatchesFolder();

    boolean isDefaultLicenseAndProjectType();
-
+    
    void refreshPatchesFolderCache();

    static ICoreTisService get() {
--- a/Show More
+++ b/Show More