Merge branch 'maintenance/8.0' of https://github.com/Talend/tcommon-studio-se into tuj/SPL33

Fix TUP-36723 can not list project when use old way to fetch from token
https://jira.talendforge.org/browse/TUP-36723

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="1.69.0" match="greaterOrEqual"/>
+    <import plugin="org.bouncycastle.bcprov" version="1.70.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"/>

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/ColorConstants.java

@@ -28,11 +28,21 @@ public interface ColorConstants {
 
     static final Color YELLOW_COLOR = new Color(null, 255, 173, 37);// 254, 182, 84
 
-    static final Color RED_COLOR = new Color(null, new RGB(204,87,89));// 255
+    static final Color RED_COLOR = new Color(null, new RGB(204, 87, 89));// 255
 
     static final Color VERTICAL_SEPERATOR_LINE_COLOR = new Color(null, 162, 179, 195);
 
     static final Color LOCHMARA_COLOR = new Color(null, 6, 117, 193);
 
     static final Color WATHET_COLOR = new Color(null, 135, 206, 235);
+
+    static final Color INFO_COLOR = new Color(null, 205, 227, 242);
+//    static final Color INFO_COLOR = YELLOW_GREEN_COLOR;
+
+    static final Color WARN_COLOR = new Color(null, 252, 230, 217);
+
+    static final Color ERR_COLOR = new Color(null, 255, 235, 235);
+
+    static final Color SUCCEED_COLOR = new Color(null, 221, 242, 217);
+
 }

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages_ja.properties

@@ -106,7 +106,7 @@ SWTCalendarWithTime.contentNoon=\u5348\u5F8C
 SWTCalendarWithTime.contentNow=\u73FE\u5728
 SWTCalendarWithTime.contnetSec=\u79D2:
 TableViewerCreator.CallMethod.ErrorMsg=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u3001createTable()\u3092\u65E2\u306B\u547C\u3073\u51FA\u3057\u3066\u3044\u308B\u5834\u5408\u306E\u307F\u547C\u3073\u51FA\u305B\u307E\u3059
-TableViewerCreator.CellModifier.ExError=\u73FE\u5728\u306ECellModifier\u306F\u3053\u306E\u64CD\u4F5C\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002\n\u3053\u306E\u6A5F\u80FD\u3092\u4F7F\u3046\u306B\u306F\u3001'{0}'\u304B\u62E1\u5F35\u30AF\u30E9\u30B9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
+TableViewerCreator.CellModifier.ExError=\u73FE\u5728\u306ECellModifier\u306F\u3053\u306E\u64CD\u4F5C\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002 \n \u3053\u306E\u6A5F\u80FD\u3092\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001'{0}'\u304B\u3001\u62E1\u5F35\u3059\u308B\u30AF\u30E9\u30B9\u3092\u4F7F\u3044\u307E\u3059\u3002
 TableViewerCreator.columnNoIBeanProperty=\u30AB\u30E9\u30E0'{0}' ('{1}')\u306B\u306FCellEditor\u30BB\u30C3\u30C8\u304C\u3042\u308A\u307E\u3059\u304C\u3001IBeanPropertyAccessors\u304C\u3042\u308A\u307E\u305B\u3093!
 TableViewerCreator.columnNullId=\u30AB\u30E9\u30E0'{0}'\u304Cnull\u3067\u3059\uFF01
 TableViewerCreator.IdProperty.AssertMsg=\u30AB\u30E9\u30E0\u306EidProperty\u306E\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3001idProperty\u306F\uFF11\u3064\u306E\u30C6\u30FC\u30D6\u30EB\u3067\u30E6\u30CB\u30FC\u30AF\u3067\u306A\u304F\u3066\u306F\u306A\u308A\u307E\u305B\u3093\u3002
@@ -121,11 +121,11 @@ ModelSelectionDialog.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30D7\u30ED\u30D1\u30C6\u3
 ModelSelectionDialog.ViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
 ModelSelectionDialog.newViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A
 ModelSelectionDialog.ViewQuery=\u30AF\u30A8\u30EA\u30FC\u3046\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
-ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002
+ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
 SSLConfirmDialog.KeyStore=KeyStore\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
 SSLConfirmDialog.TrustStore=TrustStore\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
 SSLConfirmDialog.Password=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u3044\u304F\u3064\u304B\u306E\u8A2D\u5B9A\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3002\n\u6CE8: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u306B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306E\u8AA4\u308A\u304C\u539F\u56E0\u3067\u3059\u3002
+FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u4E00\u90E8\u306E\u8A2D\u5B9A\u3092\u5909\u66F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u6CE8: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u7684\u306B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306E\u8AA4\u308A\u304C\u539F\u56E0\u3067\u3059\u3002
 GlobalServiceRegister.ServiceNotRegistered=\u30B5\u30FC\u30D3\u30B9{0}\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.title=XML\u306B\u89E3\u6790\u3067\u304D\u307E\u305B\u3093.
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.msg=\u3053\u306E\u5F62\u5F0F\u3067\u306F\u3001XML\u306B\u89E3\u6790\u3067\u304D\u307E\u305B\u3093.

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/i18n/messages_zh_CN.properties

@@ -106,7 +106,7 @@ SWTCalendarWithTime.contentNoon=\u4E2D\u5348
 SWTCalendarWithTime.contentNow=\u73B0\u5728
 SWTCalendarWithTime.contnetSec=\u79D2:
 TableViewerCreator.CallMethod.ErrorMsg=\u53EA\u6709\u60A8\u5DF2\u7ECF\u8C03\u7528\u4E86 createTable() \u65B9\u6CD5\u540E\uFF0C\u624D\u80FD\u8C03\u7528\u6B64\u65B9\u6CD5\u3002
-TableViewerCreator.CellModifier.ExError=\u5F53\u524D CellModifier \u4E0D\u652F\u6301\u6B64\u64CD\u4F5C\u3002\n \u4F7F\u7528 '{0}' \u6216\u80FD\u591F\u5BF9\u5176\u8FDB\u884C\u6269\u5C55\u7684\u7C7B\u6765\u4F7F\u7528\u6B64\u529F\u80FD
+TableViewerCreator.CellModifier.ExError=\u5F53\u524D CellModifier \u4E0D\u652F\u6301\u6B64\u64CD\u4F5C\u3002 \n \u4F7F\u7528 '{0}' \u6216\u6269\u5C55\u5B83\u7684\u7C7B\u6765\u4F7F\u7528\u6B64\u529F\u80FD
 TableViewerCreator.columnNoIBeanProperty=\u5217 '{0}' ('{1}') \u8BBE\u7F6E\u4E86 CellEditor\uFF0C\u4F46\u6CA1\u6709 IBeanPropertyAccessors\uFF01
 TableViewerCreator.columnNullId=\u5217 '{0}' \u7684 id \u4E3A null\uFF01
 TableViewerCreator.IdProperty.AssertMsg=\u4F60\u5FC5\u987B\u6539\u53D8\u5176\u4E2D\u4E00\u4E2A\u5217\u7684 idProperty\uFF0C\u4E00\u4E2A\u8868\u4E2D\u7684\u6BCF\u4E2A\u5217\u7684 idProperty \u5FC5\u987B\u552F\u4E00\u3002
@@ -114,7 +114,7 @@ TableViewerCreator.Table.BeNull=\u8868\u4E3A null
 TableViewerCreator.TableColumn.AssertMsg=TableEditorColumn \u7684 idProperty \u4E3A '{0}' \u7684 TableColumn \u6CA1\u6709\u6B63\u786E\u7684 Table \u7236\u9879
 TreeToTablesLinker.Type.Unsupported=\u4E0D\u652F\u6301\u8FD9\u79CD\u7C7B\u578B\u7684 currentControl
 commons.error=\u9519\u8BEF
-exception.errorOccured=\u53D1\u751F\u9519\u8BEF ({0})\u3002\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
+exception.errorOccured=\u51FA\u73B0\u9519\u8BEF ({0})\u3002\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
 ModelSelectionDialog.Message=\u8BF7\u9009\u62E9\u4E00\u4E2A\u9009\u9879\u6216\u53D6\u6D88\u3002
 ModelSelectionDialog.Option=\u9009\u9879
 ModelSelectionDialog.BuiltIn=\u66F4\u6539\u4E3A\u5185\u7F6E\u5C5E\u6027\u3002
@@ -125,7 +125,7 @@ ModelSelectionDialog.Update=\u66F4\u65B0\u5B58\u50A8\u5E93\u8FDE\u63A5\u3002
 SSLConfirmDialog.KeyStore=\u8BF7\u8F93\u5165\u5BC6\u94A5\u5E93
 SSLConfirmDialog.TrustStore=\u8BF7\u8F93\u5165\u4FE1\u4EFB\u5E93
 SSLConfirmDialog.Password=\u8BF7\u8F93\u5165\u5BC6\u7801
-FileStep2.previewFailure=\u9884\u89C8\u9519\u8BEF\u3002\u987B\u6539\u53D8\u4E00\u4E9B\u8BBE\u7F6E\u3002\n\u6CE8\u610F\uFF1A\u9884\u89C8\u9519\u8BEF\u53EF\u80FD\u662F\u56E0\u4E3A\u9519\u8BEF\u7684\u7F16\u7801\u8BBE\u7F6E\u9020\u6210\u7684\u3002
+FileStep2.previewFailure=\u9884\u89C8\u9519\u8BEF\u3002\u5FC5\u987B\u66F4\u6539\u67D0\u4E9B\u8BBE\u7F6E\u3002\n\u6CE8\u610F\uFF1A\u9884\u89C8\u9519\u8BEF\u901A\u5E38\u662F\u7531\u4E8E\u9519\u8BEF\u7684\u7F16\u7801\u8BBE\u7F6E\u5BFC\u81F4\u3002
 GlobalServiceRegister.ServiceNotRegistered=\u670D\u52A1 {0} \u8FD8\u672A\u6CE8\u518C\u3002
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.title=xml \u65E0\u6CD5\u89E3\u6790\u3002
 MessageBoxExceptionHandler.showMessageForSchemaImportXml.unParseXML.msg=xml \u65E0\u6CD5\u4EE5\u8FD9\u79CD\u683C\u5F0F\u89E3\u6790\u3002

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/EImage.java

@@ -39,6 +39,10 @@ public enum EImage implements IImage {
     EDIT_ICON("/icons/write_obj.gif"), //$NON-NLS-1$
     READ_ICON("/icons/read_obj.gif"), //$NON-NLS-1$
 
+    QUESTION_ICON("/icons/question.gif"), //$NON-NLS-1$
+
+    HELP_ICON("/icons/help.png"), //$NON-NLS-1$
+
     CREATE_CONNECTION_ICON("/icons/connection.gif"), //$NON-NLS-1$
 
     RESET_DBTYPES_ICON("/icons/reset_dbtypes.jpg"), //$NON-NLS-1$

main/plugins/org.talend.commons.runtime/pom_server.xml

@@ -95,10 +95,9 @@
             <version>2.12.0</version>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.16</version>
-            <type>bundle</type>
+            <groupId>ch.qos.reload4j</groupId>
+            <artifactId>reload4j</artifactId>
+            <version>1.2.19</version>
         </dependency>
     </dependencies>
 

main/plugins/org.talend.commons.runtime/src/org/talend/commons/CommonsPlugin.java

@@ -58,10 +58,14 @@ public class CommonsPlugin implements BundleActivator {
     // TESB-17856: For commandline builds ESB Micorservice bundle
     private static boolean isESBMicorservice = false;
 
+    private static Boolean isJunitWorking;
+
     private static Boolean isDevMode = null;
 
     private static ServiceTracker proxyTracker;
 
+    private static Boolean isDebugP2 = null;
+
     public static boolean isWorkbenchCreated() {
         return isWorkbenchCreated;
     }
@@ -124,6 +128,17 @@ public class CommonsPlugin implements BundleActivator {
         }
     }
 
+    public static boolean isDebugP2() {
+        try {
+            if (isDebugP2 == null) {
+                isDebugP2 = Boolean.getBoolean("talend.studio.lite.p2.debug");
+            }
+            return isDebugP2;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
     public static boolean isDebugMode() {
         return Boolean.getBoolean("talendDebug") //$NON-NLS-1$
                 || ArrayUtils.contains(Platform.getApplicationArgs(), TalendDebugHandler.TALEND_DEBUG);
@@ -137,6 +152,35 @@ public class CommonsPlugin implements BundleActivator {
         return "org.talend.rcp.branding.tuj.product".equals(Platform.getProduct().getId()); //$NON-NLS-1$
     }
 
+    public static boolean isJunitWorking() {
+        if (isJunitWorking == null) {
+            try {
+                String[] args = Platform.getCommandLineArgs();
+                String applicationId = null;
+
+                for (int i = 0; i < args.length - 1; i++) {
+                    if (args[i].equalsIgnoreCase("-application")) { //$NON-NLS-1$
+                        applicationId = args[i + 1];
+                    }
+                }
+
+                if (applicationId != null
+                        && (applicationId.equals("org.eclipse.swtbot.eclipse.junit.headless.swtbottestapplication") //$NON-NLS-1$
+                                || applicationId.equals("org.eclipse.pde.junit.runtime.uitestapplication"))) { //$NON-NLS-1$
+                    isJunitWorking = true;
+                } else {
+                    isJunitWorking = false;
+                }
+            } catch (Throwable e) {
+                isJunitWorking = false;
+            }
+        }
+        if (isJunitWorking == null) {
+            isJunitWorking = false;
+        }
+        return isJunitWorking;
+    }
+
     /**
      * Answer the file associated with name. This handles the case of running as a plugin and running standalone which
      * happens during testing.

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/service/ITaCoKitService.java

@@ -46,6 +46,12 @@ public interface ITaCoKitService {
 
     boolean isTaCoKitType(Object repoType);
 
+    Object getDatastoreFromDataset(Object repositoryViewObject);
+
+    String getParentItemIdFromItem(Object Item);
+
+    boolean isValueSelectionParameter(Object parameter);
+
     public static ITaCoKitService getInstance() {
         BundleContext bc = FrameworkUtil.getBundle(ITaCoKitService.class).getBundleContext();
         Collection<ServiceReference<ITaCoKitService>> tacokitServices = Collections.emptyList();

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java

@@ -55,6 +55,11 @@ public class NetworkUtil {
     private static final int DEFAULT_NEXUS_TIMEOUT = 20000;// same as preference value
 
     public static final String ORG_TALEND_DESIGNER_CORE = "org.talend.designer.core"; //$NON-NLS-1$
+    
+    /*
+     * see ITalendCorePrefConstants.PERFORMANCE_TAC_READ_TIMEOUT
+     */
+    private static final String PERFORMANCE_TAC_READ_TIMEOUT = "PERFORMANCE_TAC_READ_TIMEOUT"; //$NON-NLS-1$
 
     private static final String PROP_DISABLEDSCHEMES_USE_DEFAULT = "talend.studio.jdk.http.auth.tunneling.disabledSchemes.useDefault";
 
@@ -149,10 +154,10 @@ public class NetworkUtil {
     }
 
     public static int getNexusTimeout() {
-        int timeout = DEFAULT_NEXUS_TIMEOUT;
+        int timeout = Integer.getInteger("nexus.timeout.min", DEFAULT_NEXUS_TIMEOUT);
         try {
             IEclipsePreferences node = InstanceScope.INSTANCE.getNode(ORG_TALEND_DESIGNER_CORE);
-            timeout = node.getInt(ITalendNexusPrefConstants.NEXUS_TIMEOUT, DEFAULT_NEXUS_TIMEOUT);
+            timeout = Math.max(timeout, node.getInt(PERFORMANCE_TAC_READ_TIMEOUT, 0) * 1000);
         } catch (Throwable e) {
             ExceptionHandler.process(e);
         }

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/system/EclipseCommandLine.java

@@ -88,13 +88,17 @@ public class EclipseCommandLine {
     static public final String TALEND_CONTINUE_LOGON = "-talendContinueLogon";
 
     static public final String TALEND_CONTINUE_UPDATE = "-talendContinueUpdate";
+    
+    static public final String TALEND_CLEAN_M2 = "-talendCleanM2";
 
     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 ARG_PROJECT = "-project";
+    
     static public final String LOGIN_ONLINE_UPDATE = "--loginOnlineUpdate";
 
     static public final String ARG_TALEND_BUNDLES_CLEANED = "-talend.studio.bundles.cleaned"; //$NON-NLS-1$

main/plugins/org.talend.commons.ui/src/main/java/messages_ja.properties

@@ -102,7 +102,7 @@ SWTCalendarWithTime.contentNoon=\u5348\u5F8C
 SWTCalendarWithTime.contentNow=\u73FE\u5728
 SWTCalendarWithTime.contnetSec=\u79D2:
 TableViewerCreator.CallMethod.ErrorMsg=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u3001createTable()\u3092\u65E2\u306B\u547C\u3073\u51FA\u3057\u3066\u3044\u308B\u5834\u5408\u306E\u307F\u547C\u3073\u51FA\u305B\u307E\u3059
-TableViewerCreator.CellModifier.ExError=\u73FE\u5728\u306ECellModifier\u306F\u3053\u306E\u64CD\u4F5C\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002\n\u3053\u306E\u6A5F\u80FD\u3092\u4F7F\u3046\u306B\u306F\u3001'{0}'\u304B\u62E1\u5F35\u30AF\u30E9\u30B9\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
+TableViewerCreator.CellModifier.ExError=\u73FE\u5728\u306ECellModifier\u306F\u3053\u306E\u64CD\u4F5C\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002 \n \u3053\u306E\u6A5F\u80FD\u3092\u4F7F\u7528\u3059\u308B\u306B\u306F\u3001'{0}'\u304B\u3001\u62E1\u5F35\u3059\u308B\u30AF\u30E9\u30B9\u3092\u4F7F\u3044\u307E\u3059\u3002
 TableViewerCreator.columnNoIBeanProperty=\u30AB\u30E9\u30E0'{0}' ('{1}')\u306B\u306FCellEditor\u30BB\u30C3\u30C8\u304C\u3042\u308A\u307E\u3059\u304C\u3001IBeanPropertyAccessors\u304C\u3042\u308A\u307E\u305B\u3093!
 TableViewerCreator.columnNullId=\u30AB\u30E9\u30E0'{0}'\u304Cnull\u3067\u3059\uFF01
 TableViewerCreator.IdProperty.AssertMsg=\u30AB\u30E9\u30E0\u306EidProperty\u306E\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3001idProperty\u306F\uFF11\u3064\u306E\u30C6\u30FC\u30D6\u30EB\u3067\u30E6\u30CB\u30FC\u30AF\u3067\u306A\u304F\u3066\u306F\u306A\u308A\u307E\u305B\u3093\u3002
@@ -116,8 +116,8 @@ ModelSelectionDialog.Option=\u30AA\u30D7\u30B7\u30E7\u30F3
 ModelSelectionDialog.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u5909\u66F4\u3057\u307E\u3059\u3002
 ModelSelectionDialog.ViewSchema=\u30B9\u30AD\u30FC\u30DE\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
 ModelSelectionDialog.ViewQuery=\u30AF\u30A8\u30EA\u30FC\u3046\u3092\u8868\u793A\u3057\u307E\u3059(\u8AAD\u307F\u53D6\u308A\u5C02\u7528)\u3002
-ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u66F4\u65B0\u3057\u307E\u3059\u3002
-FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u3044\u304F\u3064\u304B\u306E\u8A2D\u5B9A\u5909\u66F4\u304C\u5FC5\u8981\u3067\u3059\u3002\n\u6CE8: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u306B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306E\u8AA4\u308A\u304C\u539F\u56E0\u3067\u3059\u3002
+ModelSelectionDialog.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u63A5\u7D9A\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u3002
+FileStep2.previewFailure=\u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u3002\u4E00\u90E8\u306E\u8A2D\u5B9A\u3092\u5909\u66F4\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\u6CE8: \u30D7\u30EC\u30D3\u30E5\u30FC\u30A8\u30E9\u30FC\u306F\u4E00\u822C\u7684\u306B\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u306E\u8AA4\u308A\u304C\u539F\u56E0\u3067\u3059\u3002
 StateComposite.FLL_DB_INFOR=DB\u60C5\u5831\u3092\u5165\u529B
 StateComposite.HELP_MESSAGE=\u30D8\u30EB\u30D7\u30E1\u30C3\u30BB\u30FC\u30B8
 StateComposite.MESSAGE1=\u30C0\u30A4\u30CA\u30DF\u30C3\u30AF\u30B8\u30E7\u30D6\u3092\u8A2D\u5B9A\u3057\u3066\u3001\u5165\u529B\u30C6\u30FC\u30D6\u30EB\u306B\u4F9D\u5B58\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u540D\u307E\u305F\u306F\u30C6\u30FC\u30D6\u30EB\u540D\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u3059\u3002

main/plugins/org.talend.commons.ui/src/main/java/messages_zh_CN.properties

@@ -102,7 +102,7 @@ SWTCalendarWithTime.contentNoon=\u4E2D\u5348
 SWTCalendarWithTime.contentNow=\u73B0\u5728
 SWTCalendarWithTime.contnetSec=\u79D2:
 TableViewerCreator.CallMethod.ErrorMsg=\u53EA\u6709\u60A8\u5DF2\u7ECF\u8C03\u7528\u4E86 createTable() \u65B9\u6CD5\u540E\uFF0C\u624D\u80FD\u8C03\u7528\u6B64\u65B9\u6CD5\u3002
-TableViewerCreator.CellModifier.ExError=\u5F53\u524D CellModifier \u4E0D\u652F\u6301\u6B64\u64CD\u4F5C\u3002\n \u4F7F\u7528 '{0}' \u6216\u80FD\u591F\u5BF9\u5176\u8FDB\u884C\u6269\u5C55\u7684\u7C7B\u6765\u4F7F\u7528\u6B64\u529F\u80FD
+TableViewerCreator.CellModifier.ExError=\u5F53\u524D CellModifier \u4E0D\u652F\u6301\u6B64\u64CD\u4F5C\u3002 \n \u4F7F\u7528 '{0}' \u6216\u6269\u5C55\u5B83\u7684\u7C7B\u6765\u4F7F\u7528\u6B64\u529F\u80FD
 TableViewerCreator.columnNoIBeanProperty=\u5217 '{0}' ('{1}') \u8BBE\u7F6E\u4E86 CellEditor\uFF0C\u4F46\u6CA1\u6709 IBeanPropertyAccessors\uFF01
 TableViewerCreator.columnNullId=\u5217 '{0}' \u7684 id \u4E3A null\uFF01
 TableViewerCreator.IdProperty.AssertMsg=\u4F60\u5FC5\u987B\u6539\u53D8\u5176\u4E2D\u4E00\u4E2A\u5217\u7684 idProperty\uFF0C\u4E00\u4E2A\u8868\u4E2D\u7684\u6BCF\u4E2A\u5217\u7684 idProperty \u5FC5\u987B\u552F\u4E00\u3002
@@ -110,14 +110,14 @@ TableViewerCreator.Table.BeNull=\u8868\u4E3A null
 TableViewerCreator.TableColumn.AssertMsg=TableEditorColumn \u7684 idProperty \u4E3A '{0}' \u7684 TableColumn \u6CA1\u6709\u6B63\u786E\u7684 Table \u7236\u9879
 TreeToTablesLinker.Type.Unsupported=\u4E0D\u652F\u6301\u8FD9\u79CD\u7C7B\u578B\u7684 currentControl
 commons.error=\u9519\u8BEF
-exception.errorOccured=\u53D1\u751F\u9519\u8BEF ({0})\u3002\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
+exception.errorOccured=\u51FA\u73B0\u9519\u8BEF ({0})\u3002\n\u8BF7\u67E5\u770B\u65E5\u5FD7\u4EE5\u83B7\u53D6\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\u3002
 ModelSelectionDialog.Message=\u8BF7\u9009\u62E9\u4E00\u4E2A\u9009\u9879\u6216\u53D6\u6D88\u3002
 ModelSelectionDialog.Option=\u9009\u9879
 ModelSelectionDialog.BuiltIn=\u66F4\u6539\u4E3A\u5185\u7F6E\u5C5E\u6027\u3002
 ModelSelectionDialog.ViewSchema=\u67E5\u770B schema (\u53EA\u8BFB)\u3002
 ModelSelectionDialog.ViewQuery=\u67E5\u770B\u67E5\u8BE2 (\u53EA\u8BFB)\u3002
 ModelSelectionDialog.Update=\u66F4\u65B0\u5B58\u50A8\u5E93\u8FDE\u63A5\u3002
-FileStep2.previewFailure=\u9884\u89C8\u9519\u8BEF\u3002\u987B\u6539\u53D8\u4E00\u4E9B\u8BBE\u7F6E\u3002\n\u6CE8\u610F\uFF1A\u9884\u89C8\u9519\u8BEF\u53EF\u80FD\u662F\u56E0\u4E3A\u9519\u8BEF\u7684\u7F16\u7801\u8BBE\u7F6E\u9020\u6210\u7684\u3002
+FileStep2.previewFailure=\u9884\u89C8\u9519\u8BEF\u3002\u5FC5\u987B\u66F4\u6539\u67D0\u4E9B\u8BBE\u7F6E\u3002\n\u6CE8\u610F\uFF1A\u9884\u89C8\u9519\u8BEF\u901A\u5E38\u662F\u7531\u4E8E\u9519\u8BEF\u7684\u7F16\u7801\u8BBE\u7F6E\u5BFC\u81F4\u3002
 StateComposite.FLL_DB_INFOR=\u586B\u5199\u6570\u636E\u5E93\u4FE1\u606F
 StateComposite.HELP_MESSAGE=\u5E2E\u52A9\u6D88\u606F
 StateComposite.MESSAGE1=\u53EF\u4EE5\u521B\u5EFA\u52A8\u6001\u4F5C\u4E1A\u5E76\u8BBE\u7F6E\u4F9D\u8D56\u4E8E\u8F93\u5165\u8868\u7684\u6587\u4EF6\u540D\u6216\u8868\u540D\u3002

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/ITalendWizard.java

@@ -0,0 +1,38 @@
+// ============================================================================
+//
+// 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.commons.ui.swt.dialogs;
+
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.swt.graphics.Color;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface ITalendWizard extends IWizard {
+
+    Color getBackgroundColor();
+
+    Color getForegroundColor();
+
+    int getHorizonPadding();
+
+    int getVerticalPadding();
+
+    int getVerticalMargin();
+
+    int getHorizonMargin();
+
+    boolean hideDefaultMessageArea();
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/ITalendWizardContainer.java

@@ -0,0 +1,26 @@
+// ============================================================================
+//
+// 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.commons.ui.swt.dialogs;
+
+import org.eclipse.jface.dialogs.IDialogPage;
+import org.eclipse.jface.wizard.IWizardContainer2;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface ITalendWizardContainer extends IWizardContainer2 {
+
+    void showMoreInfoLink(IDialogPage page, String name, String link);
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/TalendWizardDialog.java

@@ -0,0 +1,968 @@
+// ============================================================================
+//
+// 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.commons.ui.swt.dialogs;
+
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IDialogPage;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.window.ToolTip;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.ProgressMonitorPart;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.program.Program;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.forms.events.HyperlinkAdapter;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.ui.runtime.ColorConstants;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class TalendWizardDialog extends WizardDialog implements ITalendWizardContainer {
+
+    private boolean useNewStyle = false;
+
+    private Color backgroundColor;
+
+    private Color foregroundColor;
+
+    private static Font titleBigFont;
+
+    private Canvas titleLabelWithAnimation;
+
+    private Canvas messagePanel;
+
+    private Color msgPanelColor = ColorConstants.INFO_COLOR;
+
+    private Composite topPanel;
+
+    private Label errIcon;
+
+    private StyledText errMsgTxt;
+
+    private Hyperlink moreInfoLink;
+
+    private String moreInfoUrl;
+
+    private volatile Thread titleAnimationSchedulerThread;
+
+    private volatile boolean threadShowingMsg = false;
+
+    private Image bigTitleImg;
+
+    private Image smallTitleImg;
+
+    private String title;
+
+    private int messageTopY;
+
+    private volatile double percentage = 1.0;
+
+    private boolean hideMessageArea = false;
+
+    public TalendWizardDialog(Shell parentShell, IWizard newWizard) {
+        super(parentShell, newWizard);
+        useNewStyle = true;
+        if (newWizard instanceof ITalendWizard) {
+            ITalendWizard talendWizard = (ITalendWizard) newWizard;
+            backgroundColor = talendWizard.getBackgroundColor();
+            foregroundColor = talendWizard.getForegroundColor();
+            hideMessageArea = talendWizard.hideDefaultMessageArea();
+        }
+//        this.setTitleAreaColor(new RGB(205, 227, 242));
+    }
+
+    private Thread createTitleAnimationSchedulerThread(boolean showMessage) {
+        return new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                titleAnimationSchedulerThread(showMessage);
+            }
+        }, "title anmimation, show: " + showMessage);
+    }
+
+    private void titleAnimationSchedulerThread(boolean showMessage) {
+        int totalTime = 500;
+        int split = 30;
+        int sleepTime = totalTime / split;
+        double percentPerFrame = 1.0 / split;
+        for (int i = 1; i < split; i++) {
+            double curX = 1 - percentPerFrame * i;
+            double donePercent = Math.sqrt(1 - curX * curX);
+            onTitleAreaRefresh(donePercent, showMessage);
+            if (Thread.currentThread().isInterrupted()) {
+                break;
+            }
+            try {
+                Thread.sleep(sleepTime);
+            } catch (InterruptedException e) {
+                onTitleAnimationInterupted(showMessage);
+                return;
+            }
+        }
+        onTitleAreaRefresh(1.0, showMessage);
+    }
+
+    private void onTitleAnimationInterupted(boolean showMessage) {
+        this.percentage = 1.0;
+    }
+
+    private boolean isHideMessageArea() {
+        return hideMessageArea;
+    }
+
+    private void onTitleAreaRefresh(double donePercent, boolean showMessage) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        topPanel.getDisplay().syncExec(() -> {
+            onTitleAreaRefreshFrame(donePercent, showMessage);
+        });
+    }
+
+    private void onTitleAreaRefreshFrame(double donePercent, boolean showMessage) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        this.percentage = donePercent;
+        sortPanelOrder();
+        if (!showMessage) {
+            messagePanel.setVisible(false);
+        } else {
+            messagePanel.setVisible(true);
+//            errIcon.setVisible(true);
+        }
+        Point size = topPanel.getSize();
+        int totalY = size.y - messageTopY;
+        int y = 0;
+        if (showMessage) {
+            y = messageTopY + (int) ((1.0 - donePercent) * totalY);
+        } else {
+            y = messageTopY + (int) (donePercent * totalY);
+        }
+
+        FormData fd = (FormData) messagePanel.getLayoutData();
+        fd.top = new FormAttachment(0, y);
+        this.titleLabelWithAnimation.redraw();
+        topPanel.layout();
+    }
+
+    public void setNewErrorStyle(boolean newErrStyle) {
+        this.useNewStyle = newErrStyle;
+    }
+
+    @Override
+    protected Control createContents(Composite parent) {
+        if (useNewStyle()) {
+            parent.setBackground(backgroundColor);
+            parent.setForeground(foregroundColor);
+        }
+        Control panel = super.createContents(parent);
+        try {
+            if (useNewStyle()) {
+                sortPanelOrder();
+                workArea.setBackground(backgroundColor);
+                workArea.setForeground(foregroundColor);
+                pageContainer.setBackground(backgroundColor);
+                pageContainer.setForeground(foregroundColor);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return panel;
+    }
+
+    private boolean useNewStyle() {
+        return this.useNewStyle;
+    }
+
+    @Override
+    protected Control createDialogArea(Composite parent) {
+        Composite panel = (Composite) super.createDialogArea(parent);
+        if (useNewStyle()) {
+            this.titleBarSeparator.dispose();
+            this.separator.dispose();
+        }
+        return panel;
+    }
+
+    @Override
+    protected ProgressMonitorPart createProgressMonitorPart(Composite composite, GridLayout pmlayout) {
+        if (useNewStyle()) {
+            composite.setBackground(backgroundColor);
+            composite.setForeground(foregroundColor);
+//            progMonitor.setBackground(backgroundColor);
+//            progMonitor.setForeground(foregroundColor);
+        }
+        ProgressMonitorPart progMonitor = super.createProgressMonitorPart(composite, pmlayout);
+        return progMonitor;
+    }
+
+    @Override
+    protected Control createButtonBar(Composite parent) {
+        if (!useNewStyle()) {
+            return super.createButtonBar(parent);
+        }
+        Composite composite = new Composite(parent, SWT.NONE);
+        composite.setBackground(backgroundColor);
+        composite.setForeground(foregroundColor);
+        GridLayout layout = new GridLayout();
+        layout.marginWidth = 0;
+        layout.marginHeight = 0;
+        layout.horizontalSpacing = 0;
+        composite.setLayout(layout);
+        composite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        composite.setFont(parent.getFont());
+
+        Control helpControl = null;
+        // create help control if needed
+        if (isHelpAvailable()) {
+            helpControl = createHelpControl(composite);
+            ((GridData) helpControl.getLayoutData()).horizontalIndent = convertHorizontalDLUsToPixels(
+                    IDialogConstants.HORIZONTAL_MARGIN);
+        }
+        createButtonsForButtonBar(composite);
+
+        Button helpButton = getButton(IDialogConstants.HELP_ID);
+        Button finishButton = getButton(IDialogConstants.FINISH_ID);
+        Button cancelButton = getButton(IDialogConstants.CANCEL_ID);
+        Button backButton = getButton(IDialogConstants.BACK_ID);
+        Button nextButton = getButton(IDialogConstants.NEXT_ID);
+
+        FormLayout formLayout = new FormLayout();
+        formLayout.marginWidth = getHorizonMargin();
+        formLayout.marginHeight = getVerticalPadding();
+        composite.setLayout(formLayout);
+        final int HORIZON_ALIGN = getHorizonPadding();
+
+        cancelButton.setBackground(backgroundColor);
+        cancelButton.setForeground(foregroundColor);
+        FormData cancelData = new FormData();
+        cancelData.left = new FormAttachment(0);
+        cancelData.top = new FormAttachment(composite, 0, SWT.CENTER);
+        cancelData.width = getButtonWidth(cancelButton);
+        cancelButton.setLayoutData(cancelData);
+
+        Control tmpCtrl = cancelButton;
+
+        if (helpControl != null) {
+            helpControl.setBackground(backgroundColor);
+            helpControl.setForeground(foregroundColor);
+            FormData formData = new FormData();
+            formData.left = new FormAttachment(tmpCtrl, HORIZON_ALIGN, SWT.RIGHT);
+            formData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+            helpControl.setLayoutData(formData);
+            tmpCtrl = helpControl;
+        }
+        if (helpButton != null) {
+            helpButton.setBackground(backgroundColor);
+            helpButton.setForeground(foregroundColor);
+            FormData formData = new FormData();
+            formData.left = new FormAttachment(tmpCtrl, HORIZON_ALIGN, SWT.RIGHT);
+            formData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+            formData.width = getButtonWidth(helpButton);
+            helpButton.setLayoutData(formData);
+            tmpCtrl = helpButton;
+        }
+        finishButton.setBackground(backgroundColor);
+        finishButton.setForeground(foregroundColor);
+        FormData finishData = new FormData();
+        finishData.right = new FormAttachment(100);
+        finishData.top = new FormAttachment(composite, 0, SWT.CENTER);
+        finishData.width = getButtonWidth(finishButton);
+        finishButton.setLayoutData(finishData);
+        tmpCtrl = finishButton;
+
+        if (nextButton != null) {
+            nextButton.setBackground(backgroundColor);
+            nextButton.setForeground(foregroundColor);
+            FormData nextData = new FormData();
+            Composite nextParentCtrl = nextButton.getParent();
+            nextParentCtrl.setBackground(backgroundColor);
+            nextParentCtrl.setForeground(foregroundColor);
+            nextData.right = new FormAttachment(tmpCtrl, -HORIZON_ALIGN, SWT.LEFT);
+            nextData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+            nextParentCtrl.setLayoutData(nextData);
+        }
+        if (backButton != null) {
+            backButton.setBackground(backgroundColor);
+            backButton.setForeground(foregroundColor);
+        }
+
+        return composite;
+    }
+
+    private int getButtonWidth(Button btn) {
+        int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
+        Point minSize = btn.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+        return Math.max(widthHint, minSize.x);
+    }
+
+    @Override
+    protected Control createTitleArea(Composite parent) {
+        Control titleCtrl = null;
+        if (useNewStyle()) {
+            final int horizonPadding = getHorizonPadding();
+            final int horizonMargin = getHorizonMargin();
+            final int verticalPadding = getVerticalPadding();
+            final int msgMargin = getMargin();
+            Control oldTitleArea = super.createTitleArea(parent);
+            topPanel = new Composite(parent, SWT.NONE);
+            titleCtrl = topPanel;
+//            topPanel.setBackground(ColorConstants.RED_COLOR);
+            topPanel.setBackground(backgroundColor);
+            topPanel.setForeground(foregroundColor);
+            FormData topPanelFd = new FormData();
+            topPanelFd.top = new FormAttachment(0);
+            topPanelFd.left = new FormAttachment(0);
+            topPanelFd.right = new FormAttachment(100);
+//            topPanelFd.bottom = new FormAttachment(oldTitleArea, 0, SWT.BOTTOM);
+            Label tmpLabel = new Label(parent, SWT.NONE);
+//            tmpLabel.setFont(getTitleBigFont());
+            tmpLabel.setFont(JFaceResources.getBannerFont());
+            tmpLabel.setText("Test");
+            tmpLabel.pack();
+            Point size = tmpLabel.getSize();
+            tmpLabel.setFont(null);
+            tmpLabel.setText("Test");
+            tmpLabel.pack();
+            Point errSize = tmpLabel.getSize();
+            tmpLabel.dispose();
+            if (isHideMessageArea()) {
+                topPanelFd.height = 0;
+            } else {
+                topPanelFd.height = verticalPadding + size.y + verticalPadding + errSize.y + msgMargin * 2;
+            }
+            topPanel.setLayoutData(topPanelFd);
+            topPanel.setLayout(new FormLayout());
+//            sortPanelOrder();
+
+            titleLabelWithAnimation = new Canvas(topPanel, SWT.DOUBLE_BUFFERED);
+            titleLabelWithAnimation.addPaintListener(new PaintListener() {
+
+                @Override
+                public void paintControl(PaintEvent e) {
+                    drawTitle(e);
+                }
+            });
+            titleLabelWithAnimation.setBackground(backgroundColor);
+            titleLabelWithAnimation.setForeground(foregroundColor);
+            titleLabelWithAnimation.addDisposeListener(new DisposeListener() {
+
+                @Override
+                public void widgetDisposed(DisposeEvent e) {
+                    if (bigTitleImg != null && !bigTitleImg.isDisposed()) {
+                        bigTitleImg.dispose();
+                    }
+                    if (smallTitleImg != null && !smallTitleImg.isDisposed()) {
+                        smallTitleImg.dispose();
+                    }
+                }
+            });
+
+            FormData fd = new FormData();
+            fd.top = new FormAttachment(0, verticalPadding);
+            fd.left = new FormAttachment(0, horizonMargin);
+            fd.right = new FormAttachment(100);
+            fd.bottom = new FormAttachment(100);
+            titleLabelWithAnimation.setLayoutData(fd);
+
+            messagePanel = new Canvas(topPanel, SWT.DOUBLE_BUFFERED);
+            messagePanel.addPaintListener(new PaintListener() {
+
+                @Override
+                public void paintControl(PaintEvent e) {
+                    drawMessageBackground(e, messagePanel);
+//                    int len = 160;
+//                    int a = 10;
+//                    int a_Len = a + (int) (percentage * (size.x - a));
+//                    int b_Len = a_Len + len;
+//                    if (a_Len < size.x || b_Len < size.x) {
+//                        if (size.x <= a_Len) {
+//                            a_Len = size.x;
+//                        }
+//                        if (size.x <= b_Len) {
+//                            b_Len = size.x;
+//                        }
+//                        e.gc.setBackground(ColorConstants.WHITE_COLOR);
+//                        e.gc.fillPolygon(new int[] { a_Len, 0, size.x, 0, size.x, size.y, b_Len, size.y });
+//                    }
+                }
+            });
+            messagePanel.setBackground(backgroundColor);
+            messagePanel.setForeground(foregroundColor);
+            fd = new FormData();
+            tmpLabel = new Label(topPanel, SWT.NONE);
+            tmpLabel.setFont(JFaceResources.getBannerFont());
+            tmpLabel.setText("Test");
+            tmpLabel.pack();
+            size = tmpLabel.getSize();
+            tmpLabel.dispose();
+            messageTopY = verticalPadding + size.y + verticalPadding;
+            fd.top = new FormAttachment(0, messageTopY);
+//            fd.left = new FormAttachment(0, convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING));
+//            fd.right = new FormAttachment(100, -convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING));
+            fd.left = new FormAttachment(0, horizonMargin);
+            fd.right = new FormAttachment(100, -horizonMargin);
+            fd.bottom = new FormAttachment(100);
+            messagePanel.setLayoutData(fd);
+            messagePanel.setLayout(new FormLayout());
+
+            errIcon = new Label(messagePanel, SWT.NONE);
+            errIcon.setBackground(msgPanelColor);
+            errIcon.setForeground(foregroundColor);
+            fd = new FormData();
+            fd.top = new FormAttachment(0, msgMargin);
+            fd.left = new FormAttachment(0, msgMargin);
+            errIcon.setLayoutData(fd);
+
+            moreInfoLink = new Hyperlink(messagePanel, SWT.NONE);
+            moreInfoLink.setText("");
+            moreInfoLink.setBackground(msgPanelColor);
+            moreInfoLink.setUnderlined(true);
+            moreInfoLink.addHyperlinkListener(new HyperlinkAdapter() {
+
+                @Override
+                public void linkActivated(HyperlinkEvent e) {
+                    onMoreInfoLinkClicked(e);
+                }
+            });
+
+            errMsgTxt = new StyledText(messagePanel, SWT.READ_ONLY | SWT.WRAP);
+            errMsgTxt.setEditable(false);
+            errMsgTxt.setBackground(msgPanelColor);
+            errMsgTxt.setForeground(org.eclipse.draw2d.ColorConstants.black);
+
+            fd = new FormData();
+            fd.top = new FormAttachment(errMsgTxt, 0, SWT.CENTER);
+            fd.right = new FormAttachment(100, -msgMargin);
+            moreInfoLink.setLayoutData(fd);
+
+            fd = new FormData();
+            fd.top = new FormAttachment(errIcon, 0, SWT.TOP);
+            fd.left = new FormAttachment(errIcon, horizonPadding, SWT.RIGHT);
+            fd.right = new FormAttachment(moreInfoLink, -horizonPadding, SWT.LEFT);
+            fd.bottom = new FormAttachment(100, -msgMargin);
+            errMsgTxt.setLayoutData(fd);
+
+            parent.setBackground(backgroundColor);
+//            parent.setBackground(ColorConstants.YELLOW_COLOR);
+            titleImageLabel.setBackground(backgroundColor);
+            titleLabel.setBackground(backgroundColor);
+            titleLabel.moveBelow(null);
+            messageImageLabel.setBackground(backgroundColor);
+            leftFillerLabel.setBackground(backgroundColor);
+            bottomFillerLabel.setBackground(backgroundColor);
+            messageLabel.setBackground(backgroundColor);
+        } else {
+            titleCtrl = super.createTitleArea(parent);
+        }
+        return titleCtrl;
+    }
+
+    private Composite createToolTipContent(Composite parent) {
+        Composite result = new Composite(parent, SWT.NONE);
+        final int msgMargin = getMargin();
+        final int horizonPadding = getHorizonPadding();
+        result.setBackground(null);
+        result.setLayout(new FormLayout());
+        Canvas msgPanel = new Canvas(result, SWT.DOUBLE_BUFFERED);
+        FormData fd = new FormData();
+        fd.top = new FormAttachment(0);
+        fd.left = new FormAttachment(0);
+        fd.width = messagePanel.getSize().x;
+        fd.bottom = new FormAttachment(100);
+        msgPanel.setLayoutData(fd);
+        msgPanel.addPaintListener(new PaintListener() {
+
+            @Override
+            public void paintControl(PaintEvent e) {
+                drawMessageBackground(e, msgPanel);
+            }
+        });
+        msgPanel.setBackground(messagePanel.getBackground());
+        msgPanel.setForeground(messagePanel.getForeground());
+        msgPanel.setLayout(new FormLayout());
+
+        Label errIconLabel = new Label(msgPanel, SWT.NONE);
+        errIconLabel.setBackground(errIcon.getBackground());
+        errIconLabel.setForeground(errIcon.getForeground());
+        errIconLabel.setImage(errIcon.getImage());
+        fd = new FormData();
+        fd.top = new FormAttachment(0, msgMargin);
+        fd.left = new FormAttachment(0, msgMargin);
+        errIconLabel.setLayoutData(fd);
+
+        Hyperlink link = new Hyperlink(msgPanel, SWT.NONE);
+        link.setText(moreInfoLink.getText());
+        link.setBackground(moreInfoLink.getBackground());
+        link.setUnderlined(moreInfoLink.isUnderlined());
+
+        StyledText msgTxt = new StyledText(msgPanel, SWT.READ_ONLY | SWT.WRAP);
+        msgTxt.setBackground(errMsgTxt.getBackground());
+        msgTxt.setForeground(errMsgTxt.getForeground());
+        msgTxt.setText(errMsgTxt.getText());
+
+        fd = new FormData();
+        fd.top = new FormAttachment(msgTxt, 0, SWT.CENTER);
+        fd.right = new FormAttachment(100, -msgMargin);
+        link.setLayoutData(fd);
+
+        fd = new FormData();
+        fd.top = new FormAttachment(errIconLabel, 0, SWT.TOP);
+        fd.left = new FormAttachment(errIconLabel, horizonPadding, SWT.RIGHT);
+        fd.right = new FormAttachment(link, -horizonPadding, SWT.LEFT);
+        msgTxt.setLayoutData(fd);
+        return result;
+    }
+
+    private void onMoreInfoLinkClicked(HyperlinkEvent e) {
+        Program.launch(moreInfoUrl);
+    }
+
+    @Override
+    protected void resetWorkAreaAttachments(Control top) {
+        FormData childData = new FormData();
+        childData.top = new FormAttachment(topPanel, 0, SWT.BOTTOM);
+        childData.right = new FormAttachment(100, 0);
+        childData.left = new FormAttachment(0, 0);
+        childData.bottom = new FormAttachment(100, 0);
+        workArea.setLayoutData(childData);
+    }
+
+    @Override
+    protected void layoutForNewMessage(boolean forceLayout) {
+        if (!useNewStyle()) {
+            super.layoutForNewMessage(forceLayout);
+            return;
+        }
+//        if (forceLayout) {
+//            return;
+//        }
+        if (hasMessage()) {
+            messagePanel.setVisible(true);
+//            Image image = messageImageLabel.getImage();
+//            if (image == null) {
+//                image = messageImage;
+//            }
+//            if (image != null && messageImageLabel.isVisible()) {
+////                this.errIcon.setVisible(true);
+//                this.errIcon.setImage(image);
+//            } else {
+//                this.errIcon.setImage(null);
+////                this.errIcon.setVisible(false);
+//            }
+            updateMsgPanelColor(pageMessageType);
+//            topPanel.layout();
+            messagePanel.layout();
+            Point messageSize = errMsgTxt.getSize();
+            int messageLabelUnclippedHeight = errMsgTxt.computeSize(messageSize.x, SWT.DEFAULT, true).y;
+            boolean messageLabelClipped = messageLabelUnclippedHeight > messageSize.y;
+            if (errMsgTxt.getData() instanceof ToolTip) {
+                ToolTip toolTip = (ToolTip) errMsgTxt.getData();
+                toolTip.hide();
+                toolTip.deactivate();
+                errMsgTxt.setData(null);
+            }
+            if (messageLabelClipped) {
+                ToolTip tooltip = new ToolTip(errMsgTxt, ToolTip.NO_RECREATE, false) {
+
+                    @Override
+                    protected Composite createToolTipContentArea(Event event, Composite parent) {
+                        return createToolTipContent(parent);
+                    }
+
+                    @Override
+                    public Point getLocation(Point tipSize, Event event) {
+                        return errMsgTxt.getShell().toDisplay(messagePanel.getLocation());
+                    }
+                };
+                errMsgTxt.setData(tooltip);
+                tooltip.setPopupDelay(0);
+                tooltip.activate();
+            }
+        }
+    }
+
+    @Override
+    protected void setImageLabelVisible(boolean visible) {
+        super.setImageLabelVisible(visible);
+        if (useNewStyle()) {
+            messagePanel.setVisible(visible);
+            if (visible) {
+                errIcon.setImage(messageImageLabel.getImage());
+            } else {
+                errIcon.setImage(null);
+            }
+        }
+    }
+
+    private void sortPanelOrder() {
+        if (isHideMessageArea()) {
+            return;
+        }
+        if (this.topPanel == null) {
+            return;
+        }
+        this.titleImageLabel.moveAbove(null);
+        this.topPanel.moveBelow(this.titleImageLabel);
+        messagePanel.moveAbove(titleLabelWithAnimation);
+        if (!hasMessage()) {
+            messagePanel.setVisible(false);
+        }
+    }
+
+    @Override
+    protected void setLayoutsForNormalMessage(int verticalSpacing, int horizontalSpacing) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        super.setLayoutsForNormalMessage(verticalSpacing, horizontalSpacing);
+        if (useNewStyle()) {
+            if (this.topPanel != null) {
+                onTitleAreaRefreshFrame(1.0, false);
+            }
+        }
+    }
+
+    private static Font getTitleBigFont() {
+        if (titleBigFont != null) {
+            return titleBigFont;
+        }
+        Font bannerFont = JFaceResources.getBannerFont();
+        FontData[] fontData = bannerFont.getFontData();
+        for (FontData fd : fontData) {
+            fd.setHeight(fd.getHeight() + 7);
+        }
+        titleBigFont = new Font(Display.getDefault(), fontData);
+        return titleBigFont;
+    }
+
+    @Override
+    protected void updateMessage(String newMessage) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        boolean hadMsg = hasMessage();
+        super.updateMessage(newMessage);
+        this.errMsgTxt.setText(this.messageLabel.getText());
+        boolean hasMsg = hasMessage();
+        messagePanel.setVisible(hasMsg);
+        if (hadMsg != hasMsg) {
+            startAnimation();
+        }
+    }
+
+    @Override
+    public void setErrorMessage(String newErrorMessage) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        if (StringUtils.isNotBlank(newErrorMessage)) {
+            this.pageMessageType = IMessageProvider.ERROR;
+            updateMsgPanelColor(this.pageMessageType);
+        }
+        super.setErrorMessage(newErrorMessage);
+    }
+
+    @Override
+    protected void showMessage(String newMessage, Image newImage) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        super.showMessage(newMessage, newImage);
+    }
+
+    @Override
+    public void setMessage(String newMessage, int newType) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        if (StringUtils.isNotBlank(newMessage)) {
+            updateMsgPanelColor(newType);
+        }
+        super.setMessage(newMessage, newType);
+    }
+
+    private void updateMsgPanelColor(int type) {
+        Color foreColor = getMsgPanelForegroundColor(type);
+        msgPanelColor = getMsgPanelBackgroundColor(type);
+        errIcon.setBackground(msgPanelColor);
+        errMsgTxt.setBackground(msgPanelColor);
+        errMsgTxt.setForeground(foreColor);
+        moreInfoLink.setBackground(msgPanelColor);
+//        moreInfoLink.setForeground(getMoreInfoLinkForegroundColor(type));
+        messagePanel.redraw();
+    }
+
+    private Color getMsgPanelBackgroundColor(int type) {
+        Color color = ColorConstants.INFO_COLOR;
+        switch (type) {
+        case IMessageProvider.NONE:
+        case IMessageProvider.INFORMATION:
+            color = ColorConstants.INFO_COLOR;
+            break;
+        case IMessageProvider.WARNING:
+            color = ColorConstants.WARN_COLOR;
+            break;
+        case IMessageProvider.ERROR:
+            color = ColorConstants.ERR_COLOR;
+            break;
+        }
+        return color;
+    }
+
+    private Color getMsgPanelForegroundColor(int type) {
+        Color color = ColorConstants.WHITE_COLOR;
+        switch (type) {
+        case IMessageProvider.WARNING:
+            color = org.eclipse.draw2d.ColorConstants.black;
+            break;
+        case IMessageProvider.NONE:
+        case IMessageProvider.INFORMATION:
+        case IMessageProvider.ERROR:
+            color = ColorConstants.WHITE_COLOR;
+            break;
+        }
+        return color;
+    }
+
+    private Color getMoreInfoLinkForegroundColor(int type) {
+        Color color = null;
+        switch (type) {
+        case IMessageProvider.NONE:
+        case IMessageProvider.INFORMATION:
+        case IMessageProvider.ERROR:
+            color = ColorConstants.WHITE_COLOR;
+            break;
+        default:
+            break;
+        }
+        return color;
+    }
+
+    private void startAnimation() {
+        boolean hasMsg = hasMessage();
+        if (this.titleAnimationSchedulerThread != null) {
+            if (hasMsg == threadShowingMsg) {
+                return;
+            } else {
+                this.titleAnimationSchedulerThread.interrupt();
+            }
+        }
+        threadShowingMsg = hasMsg;
+        titleAnimationSchedulerThread = createTitleAnimationSchedulerThread(threadShowingMsg);
+        titleAnimationSchedulerThread.start();
+    }
+
+    private boolean hasMessage() {
+        return StringUtils.isNotBlank(messageLabel.getText());
+    }
+
+    @Override
+    public void setTitle(String newTitle) {
+        super.setTitle(newTitle);
+        if (StringUtils.equals(newTitle, title) && this.bigTitleImg != null) {
+            return;
+        }
+        if (this.titleAnimationSchedulerThread != null) {
+            this.titleAnimationSchedulerThread.interrupt();
+        }
+        this.title = newTitle;
+        if (this.bigTitleImg != null) {
+            this.bigTitleImg.dispose();
+        }
+        this.bigTitleImg = createTitleImage(getTitleBigFont(), this.title);
+        if (this.smallTitleImg != null) {
+            this.smallTitleImg.dispose();
+        }
+        this.smallTitleImg = createTitleImage(JFaceResources.getBannerFont(), this.title);
+        this.titleLabelWithAnimation.redraw();
+    }
+
+    @Override
+    public void showMoreInfoLink(IDialogPage page, String name, String link) {
+        if (isHideMessageArea()) {
+            return;
+        }
+        if (getCurrentPage() != page) {
+            return;
+        }
+        if (StringUtils.isBlank(name)) {
+            moreInfoLink.setText("");
+            moreInfoLink.setEnabled(false);
+        } else {
+            moreInfoLink.setEnabled(true);
+            moreInfoLink.setText(name);
+        }
+        moreInfoUrl = link;
+        this.moreInfoLink.pack();
+        this.moreInfoLink.redraw();
+        this.messagePanel.layout();
+    }
+
+    @Override
+    public void setTitleImage(Image newTitleImage) {
+        super.setTitleImage(newTitleImage);
+        if (this.titleAreaImage != null) {
+            if (this.messageTopY < this.titleAreaImage.getBounds().height) {
+                FormData fd = (FormData) messagePanel.getLayoutData();
+                Rectangle imgBounds = this.titleAreaImage.getBounds();
+                fd.right = new FormAttachment(100, -getHorizonPadding() - imgBounds.width);
+                FormData panelFd = (FormData) this.topPanel.getLayoutData();
+                int imageY = imgBounds.height;
+                int topPanelY = panelFd.height;
+                if (topPanelY < imageY) {
+                    panelFd.height = imageY;
+//            fd.right = new FormAttachment(this.titleImageLabel, -getMargin(), SWT.LEFT);
+                    this.topPanel.getParent().layout();
+                } else {
+                }
+                this.topPanel.layout();
+            }
+        }
+    }
+
+    private Image createTitleImage(Font font, String title) {
+        Label tmpLabel = new Label(titleLabel.getParent(), SWT.NONE);
+        tmpLabel.setText(title);
+        tmpLabel.setFont(font);
+        tmpLabel.pack();
+        Point size = tmpLabel.getSize();
+        tmpLabel.dispose();
+
+        int width = size.x;
+        if (StringUtils.isEmpty(title)) {
+            width = 1;
+        }
+        Image tmpImg = new Image(Display.getDefault(), width, size.y);
+        GC gc = new GC(tmpImg);
+        gc.setAntialias(SWT.ON);
+        gc.setInterpolation(SWT.HIGH);
+        gc.setFont(font);
+        gc.setAlpha(0);
+        gc.drawRectangle(0, 0, width, size.y);
+        gc.setAlpha(255);
+        gc.drawText(title, 0, 0, true);
+        gc.dispose();
+
+        ImageData imageData = tmpImg.getImageData();
+        imageData.transparentPixel = imageData.getPixel(0, 0);
+        tmpImg.dispose();
+
+        return new Image(Display.getDefault(), imageData);
+    }
+
+    private void drawTitle(PaintEvent e) {
+        double p = percentage;
+        Rectangle sBounds = smallTitleImg.getBounds();
+        Rectangle bBounds = bigTitleImg.getBounds();
+        int width = bBounds.width - sBounds.width;
+        int height = bBounds.height - sBounds.height;
+        Rectangle baseBounds = sBounds;
+        Image finalImg = bigTitleImg;
+        finalImg = bigTitleImg;
+        int totalHight = e.height;
+        int middleY = (totalHight - bBounds.height) / 2;
+//        int startY = getMargin();
+        int startY = 0;
+        int baseY = startY;
+        int y = (int) (p * (middleY - startY));
+        if (hasMessage()) {
+            y = -y;
+            width = -width;
+            height = -height;
+            baseBounds = bBounds;
+            baseY = middleY;
+            finalImg = smallTitleImg;
+        }
+
+        Point newSize = new Point((int) (baseBounds.width + p * width), (int) (baseBounds.height + p * height));
+        GC gc = e.gc;
+        gc.setAntialias(SWT.ON);
+        gc.setInterpolation(SWT.HIGH);
+        if (p <= 1.0) {
+            gc.drawImage(bigTitleImg, 0, 0, bBounds.width, bBounds.height, 0, baseY + y, newSize.x, newSize.y);
+        } else {
+            Rectangle bounds = finalImg.getBounds();
+            gc.drawImage(finalImg, 0, 0, bounds.width, bounds.height, 0, baseY + y, bounds.width, bounds.height);
+        }
+    }
+
+    private void drawMessageBackground(PaintEvent e, Control ctrl) {
+        e.gc.setBackground(msgPanelColor);
+        e.gc.setAntialias(SWT.ON);
+        e.gc.setInterpolation(SWT.HIGH);
+        Point size = ctrl.getSize();
+        e.gc.fillRoundRectangle(0, 0, size.x, size.y, 15, 15);
+    }
+
+    private int getHorizonPadding() {
+        IWizard wizard = this.getWizard();
+        if (wizard instanceof ITalendWizard) {
+            return ((ITalendWizard) wizard).getHorizonPadding();
+        }
+        return 5;
+    }
+
+    private int getVerticalPadding() {
+        IWizard wizard = this.getWizard();
+        if (wizard instanceof ITalendWizard) {
+            return ((ITalendWizard) wizard).getVerticalPadding();
+        }
+        return 5;
+    }
+
+    private int getHorizonMargin() {
+        IWizard wizard = this.getWizard();
+        if (wizard instanceof ITalendWizard) {
+            return ((ITalendWizard) wizard).getHorizonMargin();
+        }
+        return 5;
+    }
+
+    private int getMargin() {
+        return 10;
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/TalendWizardDialog_backup.java

@@ -0,0 +1,244 @@
+// ============================================================================
+//
+// 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.commons.ui.swt.dialogs;
+
+import java.lang.reflect.Field;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.resource.JFaceColors;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.ProgressMonitorPart;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.ui.runtime.ColorConstants;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class TalendWizardDialog_backup extends WizardDialog {
+
+    private boolean useNewErrorStyle = false;
+
+    /**
+     * Warning color: #FCE6D9 <br/>
+     * info color: #CDE3F2
+     */
+
+    public TalendWizardDialog_backup(Shell parentShell, IWizard newWizard) {
+        super(parentShell, newWizard);
+        useNewErrorStyle = true;
+        this.setTitleAreaColor(new RGB(205, 227, 242));
+    }
+
+    public void setNewErrorStyle(boolean newErrStyle) {
+        this.useNewErrorStyle = newErrStyle;
+    }
+
+    @Override
+    protected Control createContents(Composite parent) {
+        parent.setBackground(ColorConstants.WHITE_COLOR);
+        Control panel = super.createContents(parent);
+        Display display = parent.getDisplay();
+        Color background = JFaceColors.getBannerBackground(display);
+        Color foreground = JFaceColors.getBannerForeground(display);
+        try {
+            Field workAreaField = TitleAreaDialog.class.getDeclaredField("workArea");
+            workAreaField.setAccessible(true);
+            Composite workArea = (Composite) workAreaField.get(this);
+            workArea.setBackground(ColorConstants.WHITE_COLOR);
+            Field pageContainerField = WizardDialog.class.getDeclaredField("pageContainer");
+            pageContainerField.setAccessible(true);
+            Composite pageContainer = (Composite) pageContainerField.get(this);
+            pageContainer.setBackground(ColorConstants.WHITE_COLOR);
+            if (useNewErrorStyle()) {
+                FormData formData = (FormData) workArea.getLayoutData();
+                formData.top = new FormAttachment(0);
+            }
+            Field bottomFillerLabelField = TitleAreaDialog.class.getDeclaredField("bottomFillerLabel");
+            bottomFillerLabelField.setAccessible(true);
+            Composite bottomFillerLabel = (Composite) bottomFillerLabelField.get(this);
+            bottomFillerLabel.setVisible(false);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return panel;
+    }
+
+    @Override
+    public void setMessage(String newMessage) {
+        if (useNewErrorStyle()) {
+            ExceptionHandler.log(newMessage);
+        } else {
+            super.setMessage(newMessage);
+        }
+    }
+
+    @Override
+    public void setMessage(String newMessage, int newType) {
+        if (useNewErrorStyle()) {
+            ExceptionHandler.log(newMessage);
+        } else {
+            super.setMessage(newMessage, newType);
+        }
+    }
+
+    @Override
+    public void setErrorMessage(String newErrorMessage) {
+        if (useNewErrorStyle()) {
+            ExceptionHandler.log(newErrorMessage);
+        } else {
+            super.setErrorMessage(newErrorMessage);
+        }
+    }
+
+    private boolean useNewErrorStyle() {
+        return this.useNewErrorStyle;
+    }
+
+    @Override
+    protected Control createDialogArea(Composite parent) {
+        Composite panel = (Composite) super.createDialogArea(parent);
+        Control[] children = panel.getChildren();
+        for (Control child : children) {
+            child.setBackground(ColorConstants.WHITE_COLOR);
+            if (child instanceof Label) {
+                int style = child.getStyle();
+                if (0 < (style & SWT.HORIZONTAL) && 0 < (style & SWT.SEPARATOR)) {
+                    child.setVisible(false);
+                }
+            }
+        }
+        return panel;
+    }
+
+    @Override
+    protected ProgressMonitorPart createProgressMonitorPart(Composite composite, GridLayout pmlayout) {
+        ProgressMonitorPart progMonitor = super.createProgressMonitorPart(composite, pmlayout);
+        progMonitor.setBackground(ColorConstants.WHITE_COLOR);
+        return progMonitor;
+    }
+
+    @Override
+    protected Control createButtonBar(Composite parent) {
+        Composite composite = new Composite(parent, SWT.NONE);
+        composite.setBackground(ColorConstants.WHITE_COLOR);
+        GridLayout layout = new GridLayout();
+        layout.marginWidth = 0;
+        layout.marginHeight = 0;
+        layout.horizontalSpacing = 0;
+        composite.setLayout(layout);
+        composite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+        composite.setFont(parent.getFont());
+
+        Control helpControl = null;
+        // create help control if needed
+        if (isHelpAvailable()) {
+            helpControl = createHelpControl(composite);
+            ((GridData) helpControl.getLayoutData()).horizontalIndent = convertHorizontalDLUsToPixels(
+                    IDialogConstants.HORIZONTAL_MARGIN);
+        }
+        createButtonsForButtonBar(composite);
+
+        Button helpButton = getButton(IDialogConstants.HELP_ID);
+        Button finishButton = getButton(IDialogConstants.FINISH_ID);
+        Button cancelButton = getButton(IDialogConstants.CANCEL_ID);
+        Button backButton = getButton(IDialogConstants.BACK_ID);
+        Button nextButton = getButton(IDialogConstants.NEXT_ID);
+
+        FormLayout formLayout = new FormLayout();
+        formLayout.marginWidth = 10;
+        formLayout.marginHeight = 20;
+        composite.setLayout(formLayout);
+        final int HORIZON_ALIGN = 5;
+
+        FormData cancelData = new FormData();
+        cancelData.left = new FormAttachment(0);
+        cancelData.top = new FormAttachment(composite, 0, SWT.CENTER);
+        cancelData.width = getButtonWidth(cancelButton);
+        cancelButton.setLayoutData(cancelData);
+
+        Control tmpCtrl = cancelButton;
+
+        if (helpControl != null) {
+            FormData formData = new FormData();
+            formData.left = new FormAttachment(tmpCtrl, HORIZON_ALIGN, SWT.RIGHT);
+            formData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+            helpControl.setLayoutData(formData);
+            tmpCtrl = helpControl;
+        }
+        if (helpButton != null) {
+            FormData formData = new FormData();
+            formData.left = new FormAttachment(tmpCtrl, HORIZON_ALIGN, SWT.RIGHT);
+            formData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+            formData.width = getButtonWidth(helpButton);
+            helpButton.setLayoutData(formData);
+            tmpCtrl = helpButton;
+        }
+        FormData finishData = new FormData();
+        finishData.right = new FormAttachment(100);
+        finishData.top = new FormAttachment(composite, 0, SWT.CENTER);
+        finishData.width = getButtonWidth(finishButton);
+        finishButton.setLayoutData(finishData);
+        tmpCtrl = finishButton;
+
+        if (nextButton != null) {
+            FormData nextData = new FormData();
+            Composite nextParentCtrl = nextButton.getParent();
+            nextData.right = new FormAttachment(tmpCtrl, -HORIZON_ALIGN, SWT.LEFT);
+            nextData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+            nextParentCtrl.setLayoutData(nextData);
+        }
+        if (false) {
+            if (nextButton != null) {
+                FormData nextData = new FormData();
+                nextData.right = new FormAttachment(tmpCtrl, -HORIZON_ALIGN, SWT.LEFT);
+                nextData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+                nextData.width = getButtonWidth(nextButton);
+                nextButton.setLayoutData(nextData);
+            }
+            if (backButton != null) {
+                FormData backData = new FormData();
+                backData.right = new FormAttachment(tmpCtrl, -HORIZON_ALIGN, SWT.LEFT);
+                backData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
+                backData.width = getButtonWidth(backButton);
+                backButton.setLayoutData(backData);
+            }
+        }
+
+        return composite;
+    }
+
+    private int getButtonWidth(Button btn) {
+        int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
+        Point minSize = btn.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+        return Math.max(widthHint, minSize.x);
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/TitleAreaDialog.java

@@ -0,0 +1,693 @@
+// ============================================================================
+//
+// 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.commons.ui.swt.dialogs;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.dialogs.TrayDialog;
+import org.eclipse.jface.resource.JFaceColors;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.window.ToolTip;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.ACC;
+import org.eclipse.swt.accessibility.AccessibleAttributeAdapter;
+import org.eclipse.swt.accessibility.AccessibleAttributeEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * A dialog that has a title area for displaying a title and an image as well as a common area for displaying a
+ * description, a message, or an error message.
+ * <p>
+ * This dialog class may be subclassed.
+ */
+public class TitleAreaDialog extends TrayDialog {
+
+    /**
+     * Image registry key for error message image.
+     */
+    public static final String DLG_IMG_TITLE_ERROR = DLG_IMG_MESSAGE_ERROR;
+
+    /**
+     * Image registry key for banner image (value <code>"dialog_title_banner_image"</code>).
+     */
+    public static final String DLG_IMG_TITLE_BANNER = "dialog_title_banner_image";//$NON-NLS-1$
+
+    /**
+     * Message type constant used to display an info icon with the message.
+     *
+     * @since 2.0
+     * @deprecated
+     */
+    @Deprecated
+    public static final String INFO_MESSAGE = "INFO_MESSAGE"; //$NON-NLS-1$
+
+    /**
+     * Message type constant used to display a warning icon with the message.
+     *
+     * @since 2.0
+     * @deprecated
+     */
+    @Deprecated
+    public static final String WARNING_MESSAGE = "WARNING_MESSAGE"; //$NON-NLS-1$
+
+    // Space between an image and a label
+    private static final int H_GAP_IMAGE = 5;
+
+    // Minimum dialog width (in dialog units)
+    private static final int MIN_DIALOG_WIDTH = 350;
+
+    // Minimum dialog height (in dialog units)
+    private static final int MIN_DIALOG_HEIGHT = 150;
+
+    protected Label titleLabel;
+
+    protected Label titleImageLabel;
+
+    protected Label bottomFillerLabel;
+
+    protected Label leftFillerLabel;
+
+    private RGB titleAreaRGB;
+
+    Color titleAreaColor;
+
+    protected String message = ""; //$NON-NLS-1$
+
+    protected String errorMessage;
+
+    protected Label messageLabel;
+
+    protected Composite workArea;
+
+    protected Label messageImageLabel;
+
+    protected Image messageImage;
+
+    private boolean showingError = false;
+
+    private boolean titleImageLargest = true;
+
+    private int messageLabelHeight;
+
+    protected Image titleAreaImage;
+
+    /**
+     * Instantiate a new title area dialog.
+     *
+     * @param parentShell the parent SWT shell
+     */
+    public TitleAreaDialog(Shell parentShell) {
+        super(parentShell);
+    }
+
+    /*
+     * @see Dialog.createContents(Composite)
+     */
+    @Override
+    protected Control createContents(Composite parent) {
+        // create the overall composite
+        Composite contents = new Composite(parent, SWT.NONE);
+        contents.setLayoutData(new GridData(GridData.FILL_BOTH));
+        // initialize the dialog units
+        initializeDialogUnits(contents);
+        FormLayout layout = new FormLayout();
+        contents.setLayout(layout);
+        // Now create a work area for the rest of the dialog
+        workArea = new Composite(contents, SWT.NONE);
+//        workArea.setBackground(ColorConstants.RED_COLOR);
+        GridLayout childLayout = new GridLayout();
+        childLayout.marginHeight = 0;
+        childLayout.marginWidth = 0;
+        childLayout.verticalSpacing = 0;
+        workArea.setLayout(childLayout);
+        Control top = createTitleArea(contents);
+        resetWorkAreaAttachments(top);
+        workArea.setFont(JFaceResources.getDialogFont());
+        // initialize the dialog units
+        initializeDialogUnits(workArea);
+        // create the dialog area and button bar
+        dialogArea = createDialogArea(workArea);
+        buttonBar = createButtonBar(workArea);
+
+        // need to react to new size of title area
+        getShell().addListener(SWT.Resize, event -> layoutForNewMessage(true));
+        return contents;
+    }
+
+    /**
+     * Creates and returns the contents of the upper part of this dialog (above the button bar).
+     * <p>
+     * The <code>Dialog</code> implementation of this framework method creates and returns a new <code>Composite</code>
+     * with no margins and spacing. Subclasses should override.
+     * </p>
+     *
+     * @param parent The parent composite to contain the dialog area
+     * @return the dialog area control
+     */
+    @Override
+    protected Control createDialogArea(Composite parent) {
+        // create the top level composite for the dialog area
+        Composite composite = new Composite(parent, SWT.NONE);
+        GridLayout layout = new GridLayout();
+        layout.marginHeight = 0;
+        layout.marginWidth = 0;
+        layout.verticalSpacing = 0;
+        layout.horizontalSpacing = 0;
+        composite.setLayout(layout);
+        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+        composite.setFont(parent.getFont());
+        // Build the separator line
+        titleBarSeparator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
+        titleBarSeparator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+        return composite;
+    }
+
+    protected Label titleBarSeparator;
+
+    /**
+     * Creates the dialog's title area.
+     *
+     * @param parent the SWT parent for the title area widgets
+     * @return Control with the highest x axis value.
+     */
+    protected Control createTitleArea(Composite parent) {
+
+        // Determine the background color of the title bar
+        Display display = parent.getDisplay();
+        Color background;
+        Color foreground;
+        if (titleAreaRGB != null) {
+            titleAreaColor = new Color(display, titleAreaRGB);
+            background = titleAreaColor;
+            foreground = null;
+        } else {
+            background = JFaceColors.getBannerBackground(display);
+            foreground = JFaceColors.getBannerForeground(display);
+        }
+
+        parent.setBackground(background);
+        int verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
+        int horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
+        // Dialog image @ right
+        titleImageLabel = new Label(parent, SWT.CENTER);
+        titleImageLabel.setBackground(background);
+        if (titleAreaImage == null || titleAreaImage.isDisposed())
+            titleImageLabel.setImage(JFaceResources.getImage(DLG_IMG_TITLE_BANNER));
+        else
+            titleImageLabel.setImage(titleAreaImage);
+
+        FormData imageData = new FormData();
+        imageData.top = new FormAttachment(0, 0);
+        // Note: do not use horizontalSpacing on the right as that would be a
+        // regression from
+        // the R2.x style where there was no margin on the right and images are
+        // flush to the right
+        // hand side. see reopened comments in 41172
+        imageData.right = new FormAttachment(100, 0); // horizontalSpacing
+        titleImageLabel.setLayoutData(imageData);
+        // Title label @ top, left
+        titleLabel = new Label(parent, SWT.LEFT);
+        JFaceColors.setColors(titleLabel, foreground, background);
+        titleLabel.setFont(JFaceResources.getBannerFont());
+        titleLabel.setText(" ");//$NON-NLS-1$
+        FormData titleData = new FormData();
+        titleData.top = new FormAttachment(0, verticalSpacing);
+        titleData.right = new FormAttachment(titleImageLabel);
+        titleData.left = new FormAttachment(0, horizontalSpacing);
+        titleLabel.setLayoutData(titleData);
+        // Message image @ bottom, left
+        messageImageLabel = new Label(parent, SWT.CENTER);
+        messageImageLabel.setBackground(background);
+        // Message label @ bottom, center
+        // messageLabel = new Text(parent, SWT.WRAP | SWT.READ_ONLY);
+        messageLabel = new Label(parent, SWT.WRAP);
+        JFaceColors.setColors(messageLabel, foreground, background);
+        messageLabel.setText(" \n "); // two lines//$NON-NLS-1$
+        messageLabel.setFont(JFaceResources.getDialogFont());
+        // Bug 248410 - This snippet will only work with Windows screen readers.
+        messageLabel.getAccessible().addAccessibleAttributeListener(new AccessibleAttributeAdapter() {
+
+            @Override
+            public void getAttributes(AccessibleAttributeEvent e) {
+                e.attributes = new String[] { "container-live", //$NON-NLS-1$
+                        "polite", "live", "polite", //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
+                        "container-live-role", "status", }; //$NON-NLS-1$ //$NON-NLS-2$
+            }
+        });
+        messageLabelHeight = messageLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
+        // Filler labels
+        leftFillerLabel = new Label(parent, SWT.CENTER);
+        leftFillerLabel.setBackground(background);
+        bottomFillerLabel = new Label(parent, SWT.CENTER);
+        bottomFillerLabel.setBackground(background);
+        setLayoutsForNormalMessage(verticalSpacing, horizontalSpacing);
+        determineTitleImageLargest();
+        if (titleImageLargest)
+            return titleImageLabel;
+        return messageLabel;
+    }
+
+    /**
+     * Determine if the title image is larger than the title message and message area. This is used for layout
+     * decisions.
+     */
+    private void determineTitleImageLargest() {
+        int titleY = titleImageLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
+        int verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
+        int labelY = titleLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
+        labelY += verticalSpacing;
+        labelY += messageLabelHeight;
+        labelY += verticalSpacing;
+        titleImageLargest = titleY > labelY;
+    }
+
+    /**
+     * Set the layout values for the messageLabel, messageImageLabel and fillerLabel for the case where there is a
+     * normal message.
+     *
+     * @param verticalSpacing int The spacing between widgets on the vertical axis.
+     * @param horizontalSpacing int The spacing between widgets on the horizontal axis.
+     */
+    protected void setLayoutsForNormalMessage(int verticalSpacing, int horizontalSpacing) {
+        FormData messageImageData = new FormData();
+        messageImageData.top = new FormAttachment(titleLabel, verticalSpacing);
+        messageImageData.left = new FormAttachment(0, H_GAP_IMAGE);
+        messageImageLabel.setLayoutData(messageImageData);
+        FormData messageLabelData = new FormData();
+        messageLabelData.top = new FormAttachment(titleLabel, verticalSpacing);
+        messageLabelData.right = new FormAttachment(titleImageLabel);
+        messageLabelData.left = new FormAttachment(messageImageLabel, horizontalSpacing);
+        messageLabelData.height = messageLabelHeight;
+        if (titleImageLargest)
+            messageLabelData.bottom = new FormAttachment(titleImageLabel, 0, SWT.BOTTOM);
+        messageLabel.setLayoutData(messageLabelData);
+        FormData fillerData = new FormData();
+        fillerData.left = new FormAttachment(0, horizontalSpacing);
+        fillerData.top = new FormAttachment(messageImageLabel, 0);
+        fillerData.bottom = new FormAttachment(messageLabel, 0, SWT.BOTTOM);
+        bottomFillerLabel.setLayoutData(fillerData);
+        FormData data = new FormData();
+        data.top = new FormAttachment(messageImageLabel, 0, SWT.TOP);
+        data.left = new FormAttachment(0, 0);
+        data.bottom = new FormAttachment(messageImageLabel, 0, SWT.BOTTOM);
+        data.right = new FormAttachment(messageImageLabel, 0);
+        leftFillerLabel.setLayoutData(data);
+    }
+
+    /**
+     * The <code>TitleAreaDialog</code> implementation of this <code>Window</code> methods returns an initial size which
+     * is at least some reasonable minimum.
+     *
+     * @return the initial size of the dialog
+     */
+    @Override
+    protected Point getInitialSize() {
+        Point shellSize = super.getInitialSize();
+        return new Point(Math.max(convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
+                Math.max(convertVerticalDLUsToPixels(MIN_DIALOG_HEIGHT), shellSize.y));
+    }
+
+    /**
+     * Retained for backward compatibility.
+     *
+     * Returns the title area composite. There is no composite in this implementation so the shell is returned.
+     *
+     * @return Composite
+     * @deprecated
+     */
+    @Deprecated
+    protected Composite getTitleArea() {
+        return getShell();
+    }
+
+    /**
+     * Returns the title image label.
+     *
+     * @return the title image label
+     */
+    protected Label getTitleImageLabel() {
+        return titleImageLabel;
+    }
+
+    /**
+     * Display the given error message. The currently displayed message is saved and will be redisplayed when the error
+     * message is set to <code>null</code>.
+     *
+     * @param newErrorMessage the newErrorMessage to display or <code>null</code>
+     */
+    public void setErrorMessage(String newErrorMessage) {
+        // Any change?
+        if (errorMessage == null ? newErrorMessage == null : errorMessage.equals(newErrorMessage))
+            return;
+        errorMessage = newErrorMessage;
+
+        // Clear or set error message.
+        if (errorMessage == null) {
+            if (showingError) {
+                // we were previously showing an error
+                showingError = false;
+            }
+            // show the message
+            // avoid calling setMessage in case it is overridden to call
+            // setErrorMessage,
+            // which would result in a recursive infinite loop
+            if (message == null) // this should probably never happen since
+                // setMessage does this conversion....
+                message = ""; //$NON-NLS-1$
+            updateMessage(message);
+            messageImageLabel.setImage(messageImage);
+            setImageLabelVisible(messageImage != null);
+        } else {
+            // Add in a space for layout purposes but do not
+            // change the instance variable
+            String displayedErrorMessage = " " + errorMessage; //$NON-NLS-1$
+            updateMessage(displayedErrorMessage);
+            if (!showingError) {
+                // we were not previously showing an error
+                showingError = true;
+                messageImageLabel.setImage(JFaceResources.getImage(DLG_IMG_TITLE_ERROR));
+                setImageLabelVisible(true);
+            }
+        }
+        layoutForNewMessage(false);
+    }
+
+    /**
+     * Re-layout the labels for the new message.
+     *
+     * @param forceLayout <code>true</code> to force a layout of the shell
+     */
+    protected void layoutForNewMessage(boolean forceLayout) {
+        int verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
+        int horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
+        // If there are no images then layout as normal
+        if (errorMessage == null && messageImage == null) {
+            setImageLabelVisible(false);
+            setLayoutsForNormalMessage(verticalSpacing, horizontalSpacing);
+        } else {
+            messageImageLabel.setVisible(true);
+            bottomFillerLabel.setVisible(true);
+            leftFillerLabel.setVisible(true);
+            /**
+             * Note that we do not use horizontalSpacing here as when the background of the messages changes there will
+             * be gaps between the icon label and the message that are the background color of the shell. We add a
+             * leading space elsewhere to compendate for this.
+             */
+            FormData data = new FormData();
+            data.left = new FormAttachment(0, H_GAP_IMAGE);
+            data.top = new FormAttachment(titleLabel, verticalSpacing);
+            messageImageLabel.setLayoutData(data);
+            data = new FormData();
+            data.top = new FormAttachment(messageImageLabel, 0);
+            data.left = new FormAttachment(0, 0);
+            data.bottom = new FormAttachment(messageLabel, 0, SWT.BOTTOM);
+            data.right = new FormAttachment(messageImageLabel, 0, SWT.RIGHT);
+            bottomFillerLabel.setLayoutData(data);
+            data = new FormData();
+            data.top = new FormAttachment(messageImageLabel, 0, SWT.TOP);
+            data.left = new FormAttachment(0, 0);
+            data.bottom = new FormAttachment(messageImageLabel, 0, SWT.BOTTOM);
+            data.right = new FormAttachment(messageImageLabel, 0);
+            leftFillerLabel.setLayoutData(data);
+            FormData messageLabelData = new FormData();
+            messageLabelData.top = new FormAttachment(titleLabel, verticalSpacing);
+            messageLabelData.right = new FormAttachment(titleImageLabel);
+            messageLabelData.left = new FormAttachment(messageImageLabel, 0);
+            messageLabelData.height = messageLabelHeight;
+            if (titleImageLargest)
+                messageLabelData.bottom = new FormAttachment(titleImageLabel, 0, SWT.BOTTOM);
+            messageLabel.setLayoutData(messageLabelData);
+        }
+
+        if (forceLayout) {
+            getShell().layout();
+        } else {
+            // Do not layout before the dialog area has been created
+            // to avoid incomplete calculations.
+            if (dialogArea != null)
+                workArea.getParent().layout(true);
+        }
+
+        Point messageSize = messageLabel.getSize();
+        int messageLabelUnclippedHeight = messageLabel.computeSize(messageSize.x, SWT.DEFAULT, true).y;
+        boolean messageLabelClipped = messageLabelUnclippedHeight > messageSize.y;
+        if (messageLabel.getData() instanceof ToolTip) {
+            ToolTip toolTip = (ToolTip) messageLabel.getData();
+            toolTip.hide();
+            toolTip.deactivate();
+            messageLabel.setData(null);
+        }
+        if (messageLabelClipped) {
+            ToolTip tooltip = new ToolTip(messageLabel, ToolTip.NO_RECREATE, false) {
+
+                @Override
+                protected Composite createToolTipContentArea(Event event, Composite parent) {
+                    Composite result = new Composite(parent, SWT.NONE);
+                    result.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+                    result.setLayout(new GridLayout());
+                    Text text = new Text(result, SWT.WRAP);
+                    text.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+                    text.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
+                    text.setText(messageLabel.getText());
+                    GridData gridData = new GridData();
+                    gridData.widthHint = messageSize.x;
+                    text.setLayoutData(gridData);
+                    Dialog.applyDialogFont(result);
+                    return result;
+                }
+
+                @Override
+                public Point getLocation(Point tipSize, Event event) {
+                    return messageLabel.getShell().toDisplay(messageLabel.getLocation());
+                }
+            };
+            messageLabel.setData(tooltip);
+            tooltip.setPopupDelay(0);
+            tooltip.activate();
+        }
+    }
+
+    /**
+     * Set the message text. If the message line currently displays an error, the message is saved and will be
+     * redisplayed when the error message is set to <code>null</code>.
+     * <p>
+     * Shortcut for <code>setMessage(newMessage, IMessageProvider.NONE)</code>
+     * </p>
+     * This method should be called after the dialog has been opened as it updates the message label immediately.
+     *
+     * @param newMessage the message, or <code>null</code> to clear the message
+     */
+    public void setMessage(String newMessage) {
+        setMessage(newMessage, IMessageProvider.NONE);
+    }
+
+    /**
+     * Sets the message for this dialog with an indication of what type of message it is.
+     * <p>
+     * The valid message types are one of <code>NONE</code>, <code>INFORMATION</code>,<code>WARNING</code>, or
+     * <code>ERROR</code>.
+     * </p>
+     * <p>
+     * Note that for backward compatibility, a message of type <code>ERROR</code> is different than an error message
+     * (set using <code>setErrorMessage</code>). An error message overrides the current message until the error message
+     * is cleared. This method replaces the current message and does not affect the error message.
+     * </p>
+     *
+     * @param newMessage the message, or <code>null</code> to clear the message
+     * @param newType the message type
+     * @since 2.0
+     */
+    public void setMessage(String newMessage, int newType) {
+        Image newImage = null;
+        if (newMessage != null) {
+            switch (newType) {
+            case IMessageProvider.NONE:
+                break;
+            case IMessageProvider.INFORMATION:
+                newImage = JFaceResources.getImage(DLG_IMG_MESSAGE_INFO);
+                break;
+            case IMessageProvider.WARNING:
+                newImage = JFaceResources.getImage(DLG_IMG_MESSAGE_WARNING);
+                break;
+            case IMessageProvider.ERROR:
+                newImage = JFaceResources.getImage(DLG_IMG_MESSAGE_ERROR);
+                break;
+            }
+        }
+        showMessage(newMessage, newImage);
+    }
+
+    /**
+     * Show the new message and image.
+     *
+     * @param newMessage
+     * @param newImage
+     */
+    protected void showMessage(String newMessage, Image newImage) {
+        // https://bugs.eclipse.org/bugs/show_bug.cgi?id=249915
+        if (newMessage == null)
+            newMessage = ""; //$NON-NLS-1$
+
+        // Any change?
+        if (message.equals(newMessage) && messageImage == newImage) {
+            return;
+        }
+        message = newMessage;
+
+        // Message string to be shown - if there is an image then add in
+        // a space to the message for layout purposes
+        String shownMessage = (newImage == null) ? message : " " + message; //$NON-NLS-1$
+        messageImage = newImage;
+        if (!showingError) {
+            // we are not showing an error
+            updateMessage(shownMessage);
+            messageImageLabel.setImage(messageImage);
+            setImageLabelVisible(messageImage != null);
+            layoutForNewMessage(false);
+        }
+    }
+
+    /**
+     * Update the contents of the messageLabel.
+     *
+     * @param newMessage the message to use
+     */
+    protected void updateMessage(String newMessage) {
+        String oldMessage = messageLabel.getText();
+        messageLabel.setText(newMessage);
+        // Bug 248410 - This snippet will only work with Windows screen readers.
+        messageLabel.getAccessible().sendEvent(ACC.EVENT_ATTRIBUTE_CHANGED, null);
+        messageLabel.getAccessible().sendEvent(ACC.EVENT_TEXT_CHANGED, new Object[] { Integer.valueOf(ACC.TEXT_DELETE),
+                Integer.valueOf(0), Integer.valueOf(oldMessage.length()), oldMessage });
+        messageLabel.getAccessible().sendEvent(ACC.EVENT_TEXT_CHANGED, new Object[] { Integer.valueOf(ACC.TEXT_INSERT),
+                Integer.valueOf(0), Integer.valueOf(newMessage.length()), newMessage });
+    }
+
+    /**
+     * Sets the title to be shown in the title area of this dialog.
+     *
+     * @param newTitle the title show
+     */
+    public void setTitle(String newTitle) {
+        if (titleLabel == null)
+            return;
+        String title = newTitle;
+        if (title == null)
+            title = "";//$NON-NLS-1$
+        titleLabel.setText(title);
+    }
+
+    /**
+     * Sets the title bar color for this dialog.
+     *
+     * @param color the title bar color
+     */
+    public void setTitleAreaColor(RGB color) {
+        titleAreaRGB = color;
+    }
+
+    /**
+     * Sets the title image to be shown in the title area of this dialog.
+     *
+     * @param newTitleImage the title image to be shown
+     */
+    public void setTitleImage(Image newTitleImage) {
+
+        titleAreaImage = newTitleImage;
+        if (titleImageLabel != null) {
+            titleImageLabel.setImage(newTitleImage);
+            determineTitleImageLargest();
+            Control top;
+            if (titleImageLargest)
+                top = titleImageLabel;
+            else
+                top = messageLabel;
+            resetWorkAreaAttachments(top);
+        }
+    }
+
+    /**
+     * Make the label used for displaying error images visible depending on boolean.
+     *
+     * @param visible If <code>true</code> make the image visible, if not then make it not visible.
+     */
+    protected void setImageLabelVisible(boolean visible) {
+        messageImageLabel.setVisible(visible);
+        bottomFillerLabel.setVisible(visible);
+        leftFillerLabel.setVisible(visible);
+    }
+
+    /**
+     * Reset the attachment of the workArea to now attach to top as the top control.
+     *
+     * @param top
+     */
+    protected void resetWorkAreaAttachments(Control top) {
+        FormData childData = new FormData();
+        childData.top = new FormAttachment(top);
+        childData.right = new FormAttachment(100, 0);
+        childData.left = new FormAttachment(0, 0);
+        childData.bottom = new FormAttachment(100, 0);
+        workArea.setLayoutData(childData);
+    }
+
+    /**
+     * Returns the current message text for this dialog. This message is displayed in the message line of the dialog
+     * when the error message is <code>null</code>. If there is a non-null error message, this message is not shown, but
+     * is stored so that it can be shown in the message line whenever {@link #setErrorMessage(String)} is called with a
+     * <code>null</code> parameter.
+     *
+     * @return the message text, which is never <code>null</code>.
+     *
+     * @see #setMessage(String)
+     * @see #setErrorMessage(String)
+     *
+     * @since 3.6
+     */
+
+    public String getMessage() {
+        return message;
+    }
+
+    /**
+     * Returns the current error message being shown in the dialog, or <code>null</code> if there is no error message
+     * being shown.
+     *
+     * @return the error message, which may be <code>null</code>.
+     *
+     * @see #setErrorMessage(String)
+     * @see #setMessage(String)
+     *
+     * @since 3.6
+     */
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/formtools/LabelledCheckbox.java

@@ -0,0 +1,233 @@
+// ============================================================================
+//
+// 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.commons.ui.swt.formtools;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+
+/**
+ * Create a Label and a Checkbox.
+ */
+public class LabelledCheckbox implements LabelledWidget{
+
+    private Button button;
+
+    private Label label;
+
+    /**
+     * Create a Label and a Text.
+     *
+     * @param composite
+     * @param string
+     */
+    public LabelledCheckbox(Composite composite, String string) {
+        createLabelledButton(composite, string, 1, true);
+    }
+
+    /**
+     * Create a Label and a Text.
+     *
+     * @param composite
+     * @param string
+     * @param isFill
+     */
+    public LabelledCheckbox(Composite composite, String string, boolean isFill) {
+        createLabelledButton(composite, string, 1, isFill);
+    }
+
+    /**
+     * Create a Label and a Button width specific styleField.
+     *
+     * @param composite
+     * @param string
+     * @param int horizontalSpan
+     */
+    public LabelledCheckbox(Composite composite, String string, int horizontalSpan) {
+        createLabelledButton(composite, string, horizontalSpan, true);
+    }
+
+    /**
+     * Create a Label and a Button width specific styleField.
+     *
+     * @param composite
+     * @param string
+     * @param int horizontalSpan
+     * @param styleField
+     */
+    public LabelledCheckbox(Composite composite, String string, int horizontalSpan, int styleField) {
+        createLabelledButton(composite, string, horizontalSpan, true);
+    }
+
+    /**
+     * Create a Label and a Button width Gridata option FILL.
+     *
+     * @param composite
+     * @param string
+     * @param styleField
+     * @param int horizontalSpan
+     * @param isFill
+     */
+    public LabelledCheckbox(Composite composite, String string, int horizontalSpan, boolean isFill) {
+        createLabelledButton(composite, string, horizontalSpan, isFill);
+    }
+
+    /**
+     * Create a Label and a Button width specific styleField and Gridata option FILL.
+     *
+     * @param composite
+     * @param string
+     * @param int horizontalSpan
+     * @param styleField
+     * @param isFill
+     */
+    public LabelledCheckbox(Composite composite, String string, int horizontalSpan, int styleField, boolean isFill) {
+        createLabelledButton(composite, string, horizontalSpan, isFill);
+    }
+
+    /**
+     * Create a Label and a Button width specific styleField and Gridata option FILL.
+     *
+     * @param composite
+     * @param string
+     * @param int horizontalSpan
+     * @param styleField
+     * @param isFill
+     */
+    private void createLabelledButton(Composite composite, String string, int horizontalSpan, boolean isFill) {
+        label = new Label(composite, SWT.LEFT);
+        if (string != null) {
+            label.setText(string);
+        }
+
+        button = new Button(composite, SWT.CHECK);
+        int gridDataStyle = SWT.NONE;
+        if (isFill) {
+            gridDataStyle = SWT.FILL;
+        }
+        GridData gridData = new GridData(gridDataStyle, SWT.CENTER, true, false);
+        gridData.horizontalSpan = horizontalSpan;
+        button.setLayoutData(gridData);
+
+    }
+
+    /**
+     * setToolTipText to Text Object.
+     *
+     * @param string
+     */
+    public void setToolTipText(final String string) {
+        button.setToolTipText(string);
+    }
+
+    /**
+     * is Checkbox Selected.
+     *
+     * @return boolean
+     */
+    public Boolean isSelected() {
+        return button.getSelection();
+    }
+
+    /**
+     * setText to Label Object.
+     *
+     * @param string
+     */
+    public void setLabelText(final String string) {
+        if (string != null) {
+            label.setText(string);
+        } else {
+            label.setText(""); //$NON-NLS-1$
+        }
+
+    }
+
+    /**
+     * setEditable to Button and Label Object.
+     *
+     * @param boolean
+     */
+    public void forceFocus() {
+        setEnabled(true);
+        button.forceFocus();
+    }
+
+    /**
+     * setEnabled to Button and Label Object.
+     *
+     * @param boolean
+     */
+    public void setEnabled(final boolean visible) {
+        button.setEnabled(visible);
+        label.setEnabled(visible);
+    }
+
+    /**
+     * setVisible to Button and Label Object.
+     *
+     * @param boolean
+     */
+    public void setVisible(final boolean visible) {
+        button.setVisible(visible);
+        label.setVisible(visible);
+    }
+
+    public void setVisible(final boolean visible, final boolean exclude) {
+        Control[] controls = new Control[] { label, button };
+        for (Control control : controls) {
+            control.setVisible(visible);
+            if (control.getLayoutData() instanceof GridData) {
+                ((GridData) control.getLayoutData()).exclude = exclude;
+            }
+        }
+    }
+
+    /**
+     * addListener to Button Object.
+     *
+     * @param eventType
+     * @param listener
+     */
+    public void addListener(int eventType, Listener listener) {
+        button.addListener(eventType, listener);
+    }
+
+    /**
+     * addFocusListener to Button Object.
+     *
+     * @param listener
+     */
+    public void addFocusListener(FocusListener listener) {
+        button.addFocusListener(listener);
+    }
+
+    @Override
+    public void set(String value) {
+        button.setSelection(Boolean.parseBoolean(value));
+    }
+    
+    public void addSelectionListener(SelectionListener listener) {
+        button.addSelectionListener(listener);
+    }
+    
+    public boolean getSelection() {
+        return button.getSelection();
+    }
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/formtools/LabelledText.java

@@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Text;
  * $Id: LabelledText.java 7038 2007-11-15 14:05:48Z plegall $
  *
  */
-public class LabelledText {
+public class LabelledText implements LabelledWidget{
 
     private Text text;
 
@@ -297,6 +297,16 @@ public class LabelledText {
         label.setVisible(visible);
     }
 
+    public void setVisible(final boolean visible, final boolean exclude) {
+        Control[] controls = new Control[] { label, text };
+        for (Control control : controls) {
+            control.setVisible(visible);
+            if (control.getLayoutData() instanceof GridData) {
+                ((GridData) control.getLayoutData()).exclude = exclude;
+            }
+        }
+    }
+    
     public boolean isVisiable() {
         return text.isVisible() && label.isVisible();
     }
@@ -472,4 +482,9 @@ public class LabelledText {
             text.getParent().layout();
     }
 
+    @Override
+    public void set(String value) {
+        this.setText(value);
+    }
+
 }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/formtools/LabelledWidget.java

@@ -0,0 +1,9 @@
+package org.talend.commons.ui.swt.formtools;
+
+public interface LabelledWidget {
+    
+    // Set the value of the widget
+    public void set(String value);
+    
+    public void setVisible(boolean visible, boolean exclude);
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/wizard/TalendWizard.java

@@ -0,0 +1,28 @@
+// ============================================================================
+//
+// 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.commons.ui.swt.wizard;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class TalendWizard {
+
+    /**
+     * DOC cmeng TalendWizard constructor comment.
+     */
+    public TalendWizard() {
+        // TODO Auto-generated constructor stub
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/wizard/TalendWizardDialog.java

@@ -0,0 +1,55 @@
+// ============================================================================
+//
+// 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.commons.ui.swt.wizard;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class TalendWizardDialog extends Dialog {
+
+    public TalendWizardDialog(Shell parentShell) {
+        super(parentShell);
+    }
+
+    @Override
+    protected Control createContents(Composite parent) {
+        return super.createContents(parent);
+    }
+
+    public static void main(String[] args) throws Exception {
+        int sleep = 1000 / 60;
+        double time = 1.0 / 50;
+        int total = 0;
+        for (int i = 1; i <= 25; i++) {
+            double curTime = time * i;
+            double value = 1.0 - Math.sqrt(1 - curTime * curTime);
+            int lengh = (int) (250 * value);
+            total += lengh;
+            System.out.println(i + "\t:" + lengh + ", total: " + total);
+        }
+        for (int i = 25; i <= 50; i++) {
+            double curTime = 1 - time * i;
+            double value = 1.0 - Math.sqrt(1 - curTime * curTime);
+            int lengh = (int) (250 * value);
+            total += lengh;
+            System.out.println(i + "\t:" + lengh + ", total: " + total);
+        }
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/wizard/TalendWizardPage.java

@@ -0,0 +1,28 @@
+// ============================================================================
+//
+// 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.commons.ui.swt.wizard;
+
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class TalendWizardPage {
+
+    /**
+     * DOC cmeng TalendWizardPage constructor comment.
+     */
+    public TalendWizardPage() {
+        // TODO Auto-generated constructor stub
+    }
+
+}

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/utils/workbench/gef/SimpleHtmlFigure.java

@@ -113,10 +113,6 @@ public class SimpleHtmlFigure extends Figure {
         add(horizContainer);
     }
 
-    public void setText(final String text) {
-        setText(text, false);
-    }
-
     /**
      * Display some HTML text..
      *
@@ -124,7 +120,7 @@ public class SimpleHtmlFigure extends Figure {
      * @param isSysDefaultColor true if use system default font color
      */
     @SuppressWarnings("unchecked")
-    public void setText(final String text, boolean isSysDefaultColor) {
+    public void setText(final String text) {
 
         if (this.text.equals(text)) {
             // if the text is the same, there's nothing to change, so return.
@@ -142,16 +138,14 @@ public class SimpleHtmlFigure extends Figure {
         newHorizContainer();
 
         List<Color> colorStack = new ArrayList<Color>();
-        colorStack.add(ColorConstants.black);
-        // for some dark theme system like Ubuntu,if true use default system font color
-        buildFigures(text, SWT.None, colorStack, isSysDefaultColor);
+        buildFigures(text, SWT.None, colorStack);
 
         setPreferredSize(computePreferedSize());
 
         this.text = text;
     }
 
-    private void buildFigures(final String newText, final int fontCode, final List<Color> colorStack, boolean isSysDefaultColor) {
+    private void buildFigures(final String newText, final int fontCode, final List<Color> colorStack) {
         // Optimize
         if (newText == null || newText.length() == 0) {
             return;
@@ -167,7 +161,7 @@ public class SimpleHtmlFigure extends Figure {
         if (isFirstIndex(boldIndex, italicIndex, fontIndex, brIndex)) {
             if (boldIndex > 0) {
                 String begText = newText.substring(0, boldIndex);
-                buildFigures(begText, newFontCode, colorStack, isSysDefaultColor);
+                buildFigures(begText, newFontCode, colorStack);
             }
             newFontCode = newFontCode | SWT.BOLD;
 
@@ -176,17 +170,17 @@ public class SimpleHtmlFigure extends Figure {
             if (endBoldIndex != -1) {
                 String boldText = newText.substring(boldIndex + TAG_BOLD_BEG.length(), endBoldIndex);
                 endText = newText.substring(endBoldIndex + TAG_BOLD_END.length());
-                buildFigures(boldText, newFontCode, colorStack, isSysDefaultColor);
+                buildFigures(boldText, newFontCode, colorStack);
             } else {
                 endText = newText.substring(boldIndex + TAG_BOLD_BEG.length());
             }
 
             newFontCode = newFontCode ^ SWT.BOLD;
-            buildFigures(endText, newFontCode, colorStack, isSysDefaultColor);
+            buildFigures(endText, newFontCode, colorStack);
         } else if (isFirstIndex(italicIndex, boldIndex, fontIndex, brIndex)) {
             if (italicIndex > 0) {
                 String begText = newText.substring(0, italicIndex);
-                buildFigures(begText, newFontCode, colorStack, isSysDefaultColor);
+                buildFigures(begText, newFontCode, colorStack);
             }
             newFontCode = newFontCode | SWT.ITALIC;
 
@@ -195,52 +189,59 @@ public class SimpleHtmlFigure extends Figure {
             if (endItalicIndex != -1) {
                 String italicText = newText.substring(italicIndex + TAG_ITALIC_BEG.length(), endItalicIndex);
                 endText = newText.substring(endItalicIndex + TAG_ITALIC_END.length());
-                buildFigures(italicText, newFontCode, colorStack, isSysDefaultColor);
+                buildFigures(italicText, newFontCode, colorStack);
             } else {
                 endText = newText.substring(italicIndex + TAG_ITALIC_BEG.length());
             }
             newFontCode = newFontCode ^ SWT.ITALIC;
 
-            buildFigures(endText, newFontCode, colorStack, isSysDefaultColor);
+            buildFigures(endText, newFontCode, colorStack);
         } else if (isFirstIndex(fontIndex, boldIndex, italicIndex, brIndex)) {
             if (fontIndex > 0) {
                 String begText = newText.substring(0, fontIndex);
-                buildFigures(begText, newFontCode, colorStack, isSysDefaultColor);
+                buildFigures(begText, newFontCode, colorStack);
             }
             int colorIndex = newText.indexOf(TAG_FONT_COLOR_BEG_1);
 
-            Color color;
+            Color color = null;
             int colorIndex2 = newText.indexOf(TAG_FONT_BEG_2);
             if (colorIndex2 != -1) {
                 String colorCode = newText.substring(colorIndex + TAG_FONT_COLOR_BEG_1.length(), colorIndex2);
                 color = getColor(colorCode);
-            } else {
+            } else if (colorStack.size() > 0){
                 color = colorStack.get(colorStack.size() - 1);
             }
-            colorStack.add(color);
+            
+            boolean isPushed = false;
+            if (color != null) {
+                colorStack.add(color);
+                isPushed = true;
+            }
 
             String endText;
             int endColorIndex = newText.indexOf(TAG_FONT_END);
             if (endColorIndex != -1) {
                 String colorText = newText.substring(colorIndex2 + TAG_FONT_BEG_2.length(), endColorIndex);
                 endText = newText.substring(endColorIndex + TAG_FONT_END.length());
-                buildFigures(colorText, newFontCode, colorStack, isSysDefaultColor);
+                buildFigures(colorText, newFontCode, colorStack);
             } else {
                 endText = newText.substring(colorIndex2 + TAG_FONT_BEG_2.length());
             }
 
-            colorStack.remove(colorStack.size() - 1);
-            buildFigures(endText, newFontCode, colorStack, isSysDefaultColor);
+            if (isPushed) {
+                colorStack.remove(colorStack.size() - 1); 
+            }
+            buildFigures(endText, newFontCode, colorStack);
         } else if (isFirstIndex(brIndex, boldIndex, italicIndex, fontIndex)) {
             if (brIndex > 0) {
                 String begText = newText.substring(0, brIndex);
-                buildFigures(begText, newFontCode, colorStack, isSysDefaultColor);
+                buildFigures(begText, newFontCode, colorStack);
             }
 
             newHorizContainer();
 
             String endText = newText.substring(brIndex + TAG_BR.length());
-            buildFigures(endText, newFontCode, colorStack, isSysDefaultColor);
+            buildFigures(endText, newFontCode, colorStack);
         } else {
             Font fontToUse;
             Label label = new Label();
@@ -259,7 +260,7 @@ public class SimpleHtmlFigure extends Figure {
                 }
             }
             label.setFont(fontToUse);
-            if (!isSysDefaultColor) {
+            if (colorStack.size() > 0) {
                 label.setForegroundColor(colorStack.get(colorStack.size() - 1));
             }
             horizContainer.add(label);

main/plugins/org.talend.core.repository/plugin.xml

@@ -93,8 +93,8 @@
        <RepositoryComponent
              name="EXASOL"
              withSchema="true"
-             input="tEXAInput"
-             output="tEXAOutput">
+             input="tExasolInput"
+             output="tExasolOutput">
           <Item
                 clazz="org.talend.core.model.properties.DatabaseConnectionItem">
           </Item>

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/constants/Constant.java

@@ -39,6 +39,19 @@ public final class Constant {
      */
     public static final String ITEM_EVENT_PROPERTY_KEY = "item"; //$NON-NLS-1$
 
+
+    /**
+     * key used to get/set the property of an event related to an item (REPOSITORY_ITEM_EVENT_PREFIX). The value is the
+     * cloudVersion string.
+     */
+    public static final String VERSION_EVENT_CLOUD_KEY = "cloudVersion"; //$NON-NLS-1$
+
+    /**
+     * key used to get/set the property of an event related to an item (REPOSITORY_ITEM_EVENT_PREFIX). The value is the
+     * cloudName string.
+     */
+    public static final String VERSION_EVENT_CLOUD_NAME = "cloudName"; //$NON-NLS-1$
+    
     /**
      * key used to get/set the property of an event related to a list of files modified in the repository
      * (REPOSITORY_ITEM_EVENT_PREFIX). The value is the Collection of String (list of all files modified).
@@ -56,6 +69,11 @@ public final class Constant {
      */
     public static final String PROJECT_RELOAD_EVENT_SUFFIX = "project"; //$NON-NLS-1$
 
+    /**
+     * suffix used when issuing an event on the OSGI event bus when published to cloud.
+     */
+    public static final String CLOUD_PUBLISH_EVENT_SUFFIX = "cloud"; //$NON-NLS-1$
+
 
     /**
      * key used to get/set the property of an event related to a list of files modified in the repository

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages.properties

@@ -168,7 +168,8 @@ ProjectRepositoryNode.sapFunctions.inputSchema=Input
 ProjectRepositoryNode.sapFunctions.outputSchema=Output
 ProjectRepositoryNode.sapIDocs=SAP iDocs
 ProjectRepositoryNode.sapTables=SAP Tables
-ProjectRepositoryNode.sapBWAdvancedDataStoreObject=SAP ADSO
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.input=SAP ADSO (Input) 
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.output=SAP ADSO (Output)
 ProjectRepositoryNode.sapBWDataSource=SAP DataSource
 ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_fr.properties

@@ -91,7 +91,7 @@ PasteAction.thisText.paste=Coller
 DeleteAction.action.foreverTitle=Supprimer d\u00E9finitivement
 DeleteAction.action.logicalTitle=Supprimer
 DeleteAction.action.logicalToolTipText=Placer l'\u00E9l\u00E9ment dans la Corbeille
-DeleteAction.deleteJobAssignedToOneService= est attribu\u00E9 \u00E0 une op\u00E9ration d'un service.\nSupprimer ce Job ?
+DeleteAction.deleteJobAssignedToOneService= est assign\u00E9 \u00E0 une op\u00E9ration d'un Service.\nSupprimer ce Job ?
 DeleteAction.deleteSomeJobsAssignedToServices= sont assign\u00E9s \u00E0 des op\u00E9rations de Services.\nSupprimer ces Jobs ?
 DeleteAction.dialog.message0=sera supprim\u00E9 d\u00E9finitivement (r\u00E9cup\u00E9ration impossible).
 DeleteAction.dialog.message1=Les \u00E9l\u00E9ments s\u00E9lectionn\u00E9s seront supprim\u00E9s d\u00E9finitivement (pas de r\u00E9cup\u00E9ration possible).
@@ -168,7 +168,8 @@ ProjectRepositoryNode.sapFunctions.inputSchema=Lecture
 ProjectRepositoryNode.sapFunctions.outputSchema=Sortie
 ProjectRepositoryNode.sapIDocs=SAP IDoc
 ProjectRepositoryNode.sapTables=Tables SAP
-ProjectRepositoryNode.sapBWAdvancedDataStoreObject=ADSO SAP
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.input=SAP ADSO (Entr\u00E9e) 
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.output=SAP ADSO (Sortie)
 ProjectRepositoryNode.sapBWDataSource=Source des donn\u00E9es SAP
 ProjectRepositoryNode.sapBWDataStoreObject=Objet Data Store SAP
 ProjectRepositoryNode.sapBWInfoCube=InfoCube SAP

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_ja.properties

@@ -91,15 +91,15 @@ PasteAction.thisText.paste=\u8CBC\u308A\u4ED8\u3051
 DeleteAction.action.foreverTitle=\u5B8C\u5168\u306B\u524A\u9664
 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(\u5FA9\u65E7\u3067\u304D\u307E\u305B\u3093)
+DeleteAction.deleteJobAssignedToOneService= 1\u3064\u306E\u30B5\u30FC\u30D3\u30B9\u306E1\u3064\u306E\u64CD\u4F5C\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u307E\u3057\u305F!\n\u3053\u306E\u30B8\u30E7\u30D6\u3092\u524A\u9664\u3057\u307E\u3059\u304B?
+DeleteAction.deleteSomeJobsAssignedToServices= \u4E00\u90E8\u306E\u30B5\u30FC\u30D3\u30B9\u306E\u4E00\u90E8\u306E\u64CD\u4F5C\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u307E\u3057\u305F!\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(\u5FA9\u5143\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
 DeleteAction.dialog.title=\u5B8C\u5168\u306B\u524A\u9664
-DeleteAction.error.lockedOrOpenedObject.newMessage={0}\u304C\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\n\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u958B\u3044\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u524A\u9664\u524D\u306B\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-DeleteAction.error.testCaseLockedOrOpenedObject.newMessage={0}\u306E\u30C6\u30B9\u30C8\u30B1\u30FC\u30B9\u304C\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\n\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u958B\u3044\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u524A\u9664\u524D\u306B\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+DeleteAction.error.lockedOrOpenedObject.newMessage={0}\u306F\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\n \u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u304C\u958B\u3044\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u524A\u9664\u3059\u308B\u524D\u306B\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+DeleteAction.error.testCaseLockedOrOpenedObject.newMessage={0}\u306E\u30C6\u30B9\u30C8\u30B1\u30FC\u30B9\u306F\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\n \u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u304C\u958B\u3044\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u524A\u9664\u3059\u308B\u524D\u306B\u9589\u3058\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 DeleteAction.error.title=\u524A\u9664\u7981\u6B62
 DeleteAction.warning.message1=\u30D5\u30A9\u30EB\u30C0\u5185\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u958B\u304B\u308C\u3066\u3044\u308B\u305F\u3081\u30D5\u30A9\u30EB\u30C0\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3002\u3059\u3079\u3066\u306E\u30A2\u30A4\u30C6\u30E0\u3092\u9589\u3058\u305F\u72B6\u614B\u3067\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 DeleteAction.warning.title=\u8B66\u544A
@@ -132,7 +132,7 @@ ContextReferenceDialog.Recycle=\u3054\u307F\u7BB1\u5185
 ContextReferenceDialog.ReferenceJob=\u53C2\u7167\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8
 ContextReferenceDialog.Types=\u30BF\u30A4\u30D7
 ContextReferenceDialog.NodeTypeTip=\u30CE\u30FC\u30C9\u53C2\u7167\u306E\u30BF\u30A4\u30D7
-ContextReferenceDialog.Messages=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8({0} {1})\u306F\n\u304B\u3089\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059
+ContextReferenceDialog.Messages=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8({0} {1})\u306E\u53C2\u7167\u5143:\n
 ContextReferenceDialog.kindMessages={0} {1}\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u306F\u6B21\u306E\u30EA\u30B9\u30C8\u306B\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u524A\u9664\u3057\u305F\u3044\u5834\u5408\u306F\u3001\u30B8\u30E7\u30D6\u304C\u3082\u3046\u4E00\u5EA6\u958B\u304B\u308C\u305F\u6642\u306B\u3001\u30B8\u30E7\u30D6\u3067\u4F7F\u7528\u3055\u308C\u308B\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u306F\u7D44\u307F\u8FBC\u307F\u306B\u5909\u63DB\u3055\u308C\u307E\u3059\u3002\u524A\u9664\u3057\u307E\u3059\u304B?
 ContextReferenceDialog.kindMessages1={0} {1}\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B0\u30EB\u30FC\u30D7\u304C\u4EE5\u4E0B\u306E\u30EA\u30B9\u30C8\u306B\u53C2\u7167\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u524A\u9664\u3057\u307E\u3059\u304B?
 CopyToGenericSchemaHelper.cannotGenarateItem=\u8CBC\u4ED8\u3051\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u30E9\u30D9\u30EB\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093\u3002
@@ -168,7 +168,8 @@ ProjectRepositoryNode.sapFunctions.inputSchema=\u5165\u529B
 ProjectRepositoryNode.sapFunctions.outputSchema=\u51FA\u529B
 ProjectRepositoryNode.sapIDocs=SAP iDocs
 ProjectRepositoryNode.sapTables=SAP\u30C6\u30FC\u30D6\u30EB
-ProjectRepositoryNode.sapBWAdvancedDataStoreObject=SAP ADSO
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.input=SAP ADSO (\u5165\u529B) 
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.output=SAP ADSO (\u51FA\u529B)
 ProjectRepositoryNode.sapBWDataSource=SAP DataSource
 ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
@@ -196,7 +197,7 @@ CreateFolderAction.action.toolTipText=\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u4F5C
 RenameFolderAction.action.title=\u30D5\u30A9\u30EB\u30C0\u30FC\u540D\u3092\u5909\u66F4
 RenameFolderAction.action.toolTipText=\u30D5\u30A9\u30EB\u30C0\u30FC\u540D\u3092\u5909\u66F4
 RenameFolderAction.description=\u30D5\u30A9\u30EB\u30C0\u30FC\u540D\u3092\u5909\u66F4
-RenameFolderAction.warning.editorOpen.message=\u73FE\u5728\u3001\u3053\u306E\u30D5\u30A9\u30EB\u30C0\u30FC\u306B\u542B\u307E\u308C\u308B\u30A2\u30A4\u30C6\u30E0({0})\u304C\u958B\u304B\u308C\u3066\u3044\u308B\u305F\u3081\u3001"{1}" \u30D5\u30A9\u30EB\u30C0\u30FC\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002\n\u9589\u3058\u3066\u3001\u518D\u8A66\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+RenameFolderAction.warning.editorOpen.message=\u73FE\u5728\u3001\u3053\u306E\u30D5\u30A9\u30EB\u30C0\u30FC\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u30A2\u30A4\u30C6\u30E0({0})\u304C\u958B\u304B\u308C\u3066\u3044\u308B\u305F\u3081\u3001"{1}"\u30D5\u30A9\u30EB\u30C0\u30FC\u306E\u540D\u524D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002\n\u9589\u3058\u3066\u304B\u3089\u3084\u308A\u76F4\u3057\u3066\u307F\u3066\u304F\u3060\u3055\u3044\u3002
 RenameFolderAction.warning.editorOpen.title=\u4F7F\u7528\u3067\u304D\u306A\u3044\u30A2\u30AF\u30B7\u30E7\u30F3
 RenameFolderAction.warning.cannotFind.message=\u30D5\u30A9\u30EB\u30C0\u30FC\u540D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002\u79FB\u52D5\u3055\u308C\u305F\u304B\u3001\u524A\u9664\u3055\u308C\u305F\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u66F4\u65B0\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u3001\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u3092\u66F4\u65B0\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 RenameFolderAction.warning.cannotFind.title=\u4F7F\u7528\u3067\u304D\u306A\u3044\u30A2\u30AF\u30B7\u30E7\u30F3

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages_zh_CN.properties

@@ -91,15 +91,15 @@ PasteAction.thisText.paste=\u7C98\u8D34
 DeleteAction.action.foreverTitle=\u6C38\u4E45\u5220\u9664
 DeleteAction.action.logicalTitle=\u5220\u9664
 DeleteAction.action.logicalToolTipText=\u5C06\u5BF9\u8C61\u653E\u5165\u56DE\u6536\u7AD9
-DeleteAction.deleteJobAssignedToOneService= \u88AB\u5206\u914D\u7ED9\u670D\u52A1\u7684\u4E00\u4E2A\u64CD\u4F5C\uFF01\n\u662F\u5426\u8981\u5220\u9664\u6B64\u4F5C\u4E1A\uFF1F
-DeleteAction.deleteSomeJobsAssignedToServices= \u88AB\u5206\u914D\u7ED9\u4E00\u4E9B\u670D\u52A1\u7684\u4E00\u4E9B\u64CD\u4F5C\uFF01\n\u662F\u5426\u8981\u5220\u9664\u8FD9\u4E9B\u4F5C\u4E1A\uFF1F
+DeleteAction.deleteJobAssignedToOneService= \u88AB\u5206\u914D\u7ED9\u4E00\u4E2A\u670D\u52A1\u7684\u4E00\u4E2A\u64CD\u4F5C\uFF01\n\u662F\u5426\u8981\u5220\u9664\u6B64\u4F5C\u4E1A\uFF1F
+DeleteAction.deleteSomeJobsAssignedToServices= \u88AB\u5206\u914D\u7ED9\u4E00\u4E9B\u670D\u52A1\u7684\u4E00\u4E9B\u64CD\u4F5C\n\u662F\u5426\u8981\u5220\u9664\u8FD9\u4E9B\u4F5C\u4E1A\uFF1F
 DeleteAction.dialog.message0=\u5C06\u6C38\u4E45\u5220\u9664 (\u4E0D\u53EF\u6062\u590D)\u3002
 DeleteAction.dialog.message1=\u6240\u9009\u5143\u7D20\u5C06\u6C38\u4E45\u5220\u9664 (\u65E0\u6CD5\u6062\u590D)\u3002
 DeleteAction.dialog.message2=\u4ECD\u7136\u7EE7\u7EED\uFF1F
 DeleteAction.dialog.messageAllElements=\u6240\u6709\u5143\u7D20\u90FD\u5C06\u6C38\u4E45\u5220\u9664 (\u65E0\u6CD5\u6062\u590D)\u3002
 DeleteAction.dialog.title=\u6C38\u4E45\u5220\u9664
-DeleteAction.error.lockedOrOpenedObject.newMessage={0} \u5DF2\u9501\u5B9A\uFF0C\u56E0\u6B64\u60A8\u4E0D\u80FD\u5220\u9664\u5B83\u3002\n\u5982\u679C\u6B64\u5BF9\u8C61\u6253\u5F00\uFF0C\u60A8\u5FC5\u987B\u5C06\u5176\u5173\u95ED\u4E4B\u540E\u624D\u80FD\u5220\u9664\u3002
-DeleteAction.error.testCaseLockedOrOpenedObject.newMessage=\u6D4B\u8BD5\u7528\u4F8B{0}\u88AB\u9501\u5B9A\uFF0C\u56E0\u6B64\u60A8\u65E0\u6CD5\u5220\u9664\u5B83\u3002\n\u5982\u679C\u6B64\u5BF9\u8C61\u88AB\u6253\u5F00\uFF0C\u60A8\u5FC5\u987B\u5728\u5220\u9664\u4E4B\u524D\u5173\u95ED\u5B83\u3002
+DeleteAction.error.lockedOrOpenedObject.newMessage={0} \u5DF2\u88AB\u9501\u5B9A\uFF0C\u56E0\u6B64\u65E0\u6CD5\u5220\u9664\u3002\n \u5982\u679C\u6B64\u5BF9\u8C61\u6253\u5F00\uFF0C\u60A8\u5FC5\u987B\u5C06\u5176\u5173\u95ED\u4E4B\u540E\u624D\u80FD\u5220\u9664\u3002
+DeleteAction.error.testCaseLockedOrOpenedObject.newMessage={0} \u7684\u6D4B\u8BD5\u7528\u4F8B\u5DF2\u88AB\u9501\u5B9A\uFF0C\u56E0\u6B64\u65E0\u6CD5\u5220\u9664\u3002\n \u5982\u679C\u6B64\u5BF9\u8C61\u6253\u5F00\uFF0C\u60A8\u5FC5\u987B\u5C06\u5176\u5173\u95ED\u4E4B\u540E\u624D\u80FD\u5220\u9664\u3002
 DeleteAction.error.title=\u7981\u6B62\u5220\u9664
 DeleteAction.warning.message1=\u65E0\u6CD5\u5220\u9664\u8BE5\u6587\u4EF6\u5939\uFF0C\u56E0\u4E3A\u5176\u4E2D\u81F3\u5C11\u6709\u4E00\u4E2A\u9879\u76EE\u5F53\u524D\u5904\u4E8E\u6253\u5F00\u72B6\u6001\u3002\u5173\u95ED\u6240\u6709\u6253\u5F00\u7684\u9879\u76EE\u5E76\u91CD\u8BD5\u3002
 DeleteAction.warning.title=\u8B66\u544A
@@ -117,7 +117,7 @@ DuplicateAction.SameAsProjectname=\u540D\u79F0\u4E0E\u5DE5\u7A0B\u540D\u79F0\u76
 EmptyRecycleBinAction.action.title=\u6E05\u7A7A\u56DE\u6536\u7AD9
 EmptyRecycleBinAction.action.toolTipText=\u6E05\u7A7A\u56DE\u6536\u7AD9
 EmptyRecycleBinAction.dialog.title=\u6E05\u7A7A\u56DE\u6536\u7AD9
-EmptyRecycleBinAction.dialog.allDependencies=\u4F60\u4E0D\u80FD\u6E05\u7A7A\u56DE\u6536\u7AD9\u3002\nData Profiler Perspective \u4EE5\u6765\u5176\u4E2D\u4E00\u4E2A\u9879\u76EE\uFF0C\u8BF7\u4E0D\u8981\u5220\u9664\u5B83\u3002
+EmptyRecycleBinAction.dialog.allDependencies=\u60A8\u4E0D\u80FD\u6E05\u7A7A\u56DE\u6536\u7AD9\u3002\nData Profiler \u900F\u89C6\u56FE\u4F9D\u8D56\u5176\u4E2D\u4E00\u4E2A\u9879\u76EE\uFF0C\u8BF7\u4E0D\u8981\u5220\u9664\u5B83\u3002
 PasteObjectAction.error.labelAlreadyExists=\u6B64\u8DEF\u5F84\u4E0B\u5DF2\u5B58\u5728\u5E26\u6709\u8BE5\u6807\u7B7E\u7684\u5BF9\u8C61
 PasteObjectAction.error.title=\u65E0\u6CD5\u7C98\u8D34
 JobletReferenceDialog.DeletedInfor=\u5728\u56DE\u6536\u7AD9
@@ -168,7 +168,8 @@ ProjectRepositoryNode.sapFunctions.inputSchema=\u8F93\u5165
 ProjectRepositoryNode.sapFunctions.outputSchema=\u8F93\u51FA
 ProjectRepositoryNode.sapIDocs=SAP iDocs
 ProjectRepositoryNode.sapTables=SAP \u8868
-ProjectRepositoryNode.sapBWAdvancedDataStoreObject=SAP ADSO
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.input=SAP ADSO (\u8F93\u5165) 
+ProjectRepositoryNode.sapBWAdvancedDataStoreObject.output=SAP ADSO (\u8F93\u51FA)
 ProjectRepositoryNode.sapBWDataSource=SAP DataSource
 ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/PendoItemSignatureManager.java

@@ -0,0 +1,280 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.model;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.apache.commons.lang.StringUtils;
+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.core.ICoreService;
+import org.talend.core.PluginChecker;
+import org.talend.core.model.properties.Property;
+import org.talend.core.model.properties.RoutineItem;
+import org.talend.core.model.properties.SQLPatternItem;
+import org.talend.core.model.repository.ERepositoryObjectType;
+import org.talend.core.model.repository.IRepositoryViewObject;
+import org.talend.core.pendo.PendoItemSignatureUtil;
+import org.talend.core.pendo.PendoItemSignatureUtil.SignatureStatus;
+import org.talend.core.pendo.PendoItemSignatureUtil.TOSProdNameEnum;
+import org.talend.core.pendo.PendoItemSignatureUtil.ValueEnum;
+import org.talend.core.pendo.PendoTrackDataUtil;
+import org.talend.core.pendo.PendoTrackDataUtil.TrackEvent;
+import org.talend.core.pendo.PendoTrackSender;
+import org.talend.core.pendo.properties.PendoSignLogonProperties;
+import org.talend.utils.migration.MigrationTokenUtil;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoItemSignatureManager {
+
+    private PendoSignLogonProperties itemSignProperties = new PendoSignLogonProperties();
+
+    private static PendoItemSignatureManager manager;
+
+    private static boolean isTrackAvailable;
+
+    static {
+        manager = new PendoItemSignatureManager();
+        try {
+            isTrackAvailable = PluginChecker.isTIS() && PendoTrackSender.getInstance().isTrackSendAvailable();
+        } catch (Exception e) {
+            ExceptionHandler.process(e, Level.WARN);
+        }
+    }
+
+    private PendoItemSignatureManager() {
+    }
+
+    public static PendoItemSignatureManager getInstance() {
+        return manager;
+    }
+
+    private Set<String> signByLoginMigrationItems = new HashSet<String>();
+
+    public void countItemSignByMigration(String file) {
+        if (!isTrackAvailable) {
+            return;
+        }
+        if (!ProxyRepositoryFactory.getInstance().isFullLogonFinished()) {
+            signByLoginMigrationItems.add(file);
+        }
+    }
+
+    public void collectProperties() {
+        ICoreService coreService = ICoreService.get();
+        if (coreService == null || !isTrackAvailable) {
+            return;
+        }
+        try {
+            itemSignProperties.setSignByMigration(signByLoginMigrationItems.size());
+
+            String seperator = "@";
+            Map<String, Integer> tosUnsignItemMap = new HashMap<String, Integer>();
+            Map<String, Integer> invalidItemVersionMap = new HashMap<String, Integer>();
+            Set<String> checkedItem = new HashSet<String>();
+            ProxyRepositoryFactory proxyRepositoryFactory = ProxyRepositoryFactory.getInstance();
+            ERepositoryObjectType[] types = (ERepositoryObjectType[]) ERepositoryObjectType.values();
+            for (ERepositoryObjectType type : types) {
+                List<IRepositoryViewObject> allObjectList = proxyRepositoryFactory.getAll(type);
+                for (IRepositoryViewObject repositoryObject : allObjectList) {
+                    Property property = repositoryObject.getProperty();
+                    if (property == null || property.eResource() == null) {
+                        continue;
+                    }
+                    String itemKey = repositoryObject.getRepositoryObjectType() + seperator + property.getId() + seperator
+                            + property.getVersion();
+                    if (isBuiltInItem(repositoryObject) || checkedItem.contains(itemKey)) {
+                        continue;
+                    }
+                    checkedItem.add(itemKey);
+                    Integer verifyResult = null;
+                    try {
+                        verifyResult = coreService.getSignatureVerifyResult(property, null, false);
+                        if (verifyResult != null) {
+                            switch (verifyResult) {
+                            case SignatureStatus.V_VALID:
+                                itemSignProperties.setValidItems(itemSignProperties.getValidItems() + 1);
+                                break;
+                            case SignatureStatus.V_UNSIGNED:
+                                String itemProductName = PendoItemSignatureUtil
+                                        .getItemProductName(property);
+                                if (StringUtils.isNotBlank(itemProductName)) {
+                                    String tosCategory = TOSProdNameEnum.getTOSCategoryByProdName(itemProductName);
+                                    if (StringUtils.isBlank(tosCategory)) {
+                                        itemSignProperties.setUnsignEEItems(itemSignProperties.getUnsignEEItems() + 1);
+                                    } else {
+                                        if (tosUnsignItemMap.get(tosCategory) == null) {
+                                            tosUnsignItemMap.put(tosCategory, 0);
+                                        }
+                                        tosUnsignItemMap.put(tosCategory, tosUnsignItemMap.get(tosCategory) + 1);
+                                    }
+                                }
+                                addInvalidItemVersion(property, invalidItemVersionMap);
+                                break;
+                            default:
+                                addInvalidItemVersion(property, invalidItemVersionMap);
+                                itemSignProperties.setInvalidSignItems(itemSignProperties.getInvalidSignItems() + 1);
+                            }
+
+                        }
+                    } catch (Exception e) {
+                        ExceptionHandler.process(e, Level.WARN);
+                        if (verifyResult == null) {
+                            // exception during verify
+                            addInvalidItemVersion(property, invalidItemVersionMap);
+                            itemSignProperties.setInvalidSignItems(itemSignProperties.getInvalidSignItems() + 1);
+                        }
+                    }
+                }
+            }
+
+            itemSignProperties.setInvalidItemSourceVersion(getSortInvalidItems(invalidItemVersionMap));
+            itemSignProperties.setUnsignSEItems(getSortTOSUnsignItems(tosUnsignItemMap));
+
+            itemSignProperties.setStudioVersion(PendoItemSignatureUtil.getStudioVersion());
+            if (coreService.isInValidGP()) {
+                itemSignProperties.setGracePeriod(ValueEnum.YES.getDisplayValue());
+            } else {
+                itemSignProperties.setGracePeriod(ValueEnum.NO.getDisplayValue());
+            }
+            String prodDate = PendoItemSignatureUtil.formatDate(System.getProperty(PendoItemSignatureUtil.PROD_DATE_ID),
+                    "yyyy-MM-dd");
+            itemSignProperties.setInstallDate(prodDate);
+            String projectCreateDate = PendoItemSignatureUtil.getCurrentProjectCreateDate();
+            itemSignProperties.setProjectCreateDate(PendoItemSignatureUtil.formatDate(projectCreateDate, "yyyy-MM-dd"));
+
+            String value = System.getProperty(PendoItemSignatureUtil.MIGRATION_TOKEN_KEY);
+            Map<String, Date> tokenTime = MigrationTokenUtil.getMigrationTokenTime(value);
+            if (tokenTime == null || tokenTime.isEmpty()) {
+                itemSignProperties.setValidMigrationToken(ValueEnum.NOT_APPLICATE.getDisplayValue());
+            } else {
+                String customer = coreService.getLicenseCustomer();
+                Date tokenDate = tokenTime.get(customer);
+                Date currentDate = new Date();
+                if (tokenDate != null && tokenDate.after(currentDate)) {
+                    itemSignProperties.setValidMigrationToken(ValueEnum.YES.getDisplayValue());
+                } else {
+                    itemSignProperties.setValidMigrationToken(ValueEnum.NO.getDisplayValue());
+                }
+            }
+
+        } catch (Exception e) {
+            ExceptionHandler.process(e, Level.WARN);
+        }
+
+    }
+
+    private void addInvalidItemVersion(Property property, Map<String, Integer> invalidItemVersionMap) {
+        String itemProductVersion = PendoItemSignatureUtil.getItemProductVersion(property);
+        if (StringUtils.isNotBlank(itemProductVersion)) {
+            if (invalidItemVersionMap.get(itemProductVersion) == null) {
+                invalidItemVersionMap.put(itemProductVersion, 0);
+            }
+            invalidItemVersionMap.put(itemProductVersion, invalidItemVersionMap.get(itemProductVersion) + 1);
+        }
+    }
+
+    private boolean isBuiltInItem(IRepositoryViewObject repositoryObject) {
+        if (repositoryObject.getProperty().getItem() instanceof SQLPatternItem) {
+            SQLPatternItem sqlPatternItem = (SQLPatternItem) repositoryObject.getProperty().getItem();
+            if (sqlPatternItem.isSystem()) {
+                return true;
+            }
+        }
+        if (repositoryObject.getProperty().getItem() instanceof RoutineItem) {
+            RoutineItem routineItem = (RoutineItem) repositoryObject.getProperty().getItem();
+            if (routineItem.isBuiltIn()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private String getSortTOSUnsignItems(Map<String, Integer> tosUnsignItemMap) {
+        List<Map.Entry<String, Integer>> resultMapList = new ArrayList<Map.Entry<String, Integer>>(tosUnsignItemMap.entrySet());
+        Collections.sort(resultMapList, new Comparator<Map.Entry<String, Integer>>() {
+
+            @Override
+            public int compare(Entry<String, Integer> o1, Entry<String, Integer> o2) {
+                List<TOSProdNameEnum> categoryList = Arrays.asList(TOSProdNameEnum.values());
+                TOSProdNameEnum category1 = TOSProdNameEnum.valueOf(o1.getKey());
+                TOSProdNameEnum category2 = TOSProdNameEnum.valueOf(o2.getKey());
+                return categoryList.indexOf(category1) - categoryList.indexOf(category2);
+            }
+        });
+        Map<String, Integer> tosUnsignMap = new LinkedHashMap<String, Integer>();
+        resultMapList.forEach(entry -> {
+            tosUnsignMap.put(entry.getKey(), entry.getValue());
+        });
+        return PendoTrackDataUtil.convertEntityJsonString(tosUnsignMap);
+    }
+
+    private String getSortInvalidItems(Map<String, Integer> invalidItemVersionMap) {
+        List<Map.Entry<String, Integer>> resultMapList = new ArrayList<Map.Entry<String, Integer>>(
+                invalidItemVersionMap.entrySet());
+        Collections.sort(resultMapList, new Comparator<Map.Entry<String, Integer>>(){
+
+            @Override
+            public int compare(Entry<String, Integer> o1, Entry<String, Integer> o2) {
+                return o1.getKey().compareTo(o2.getKey());
+            }
+            
+        });
+        Map<String, Integer> invalidMap = new LinkedHashMap<String, Integer>();
+        resultMapList.forEach(entry -> {
+            invalidMap.put(entry.getKey(), entry.getValue());
+        });
+        return PendoTrackDataUtil.convertEntityJsonString(invalidMap);
+    }
+
+    public void sendTrackToPendo() {
+        if (!isTrackAvailable) {
+            return;
+        }
+        Job job = new Job("send pendo track") {
+
+            @Override
+            protected IStatus run(IProgressMonitor monitor) {
+                try {
+                    collectProperties();
+                    PendoTrackSender.getInstance().sendTrackData(TrackEvent.ITEM_SIGNATURE, itemSignProperties);
+                } catch (Exception e) {
+                    // warning only
+                    ExceptionHandler.process(e, Level.WARN);
+                }
+                return Status.OK_STATUS;
+            }
+        };
+        job.setUser(false);
+        job.setPriority(Job.INTERACTIVE);
+        job.schedule();
+    }
+
+}

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProjectRepositoryNode.java

@@ -74,6 +74,7 @@ import org.talend.core.model.properties.ValidationRulesConnectionItem;
 import org.talend.core.model.repository.DynaEnum;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.Folder;
+import org.talend.core.model.repository.GITConstant;
 import org.talend.core.model.repository.IRepositoryContentHandler;
 import org.talend.core.model.repository.IRepositoryObject;
 import org.talend.core.model.repository.IRepositoryPrefConstants;
@@ -82,7 +83,6 @@ import org.talend.core.model.repository.RepositoryContentManager;
 import org.talend.core.model.repository.RepositoryManager;
 import org.talend.core.model.repository.RepositoryNodeProviderRegistryReader;
 import org.talend.core.model.repository.RepositoryViewObject;
-import org.talend.core.model.repository.GITConstant;
 import org.talend.core.repository.i18n.Messages;
 import org.talend.core.repository.model.repositoryObject.MetadataColumnRepositoryObject;
 import org.talend.core.repository.model.repositoryObject.MetadataTableRepositoryObject;
@@ -368,8 +368,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             }
             String[] contentRight = contentType.getUserRight();
             if (contentRight != null && contentRight.length > 0 && userRights != null && userRights.length > 0) {
-                for (int i = 0; i < contentRight.length; i++) {
-                    if (!ArrayUtils.contains(userRights, contentRight[i])) {
+                for (String element : contentRight) {
+                    if (!ArrayUtils.contains(userRights, element)) {
                         removeNode(this, node);
                     }
                 }
@@ -1731,22 +1731,25 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             node.getChildren().add(iDocNode);
             createSAPIDocNodes(repObj, metadataConnection, iDocNode);
 
-            // 4. BW AdvancedDataStoreObject:
-            createSAPBWAdvancedDataStoreObjectNodes(repObj, metadataConnection, node, validationRules);
+            // 4. BW AdvancedDataStoreObject Input:
+            createSAPBWAdvancedDataStoreObjectInputNodes(repObj, metadataConnection, node, validationRules);
 
-            // 5. BW DataSource:
+            // 5. BW AdvancedDataStoreObject Output:
+            createSAPBWAdvancedDataStoreObjectOutputNodes(repObj, metadataConnection, node, validationRules);
+
+            // 6. BW DataSource:
             createSAPBWDataSourceNodes(repObj, metadataConnection, node, validationRules);
 
-            // 6. BW DataStoreObject:
+            // 7. BW DataStoreObject:
             createSAPBWDataStoreObjectNodes(repObj, metadataConnection, node, validationRules);
 
-            // 7. BW InfoCube:
+            // 8. BW InfoCube:
             createSAPBWInfoCubeNodes(repObj, metadataConnection, node, validationRules);
 
-            // 8. BW InfoObject:
+            // 9. BW InfoObject:
             createSAPBWInfoObjectNodes(repObj, metadataConnection, node, validationRules);
 
-            // 8. BW Business Content Extractor:
+            // 10. BW Business Content Extractor:
             createSAPContentExtractorNodes(repObj, metadataConnection, node, validationRules);
         } else if (metadataConnection instanceof SalesforceSchemaConnection) {
             createSalesforceModuleNodes(repObj, metadataConnection, node, validationRules);
@@ -1789,12 +1792,12 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     }
 
-    private void createSAPBWAdvancedDataStoreObjectNodes(IRepositoryViewObject repObj, Connection metadataConnection,
+    private void createSAPBWAdvancedDataStoreObjectInputNodes(IRepositoryViewObject repObj, Connection metadataConnection,
             RepositoryNode node, List<IRepositoryViewObject> validationRules) {
         StableRepositoryNode container = new StableRepositoryNode(node,
-                Messages.getString("ProjectRepositoryNode.sapBWAdvancedDataStoreObject"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
+                Messages.getString("ProjectRepositoryNode.sapBWAdvancedDataStoreObject.input"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
         container.setChildrenObjectType(ERepositoryObjectType.METADATA_CON_TABLE);
-        container.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT);
+        container.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT_INPUT);
 
         IRepositoryNode cacheNode = nodeCache.getCache(container);
         if (cacheNode != null && cacheNode instanceof StableRepositoryNode) {
@@ -1806,8 +1809,38 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         node.getChildren().add(container);
 
         EList<SAPBWTable> advancedDataStoreObjects = ((SAPConnection) metadataConnection).getBWAdvancedDataStoreObjects();
-        EList tables = new BasicEList();
-        tables.addAll(advancedDataStoreObjects);
+        EList<SAPBWTable> tables = new BasicEList<SAPBWTable>();
+        for (SAPBWTable bwTable : advancedDataStoreObjects) {
+            if (!SAPBWTableHelper.ADSO_OUTPUT.equals(bwTable.getCategory())) {
+                tables.add(bwTable);
+            }
+        }
+        createTables(container, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
+    }
+
+    private void createSAPBWAdvancedDataStoreObjectOutputNodes(IRepositoryViewObject repObj, Connection metadataConnection,
+            RepositoryNode node, List<IRepositoryViewObject> validationRules) {
+        StableRepositoryNode container = new StableRepositoryNode(node,
+                Messages.getString("ProjectRepositoryNode.sapBWAdvancedDataStoreObject.output"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
+        container.setChildrenObjectType(ERepositoryObjectType.METADATA_CON_TABLE);
+        container.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT_OUTPUT);
+
+        IRepositoryNode cacheNode = nodeCache.getCache(container);
+        if (cacheNode != null && cacheNode instanceof StableRepositoryNode) {
+            container = (StableRepositoryNode) cacheNode;
+            container.getChildren().clear();
+        } else {
+            nodeCache.addCache(container, true);
+        }
+        node.getChildren().add(container);
+
+        EList<SAPBWTable> advancedDataStoreObjects = ((SAPConnection) metadataConnection).getBWAdvancedDataStoreObjects();
+        EList<SAPBWTable> tables = new BasicEList<SAPBWTable>();
+        for (SAPBWTable bwTable : advancedDataStoreObjects) {
+            if (SAPBWTableHelper.ADSO_OUTPUT.equals(bwTable.getCategory())) {
+                tables.add(bwTable);
+            }
+        }
         createTables(container, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
     }
 
@@ -1937,8 +1970,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
     private void createSalesforceModuleNodes(IRepositoryViewObject rebObj, Connection metadataConnection,
             RepositoryNode connectionNode, List<IRepositoryViewObject> validationRules) {
         EList modules = ((SalesforceSchemaConnection) metadataConnection).getModules();
-        for (int i = 0; i < modules.size(); i++) {
-            SalesforceModuleUnit unit = (SalesforceModuleUnit) modules.get(i);
+        for (Object module : modules) {
+            SalesforceModuleUnit unit = (SalesforceModuleUnit) module;
             RepositoryNode tableNode = createSalesforceNode(rebObj, connectionNode, unit);
 
             createTables(tableNode, rebObj, unit.getTables(), ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
@@ -1961,8 +1994,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         if (functions == null || functions.isEmpty()) {
             return;
         }
-        for (int i = 0; i < functions.size(); i++) {
-            SAPFunctionUnit unit = (SAPFunctionUnit) functions.get(i);
+        for (Object function : functions) {
+            SAPFunctionUnit unit = (SAPFunctionUnit) function;
             RepositoryNode tableNode = createSAPNode(rebObj, functionNode, unit);
 
             // create input and output container
@@ -2002,8 +2035,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         if (iDocs == null || iDocs.isEmpty()) {
             return;
         }
-        for (int i = 0; i < iDocs.size(); i++) {
-            SAPIDocUnit unit = (SAPIDocUnit) iDocs.get(i);
+        for (Object iDoc : iDocs) {
+            SAPIDocUnit unit = (SAPIDocUnit) iDoc;
             RepositoryNode tableNode = createSAPNode(rebObj, iDocNode, unit);
             if (SubItemHelper.isDeleted(unit)) {
                 // recBin.getChildren().add(tableNode);

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java

@@ -16,7 +16,6 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Dictionary;
@@ -94,12 +93,12 @@ import org.talend.core.context.CommandLineContext;
 import org.talend.core.context.Context;
 import org.talend.core.context.RepositoryContext;
 import org.talend.core.exception.TalendInternalPersistenceException;
+import org.talend.core.hadoop.BigDataBasicUtil;
 import org.talend.core.hadoop.IHadoopDistributionService;
 import org.talend.core.model.components.IComponentsService;
 import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.Project;
-import org.talend.core.model.metadata.MetadataTalendType;
 import org.talend.core.model.metadata.builder.connection.AbstractMetadataObject;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.migration.IMigrationToolService;
@@ -155,6 +154,7 @@ import org.talend.core.runtime.util.ItemDateParser;
 import org.talend.core.runtime.util.JavaHomeUtil;
 import org.talend.core.runtime.util.SharedStudioUtils;
 import org.talend.core.service.ICoreUIService;
+import org.talend.core.service.IDetectCVEService;
 import org.talend.core.utils.CodesJarResourceCache;
 import org.talend.cwm.helper.SubItemHelper;
 import org.talend.cwm.helper.TableHelper;
@@ -2210,6 +2210,9 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     ExceptionHandler.process(e);
                 }
                 
+                // init dynamic distirbution after `beforeLogon`, before loading libraries.
+                initDynamicDistribution(monitor);
+                
                 // need to set m2
                 LoginTaskRegistryReader loginTaskRegistryReader = new LoginTaskRegistryReader();
                 ILoginTask[] allLoginTasks = loginTaskRegistryReader.getAllCommandlineTaskListInstance();
@@ -2277,14 +2280,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     
                 }
 
-                try {
-                    // for new added mapping file, sync to project mapping folder
-                    MetadataTalendType.syncNewMappingFileToProject();
-                } catch (SystemException e) {
-                    // ignore
-                    ExceptionHandler.process(e);
-                }
-
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                 currentMonitor.beginTask("Execute before logon migrations tasks", 1); //$NON-NLS-1$
                 ProjectManager.getInstance().getMigrationRecords().clear();
@@ -2324,6 +2319,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 if (monitor != null && monitor.isCanceled()) {
                     throw new OperationCanceledException(""); //$NON-NLS-1$
                 }
+                PendoItemSignatureManager.getInstance().sendTrackToPendo();
 
                 boolean isCommandLineLocalRefProject = false;
                 CommandLineContext commandLineContext = (CommandLineContext) CoreRuntimePlugin.getInstance().getContext()
@@ -2362,17 +2358,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     TimeMeasurePerformance.step("logOnProject", "sync log4j"); //$NON-NLS-1$ //$NON-NLS-2$
                 }
 
-                try {
-                    URL url = MetadataTalendType.getProjectForderURLOfMappingsFile();
-                    if (url != null) {
-                        // set the project mappings url
-                        System.setProperty("talend.mappings.url", url.toString()); // $NON-NLS-1$
-                    }
-                } catch (SystemException e) {
-                    // ignore
-                    ExceptionHandler.process(e);
-                }
-
                 if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
                     ITDQRepositoryService tdqRepositoryService = GlobalServiceRegister.getDefault()
                             .getService(ITDQRepositoryService.class);
@@ -2424,6 +2409,18 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
             throw e;
         }
     }
+    
+    private void initDynamicDistribution(IProgressMonitor monitor) {
+        try {
+            if (BigDataBasicUtil.isDynamicDistributionLoaded(monitor)) {
+                BigDataBasicUtil.reloadAllDynamicDistributions(monitor);
+            } else {
+                BigDataBasicUtil.loadDynamicDistribution(monitor);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+    }
 
     // to fix the ops4j and m2e.core maven handler conflict issue TUP-31484
     private void unregisterM2EServiceBeforeLogon() {
@@ -2607,6 +2604,14 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 dynamicDistrManager.reset(null);
             }
         }
+        
+        // clear detect CVE cache
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IDetectCVEService.class)) {
+            IDetectCVEService detectCVESvc = GlobalServiceRegister.getDefault().getService(IDetectCVEService.class);
+            if (detectCVESvc != null) {
+                detectCVESvc.clearCache();
+            }
+        }
 
         CodesJarResourceCache.reset();
 

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/RepositoryFactoryProvider.java

@@ -1,125 +1,127 @@
-// ============================================================================
-//
-// 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.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.ArrayUtils;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.swt.events.SelectionListener;
-import org.talend.commons.ui.runtime.exception.ExceptionHandler;
-import org.talend.commons.utils.workbench.extensions.ExtensionImplementationProvider;
-import org.talend.commons.utils.workbench.extensions.ExtensionPointLimiterImpl;
-import org.talend.commons.utils.workbench.extensions.IExtensionPointLimiter;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.ui.branding.IBrandingService;
-
-/**
- * Provides, using extension points, implementation of many factories.
- *
- * <ul>
- * <li>IProcessFactory</li>
- * </ul>
- *
- * $Id: RepositoryFactoryProvider.java 38013 2010-03-05 14:21:59Z mhirt $
- */
-public class RepositoryFactoryProvider {
-
-    private static List<IRepositoryFactory> list = null;
-
-    public static final IExtensionPointLimiter REPOSITORY_PROVIDER = new ExtensionPointLimiterImpl(
-            "org.talend.core.repository.repository_provider", //$NON-NLS-1$
-            "RepositoryFactory", 1, -1); //$NON-NLS-1$
-
-    public static List<IRepositoryFactory> getAvailableRepositories() {
-        if (list == null) {
-            list = new ArrayList<IRepositoryFactory>();
-            List<IConfigurationElement> extension = ExtensionImplementationProvider.getInstanceV2(REPOSITORY_PROVIDER);
-            String hiddenRepos = System.getProperty("hidden.repositories"); //$NON-NLS-1$
-            String hiddenRepository[] = new String[]{};
-            if (hiddenRepos != null) {
-                hiddenRepository = hiddenRepos.split(";"); //$NON-NLS-1$
-            }
-
-            boolean isPoweredByTalend = false;
-            IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault()
-                    .getService(IBrandingService.class);
-            isPoweredByTalend = brandingService.isPoweredbyTalend();
-            for (IConfigurationElement current : extension) {
-                try {
-                    String only4TalendStr = current.getAttribute("only4Talend"); //$NON-NLS-1$
-                    if (Boolean.valueOf(only4TalendStr) && !isPoweredByTalend) {
-                        continue;
-                    }
-                    String only4OemStr = current.getAttribute("only4Oem"); //$NON-NLS-1$
-                    if (Boolean.valueOf(only4OemStr) && isPoweredByTalend) {
-                        continue;
-                    }
-                    IRepositoryFactory currentAction = (IRepositoryFactory) current.createExecutableExtension("class"); //$NON-NLS-1$
-                    currentAction.setId(current.getAttribute("id")); //$NON-NLS-1$
-                    currentAction.setName(current.getAttribute("name")); //$NON-NLS-1$
-                    currentAction.setAuthenticationNeeded(new Boolean(current.getAttribute("authenticationNeeded"))); //$NON-NLS-1$
-                    currentAction.setDisplayToUser(new Boolean(current.getAttribute("displayToUser")).booleanValue()); //$NON-NLS-1$
-
-                    // Getting dynamic login fields:
-                    for (IConfigurationElement currentLoginField : current.getChildren("loginField")) { //$NON-NLS-1$
-                        DynamicFieldBean key = new DynamicFieldBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
-                                currentLoginField.getAttribute("name"), //$NON-NLS-1$
-                                currentLoginField.getAttribute("defaultValue"), //$NON-NLS-1$
-                                new Boolean(currentLoginField.getAttribute("required")), //$NON-NLS-1$
-                                new Boolean(currentLoginField.getAttribute("password")), //$NON-NLS-1$
-                                Boolean.valueOf(currentLoginField.getAttribute("readonly"))); //$NON-NLS-1$
-                        currentAction.getFields().add(key);
-                    }
-
-                    for (IConfigurationElement currentLoginField : current.getChildren("button")) { //$NON-NLS-1$
-                        DynamicButtonBean key = new DynamicButtonBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
-                                currentLoginField.getAttribute("name"), //$NON-NLS-1$
-                                (SelectionListener) currentLoginField.createExecutableExtension("selectionListener")); //$NON-NLS-1$
-                        currentAction.getButtons().add(key);
-                    }
-
-                    for (IConfigurationElement currentLoginField : current.getChildren("choiceField")) { //$NON-NLS-1$
-                        DynamicChoiceBean key = new DynamicChoiceBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
-                                currentLoginField.getAttribute("name")); //$NON-NLS-1$
-                        for (IConfigurationElement currentChoice : currentLoginField.getChildren("choice")) { //$NON-NLS-1$
-                            String value = currentChoice.getAttribute("value"); //$NON-NLS-1$
-                            String label = currentChoice.getAttribute("label"); //$NON-NLS-1$
-                            key.addChoice(value, label);
-                        }
-                        currentAction.getChoices().add(key);
-                    }
-                    if (ArrayUtils.contains(hiddenRepository, currentAction.getId())) {
-                        continue;
-                    }
-                    list.add(currentAction);
-                } catch (CoreException e) {
-                    // e.printStackTrace();
-                    ExceptionHandler.process(e);
-                }
-            }
-        }
-        return list;
-    }
-
-    public static IRepositoryFactory getRepositoriyById(String id) {
-        for (IRepositoryFactory current : getAvailableRepositories()) {
-            if (current.getId().equals(id)) {
-                return current;
-            }
-        }
-        return null;
-    }
-}
+// ============================================================================
+//
+// 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.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.swt.events.SelectionListener;
+import org.talend.commons.CommonsPlugin;
+import org.talend.commons.ui.runtime.exception.ExceptionHandler;
+import org.talend.commons.utils.workbench.extensions.ExtensionImplementationProvider;
+import org.talend.commons.utils.workbench.extensions.ExtensionPointLimiterImpl;
+import org.talend.commons.utils.workbench.extensions.IExtensionPointLimiter;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.ui.branding.IBrandingService;
+
+/**
+ * Provides, using extension points, implementation of many factories.
+ *
+ * <ul>
+ * <li>IProcessFactory</li>
+ * </ul>
+ *
+ * $Id: RepositoryFactoryProvider.java 38013 2010-03-05 14:21:59Z mhirt $
+ */
+public class RepositoryFactoryProvider {
+
+    private static List<IRepositoryFactory> list = null;
+
+    public static final IExtensionPointLimiter REPOSITORY_PROVIDER = new ExtensionPointLimiterImpl(
+            "org.talend.core.repository.repository_provider", //$NON-NLS-1$
+            "RepositoryFactory", 1, -1); //$NON-NLS-1$
+
+    public static synchronized List<IRepositoryFactory> getAvailableRepositories() {
+        if (list == null) {
+            list = new ArrayList<IRepositoryFactory>();
+            List<IConfigurationElement> extension = ExtensionImplementationProvider.getInstanceV2(REPOSITORY_PROVIDER);
+            String hiddenRepos = System.getProperty("hidden.repositories"); //$NON-NLS-1$
+            String hiddenRepository[] = new String[]{};
+            if (hiddenRepos != null) {
+                hiddenRepository = hiddenRepos.split(";"); //$NON-NLS-1$
+            }
+
+            boolean isPoweredByTalend = false;
+            IBrandingService brandingService = (IBrandingService) GlobalServiceRegister.getDefault()
+                    .getService(IBrandingService.class);
+            isPoweredByTalend = brandingService.isPoweredbyTalend();
+            for (IConfigurationElement current : extension) {
+                try {
+                    String only4TalendStr = current.getAttribute("only4Talend"); //$NON-NLS-1$
+                    if (Boolean.valueOf(only4TalendStr) && !isPoweredByTalend) {
+                        continue;
+                    }
+                    String only4OemStr = current.getAttribute("only4Oem"); //$NON-NLS-1$
+                    if (Boolean.valueOf(only4OemStr) && isPoweredByTalend) {
+                        continue;
+                    }
+                    IRepositoryFactory currentAction = (IRepositoryFactory) current.createExecutableExtension("class"); //$NON-NLS-1$
+                    currentAction.setId(current.getAttribute("id")); //$NON-NLS-1$
+                    currentAction.setName(current.getAttribute("name")); //$NON-NLS-1$
+                    currentAction.setAuthenticationNeeded(new Boolean(current.getAttribute("authenticationNeeded"))); //$NON-NLS-1$
+                    currentAction.setDisplayToUser(new Boolean(current.getAttribute("displayToUser")).booleanValue()); //$NON-NLS-1$
+
+                    // Getting dynamic login fields:
+                    for (IConfigurationElement currentLoginField : current.getChildren("loginField")) { //$NON-NLS-1$
+                        DynamicFieldBean key = new DynamicFieldBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
+                                currentLoginField.getAttribute("name"), //$NON-NLS-1$
+                                currentLoginField.getAttribute("defaultValue"), //$NON-NLS-1$
+                                new Boolean(currentLoginField.getAttribute("required")), //$NON-NLS-1$
+                                new Boolean(currentLoginField.getAttribute("password")), //$NON-NLS-1$
+                                Boolean.valueOf(currentLoginField.getAttribute("readonly"))); //$NON-NLS-1$
+                        currentAction.getFields().add(key);
+                    }
+
+                    for (IConfigurationElement currentLoginField : current.getChildren("button")) { //$NON-NLS-1$
+                        DynamicButtonBean key = new DynamicButtonBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
+                                currentLoginField.getAttribute("name"), //$NON-NLS-1$
+                                (SelectionListener) currentLoginField.createExecutableExtension("selectionListener")); //$NON-NLS-1$
+                        currentAction.getButtons().add(key);
+                    }
+
+                    for (IConfigurationElement currentLoginField : current.getChildren("choiceField")) { //$NON-NLS-1$
+                        DynamicChoiceBean key = new DynamicChoiceBean(currentLoginField.getAttribute("id"), //$NON-NLS-1$
+                                currentLoginField.getAttribute("name")); //$NON-NLS-1$
+                        for (IConfigurationElement currentChoice : currentLoginField.getChildren("choice")) { //$NON-NLS-1$
+                            String value = currentChoice.getAttribute("value"); //$NON-NLS-1$
+                            String label = currentChoice.getAttribute("label"); //$NON-NLS-1$
+                            key.addChoice(value, label);
+                        }
+                        currentAction.getChoices().add(key);
+                    }
+                    if (ArrayUtils.contains(hiddenRepository, currentAction.getId())) {
+                        continue;
+                    }
+                    list.add(currentAction);
+                } catch (CoreException e) {
+                    // e.printStackTrace();
+                    ExceptionHandler.process(e);
+                }
+            }
+        }
+        return list;
+    }
+
+    public static IRepositoryFactory getRepositoriyById(String id) {
+        for (IRepositoryFactory current : getAvailableRepositories()) {
+            if (current.getId().equals(id)) {
+                return current;
+            }
+        }
+        ExceptionHandler.log("Can't find repository factory for: " + id);
+        return null;
+    }
+}

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/DuplicateAction.java

@@ -225,7 +225,7 @@ public class DuplicateAction extends AContextualAction {
         // update the property of the node repository object
         // sourceNode.getObject().setProperty(updatedProperty);
 
-        String initNameValue = "Copy_of_" + item.getProperty().getDisplayName(); //$NON-NLS-1$
+        String initNameValue = "SPL33x_" + item.getProperty().getDisplayName(); //$NON-NLS-1$
 
         CopyObjectAction copyObjectAction = CopyObjectAction.getInstance();
 

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/AbstractResourceRepositoryContentHandler.java

@@ -25,6 +25,7 @@ import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.properties.RoutinesJarItem;
 import org.talend.core.model.repository.AbstractRepositoryContentHandler;
 import org.talend.core.model.repository.ERepositoryObjectType;
+import java.io.IOException;
 
 public abstract class AbstractResourceRepositoryContentHandler extends AbstractRepositoryContentHandler {
 
@@ -83,6 +84,10 @@ public abstract class AbstractResourceRepositoryContentHandler extends AbstractR
         }
         return itemResource;
     }
+    
+    protected void copyScreenshotFile(Item originalItem, Item newItem) throws IOException {
+    	getXmiResourceManager().copyScreenshotFile(originalItem, newItem);
+    }
 
     protected XmiResourceManager getXmiResourceManager() {
         if (null == xmiResourceManager) {

main/plugins/org.talend.core.runtime/META-INF/MANIFEST.MF

@@ -52,6 +52,8 @@ Export-Package: org.talend.analysistask,
  org.talend.core.model.xml,
  org.talend.core.nexus,
  org.talend.core.pendo,
+ org.talend.core.pendo.mapper,
+ org.talend.core.pendo.properties,
  org.talend.core.prefs,
  org.talend.core.repository,
  org.talend.core.runtime,
@@ -127,7 +129,8 @@ Require-Bundle: org.eclipse.jdt.core,
  jackson-core-asl,
  org.talend.libraries.jackson,
  org.eclipse.m2e.core,
- org.talend.libraries.apache.common
+ org.talend.libraries.apache.common,
+ org.talend.signon.util
 Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,

main/plugins/org.talend.core.runtime/mappings/mapping_Cassandra40.xml

@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+<mapping>
+    <dbms product="Cassandra" id="cassandra40_datastax_id" label="Mapping Cassandra v4"
+        default="true">
+        <dbTypes>
+            <dbType type="ascii" ignorePre="true" />
+            <dbType type="bigint" ignorePre="true" />
+            <dbType type="blob" ignorePre="true" />
+            <dbType type="boolean" ignorePre="true" />
+            <dbType type="counter" ignorePre="true" />
+            <dbType type="date" ignorePre="true" />
+            <dbType type="decimal" ignorePre="true" />
+            <dbType type="double" ignorePre="true" />
+            <dbType type="float" ignorePre="true" />
+            <dbType type="inet" ignorePre="true" />
+            <dbType type="int" ignorePre="true" />
+            <dbType type="list" ignorePre="true" />
+            <dbType type="map" ignorePre="true" />
+            <dbType type="set" ignorePre="true" />
+            <dbType type="smallint" ignorePre="true" />
+            <dbType type="text" ignorePre="true" />
+            <dbType type="time" ignorePre="true" />
+            <dbType type="timestamp" ignorePre="true" />
+            <dbType type="timeuuid" ignorePre="true" />
+            <dbType type="tinyint" ignorePre="true" />
+            <dbType type="uuid" ignorePre="true" />
+            <dbType type="varchar" ignorePre="true" />
+            <dbType type="varint" ignorePre="true" />
+        </dbTypes>
+
+        <language name="java">
+            <talendToDbTypes>
+                <talendType type="id_List">
+                    <dbType type="list" default="true"/>
+                </talendType>
+                <talendType type="id_Boolean">
+                    <dbType type="boolean" default="true" />
+                </talendType>
+                <talendType type="id_Byte">
+                    <dbType type="tinyint" default="true" />
+                </talendType>
+                <talendType type="id_byte[]">
+                    <dbType type="blob" default="true" />
+                </talendType>
+                <talendType type="id_Character">
+                    <dbType type="ascii" default="true" />
+                    <dbType type="text" />
+                    <dbType type="varchar" />
+                </talendType>
+                <talendType type="id_Date">
+                    <dbType type="timestamp" default="true" />
+					<dbType type="time" />
+                    <dbType type="date" />
+                </talendType>
+                <talendType type="id_BigDecimal">
+                    <dbType type="decimal" default="true" />
+                </talendType>
+                <talendType type="id_Double">
+                    <dbType type="double" default="true" />
+                </talendType>
+                <talendType type="id_Float">
+                    <dbType type="float" default="true" />
+                </talendType>
+                <talendType type="id_Integer">
+                    <dbType type="int" default="true" />
+                </talendType>
+                <talendType type="id_Long">
+                    <dbType type="bigint" default="true" />
+                    <dbType type="counter" />
+                    <dbType type="time" />
+                </talendType>
+                <talendType type="id_Object">
+                    <dbType type="varint" default="true" />
+                    <dbType type="inet" />
+                    <dbType type="map" />
+                    <dbType type="set" />
+                </talendType>    
+                <talendType type="id_Short">
+                    <dbType type="smallint" default="true" />
+                </talendType>
+                <talendType type="id_String">
+                    <dbType type="ascii" default="true" />
+                    <dbType type="text" />
+                    <dbType type="timeuuid" />
+                    <dbType type="uuid" />
+                    <dbType type="varchar" />
+                </talendType>
+            </talendToDbTypes>
+            <dbToTalendTypes>
+                <dbType type="ascii">
+                    <talendType type="id_String" default="true" />
+                </dbType>
+                <dbType type="bigint">
+                    <talendType type="id_Long" default="true" />
+                </dbType>
+                <dbType type="blob">
+                    <talendType type="id_byte[]" default="true" />
+                </dbType>
+                <dbType type="boolean">
+                    <talendType type="id_Boolean" default="true" />
+                </dbType>
+                <dbType type="counter">
+                    <talendType type="id_Long" default="true" />
+                </dbType>
+                <dbType type="date">
+                    <talendType type="id_Date" default="true" />
+                </dbType>
+                <dbType type="decimal">
+                    <talendType type="id_BigDecimal" default="true" />
+                </dbType>
+                <dbType type="double">
+                    <talendType type="id_Double" default="true" />
+                </dbType>
+                <dbType type="float">
+                    <talendType type="id_Float" default="true" />
+                </dbType>
+                <dbType type="inet">
+                    <talendType type="id_Object" default="true" />
+                </dbType>
+                <dbType type="int">
+                    <talendType type="id_Integer" default="true" />
+                </dbType>
+                <dbType type="list">
+                    <talendType type="id_List" default="true" />
+                </dbType>
+                <dbType type="map">
+                    <talendType type="id_Object" default="true" />
+                </dbType>
+                <dbType type="set">
+                    <talendType type="id_Object" default="true" />
+                </dbType>
+                <dbType type="smallint">
+                    <talendType type="id_Short" default="true" />
+                </dbType>
+                <dbType type="text">
+                    <talendType type="id_String" 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="timeuuid">
+                    <talendType type="id_String" default="true" />
+                </dbType>
+                <dbType type="tinyint">
+                    <talendType type="id_Byte" default="true" />
+                </dbType>
+                <dbType type="uuid">
+                    <talendType type="id_String" default="true" />
+                </dbType>
+                <dbType type="varchar">
+                    <talendType type="id_String" default="true" />
+                </dbType>
+                <dbType type="varint">
+                    <talendType type="id_Object" default="true" />
+                </dbType>
+            </dbToTalendTypes>
+        </language>
+    </dbms>
+
+</mapping>

main/plugins/org.talend.core.runtime/mappings/mapping_Greenplum.xml

@@ -10,7 +10,7 @@
 			<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="BYTEA" ignoreLen="true" ignorePre="true" />
 			<dbType type="CHAR" defaultLength="50" ignorePre="true"/>
 			<dbType type="CHARACTER" defaultLength="50" ignorePre="true"/>
 			<dbType type="CID" ignoreLen="true" ignorePre="true" />
@@ -36,7 +36,7 @@
 			<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="MONEY" ignoreLen="true" ignorePre="true" />
 			<dbType type="NAME" ignoreLen="true" ignorePre="true" />
 			<dbType type="NUMERIC" defaultLength="20" defaultPrecision="10"/>
 			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10"/>
@@ -46,7 +46,7 @@
 			<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="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" />
@@ -60,12 +60,14 @@
 			<dbType type="TIME" ignorePre="true" />
 			<dbType type="TINTERVAL" ignoreLen="true" ignorePre="true"  />
 			<dbType type="TIMESTAMPTZ" ignoreLen="true" ignorePre="true"  />
+			<dbType type="TIMESTAMP WITH TIME ZONE" 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="TIME WITH TIME ZONE" 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" />
@@ -119,38 +121,40 @@
 		<language name="java">
 			<talendToDbTypes><!-- Adviced mappings  -->
 				<talendType type="id_List"/>
-				<talendType type="id_Boolean">	
+				<talendType type="id_Boolean">
 					<dbType type="BOOL" default="true" />
-					<dbType type="BOOLEAN" />					
+					<dbType type="BOOLEAN" />
 				</talendType>
-				<talendType type="id_Byte">		
+				<talendType type="id_Byte">
 				</talendType>
 				<talendType type="id_byte[]">
 					<dbType type="BIT" default="true" />
 					<dbType type="VARBIT" />
-					<dbType type="BIT VARYING" />				
+					<dbType type="BIT VARYING" />
 				</talendType>
 				<talendType type="id_Character">
 					<dbType type="CHAR" default="true" />
 					<dbType type="CHARACTER" />
 					<dbType type="BPCHAR" />
 					<dbType type="VARCHAR" />
-					<dbType type="TEXT" />							
+					<dbType type="TEXT" />
 				</talendType>
 				<talendType type="id_Date">
-					<dbType type="DATE" default="true" />				
+					<dbType type="DATE" default="true" />
 					<dbType type="ABSTIME" />
 					<dbType type="TIMETZ" />
+					<dbType type="TIME WITH TIME ZONE" />
 					<dbType type="TIME" />
 					<dbType type="TIMESTAMPTZ" />
+					<dbType type="TIMESTAMP WITH TIME ZONE" />
 					<dbType type="TIMESTAMP" />
 					<dbType type="INTERVAL" />
 					<dbType type="TINTERVAL" />
-					<dbType type="RELTIME" />						
+					<dbType type="RELTIME" />
 				</talendType>
 				<talendType type="id_BigDecimal">
 					<dbType type="NUMERIC" default="true" />
-					<dbType type="DECIMAL" />							
+					<dbType type="DECIMAL" />
 					<dbType type="FLOAT4" />
 					<dbType type="REAL" />
 					<dbType type="FLOAT8"/>
@@ -161,8 +165,8 @@
 					<dbType type="REAL" />
 					<dbType type="FLOAT8" default="true" />
 					<dbType type="NUMERIC" />
-					<dbType type="DECIMAL" />	
-					<dbType type="DOUBLE PRECISION"/>						
+					<dbType type="DECIMAL" />
+					<dbType type="DOUBLE PRECISION"/>
 				</talendType>
 				<talendType type="id_Float">
 					<dbType type="FLOAT4" default="true" />
@@ -170,7 +174,7 @@
 					<dbType type="REAL" />
 					<dbType type="NUMERIC" />
 					<dbType type="DECIMAL" />
-					<dbType type="DOUBLE PRECISION"/>				
+					<dbType type="DOUBLE PRECISION"/>
 				</talendType>
 				<talendType type="id_Integer">
 					<dbType type="INT2" />
@@ -180,7 +184,7 @@
 					<dbType type="INT8" />
 					<dbType type="BIGINT" />
 					<dbType type="BIGSERIAL" />
-					<dbType type="INTEGER" />										
+					<dbType type="INTEGER" />
 				</talendType>
 				<talendType type="id_Long">
 					<dbType type="INT2" />
@@ -188,8 +192,8 @@
 					<dbType type="SERIAL" />
 					<dbType type="INT8"  default="true" />
 					<dbType type="BIGINT" />
-					<dbType type="BIGSERIAL" />	
-					<dbType type="SMALLINT" />						
+					<dbType type="BIGSERIAL" />
+					<dbType type="SMALLINT" />
 				</talendType>
 				<talendType type="id_Object">
 					<dbType type="_POINT" />
@@ -210,26 +214,26 @@
 					<dbType type="_TIMESTAMPTZ" />
 					<dbType type="_TIMESTAMP" />
 					<dbType type="_TINTERVAL" />
-					<dbType type="_XID" />						
-					<dbType type="ACLITEM" />			
-					<dbType type="BYTEA" />						
+					<dbType type="_XID" />
+					<dbType type="ACLITEM" />
+					<dbType type="BYTEA" />
 					<dbType type="CID" />
 					<dbType type="CIDR" />
-					<dbType type="CIRCLE" />						
-					<dbType type="INET" />			
+					<dbType type="CIRCLE" />
+					<dbType type="INET" />
 					<dbType type="MACADDR" />
-					<dbType type="MONEY" />			
+					<dbType type="MONEY" />
 					<dbType type="OID" />
 					<dbType type="PATH" />
-					<dbType type="POLYGON" />			
+					<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="REGTYPE" />
+					<dbType type="SMGR" />
 					<dbType type="TID" />
 					<dbType type="XID" />
 					<dbType type="_CHAR" />
@@ -239,7 +243,7 @@
 					<dbType type="BIGINT" />
 					<dbType type="BIT VARYING" />
 					<dbType type="_VARBIT" />
-					<dbType type="_BIT" />			
+					<dbType type="_BIT" />
 					<dbType type="_BOOL" />
 					<dbType type="BOOLEAN" />
 					<dbType type="BOX" />
@@ -276,7 +280,7 @@
 					<dbType type="OIDVECTOR" />
 					<dbType type="_OIDVECTOR" />
 					<dbType type="_PATH" />
-					<dbType type="POINT" default="true" />				
+					<dbType type="POINT" default="true" />
 				</talendType>
 				<talendType type="id_Short">
 					<dbType type="INT2"   default="true" />
@@ -285,22 +289,22 @@
 					<dbType type="INT8" />
 					<dbType type="BIGINT" />
 					<dbType type="BIGSERIAL" />
-					<dbType type="SMALLINT" />					
+					<dbType type="SMALLINT" />
 				</talendType>
 				<talendType type="id_String">
 					<dbType type="BPCHAR" />
 					<dbType type="VARCHAR" default="true" />
 					<dbType type="CHARACTER VARYING" />
-					<dbType type="TEXT" />				
+					<dbType type="TEXT" />
 				</talendType>
 			</talendToDbTypes>
 			<dbToTalendTypes>
 				<dbType type="INT2" >
-					<talendType type="id_Short" default="true" />				
+					<talendType type="id_Short" default="true" />
 				</dbType>
 				<dbType type="SMALLINT" >
-					<talendType type="id_Short" default="true" />				
-				</dbType>				
+					<talendType type="id_Short" default="true" />
+				</dbType>
 				<dbType type="INT4" >
 					<talendType type="id_Integer" default="true" />
 				</dbType>
@@ -308,330 +312,336 @@
      				<talendType type="id_Integer" default="true" />
     			</dbType>
     			<dbType type="CHARACTER VARYING" >
-					<talendType type="id_String" default="true" />				
+					<talendType type="id_String" default="true" />
 				</dbType>
 				<dbType type="BOOLEAN" >
-					<talendType type="id_Boolean" default="true" />				
-				</dbType> 				
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
 				<dbType type="SERIAL" >
-					<talendType type="id_Integer" default="true" />				
-				</dbType>				
+					<talendType type="id_Integer" default="true" />
+				</dbType>
 				<dbType type="INT8" >
-					<talendType type="id_Long" default="true" />				
+					<talendType type="id_Long" default="true" />
 				</dbType>
 				<dbType type="BIGINT" >
-					<talendType type="id_Long" default="true" />				
-				</dbType>				
+					<talendType type="id_Long" default="true" />
+				</dbType>
 				<dbType type="BIGSERIAL" >
-					<talendType type="id_Long" default="true" />				
-				</dbType>				
+					<talendType type="id_Long" default="true" />
+				</dbType>
 				<dbType type="FLOAT4" >
-					<talendType type="id_Float" default="true" />				
-					<talendType type="id_BigDecimal"/>			
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_BigDecimal"/>
 				</dbType>
 				<dbType type="REAL" >
-					<talendType type="id_Float" default="true" />				
-					<talendType type="id_BigDecimal"/>			
-				</dbType>			
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
 				<dbType type="FLOAT8" >
-					<talendType type="id_Double" default="true" />				
-					<talendType type="id_BigDecimal"/>			
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
 				</dbType>
 				<dbType type="DOUBLE PRECISION" >
-					<talendType type="id_Double" default="true" />				
-					<talendType type="id_BigDecimal"/>			
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
 				</dbType>
 				<dbType type="NUMERIC">
 					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal" default="true" />			
+					<talendType type="id_BigDecimal" default="true" />
 				</dbType>
 				<dbType type="DECIMAL">
 					<talendType type="id_Double"/>
-					<talendType type="id_BigDecimal" default="true" />			
-				</dbType>				
+					<talendType type="id_BigDecimal" default="true" />
+				</dbType>
 				<dbType type="BOOL" >
-					<talendType type="id_Boolean" default="true" />				
-				</dbType>				
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
 				<dbType type="BIT" >
-					<talendType type="id_byte[]" default="true" />	
-				</dbType>				
+					<talendType type="id_byte[]" default="true" />
+				</dbType>
 				<dbType type="VARBIT" >
-					<talendType type="id_byte[]" default="true" />				
-				</dbType>	
+					<talendType type="id_byte[]" default="true" />
+				</dbType>
 				<dbType type="BIT VARYING" >
-					<talendType type="id_byte[]" default="true" />				
-				</dbType>						
+					<talendType type="id_byte[]" default="true" />
+				</dbType>
 				<dbType type="CHAR" >
-					<talendType type="id_String" default="true" />				
+					<talendType type="id_String" default="true" />
 				</dbType>
 				<dbType type="CHARACTER" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
+					<talendType type="id_String" default="true" />
+				</dbType>
 				<dbType type="BPCHAR" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
+					<talendType type="id_String" default="true" />
+				</dbType>
 				<dbType type="VARCHAR" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
+					<talendType type="id_String" default="true" />
+				</dbType>
 				<dbType type="TEXT" >
-					<talendType type="id_String" default="true" />				
-				</dbType>				
+					<talendType type="id_String" default="true" />
+				</dbType>
 				<dbType type="DATE" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="ABSTIME" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="TIMETZ" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TIME WITH TIME ZONE" >
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="TIME" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="TIMESTAMPTZ" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TIMESTAMP WITH TIME ZONE" >
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="TIMESTAMP" >
-					<talendType type="id_Date" default="true" />				
+					<talendType type="id_Date" default="true" />
 				</dbType>
 				<dbType type="INTERVAL" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>								
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="TINTERVAL" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>				
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="RELTIME" >
-					<talendType type="id_Date" default="true" />				
-				</dbType>							
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="ACLITEM" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="BYTEA" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>										
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="CID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="CIDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="CIRCLE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>										
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="INET" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="MACADDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="MONEY" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="OID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="PATH" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="POLYGON" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REFCURSOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REGCLASS" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REGOPER" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REGOPERATOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REGPROC" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REGPROCEDURE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="REGTYPE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>										
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="SMGR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="TID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="XID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="BOX" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="INT2VECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="LINE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="LSEG" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="NAME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="OIDVECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="POINT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>	
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<!-- object -->
 				<dbType type="_OIDVECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_PATH" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_NAME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_NUMERIC" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_OID" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_LSEG" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_MACADDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_MONEY" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_LINE" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_INT2VECTOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_INT4" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_INTERVAL" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_BOX" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_BYTEA" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_VARCHAR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_BPCHAR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_CID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_CIDR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_CIRCLE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_DATE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_FLOAT8" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_INET" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_CHAR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_ABSTIME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_ACLITEM" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_INT8" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_VARBIT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_BIT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>							
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_BOOL" >
-					<talendType type="id_Object" default="true" />				
+					<talendType type="id_Object" default="true" />
 				</dbType>
 				<dbType type="_POINT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_POLYGON" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_FLOAT4" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REFCURSOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REGCLASS" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REGOPER" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REGOPERATOR" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REGPROC" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REGPROCEDURE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_REGTYPE" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_RELTIME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TEXT" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TIMETZ" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TIME" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TIMESTAMPTZ" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TIMESTAMP" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_TINTERVAL" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>				
+					<talendType type="id_Object" default="true" />
+				</dbType>
 				<dbType type="_XID" >
-					<talendType type="id_Object" default="true" />				
-				</dbType>									
+					<talendType type="id_Object" default="true" />
+				</dbType>
 			</dbToTalendTypes>
 		</language>
 	</dbms>

main/plugins/org.talend.core.runtime/mappings/mapping_revision.json

@@ -0,0 +1,238 @@
+{
+	"mapping_AS400.xml": {
+		"28fe6b6c94e4e486d431873ba556c1c18ae09140": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"3d4845af057220e02773029683a0fd99dee489e5": "a9861e98b581dfdafa7839238710bd930989960a",
+		"458d597928478f43c94098dfe47d9bb8d07e89e2": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"76a4aa354d986ed5682797337817a8ddbb80ae89": "d568bf814d7b27fc7c63cbd07ea6b4a3b0ad3ff8"
+	},
+	"mapping_Access.xml": {
+		"55d314ed9708263bfcec193abb57a1e25806626e": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"718db25f8e86d6b61284a4ffdc1fd19faffb98a9": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_AmazonAurora.xml": {
+		"a93c809bdf8e5df8095580e3f23b29658e044302": "ebc9394c2728a3f3850fcbafac4156ef15aab37f",
+		"ba16c203a8a993e13ebab0da5cccb7a5e1c01e56": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_BigQuery.xml": {
+		"db723e5b4a38bbc8316593be33ab9d74f57776e6": "e1770847f656589810753c19d420228326462f34",
+		"e12df204d9f5081971d03c64b43de2456557e02e": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e9c02d3e9bc3a3649fd33803353e61db6fcd2ea8": "01749151dcc171ebb6457ba872ee352d58a1dfd4"
+	},
+	"mapping_Cassandra.xml": {
+		"20ed188f8824c14852304920cf82ca7119eb1be0": "ab7b23e6c94946ca2358cc0cfd82c4d77a4c5839",
+		"692353c474569bafd44854b7f7343929beddee83": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e42bdadd0009e7595773edcc1652f181a8fdf151": "76ed27054255165c23d8c0c8db081a41a50430c9",
+		"ff005c2bfc47789e5715e949f98bd6d72c934b54": "ebe76b0edd0eda3488527b95f2a6d925d091a408"
+	},
+	"mapping_Cassandra22_datastax.xml": {
+		"2ddd561eac2a04a7b08949c0764c5e76f80c89f5": "b0378fb45ae238b884417db468872341e156f138",
+		"33b483680a44a8229b09698df3803f5834987f18": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Cassandra40.xml": {
+		"e92b373950021eb425db9e3eba8391f98ce7e4a8": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Cassandra_datastax.xml": {
+		"3cb6b5cf167fb5ba82b3ebdc602f22ecdacdafb5": "56fad9370b27d03a9636d8368350274480fc2bce",
+		"ca09b169eee6e6dcfa81f976bd98ef4aae81cdf2": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e1620c54d6793c6d1885e3e2fcdf242c0e3a4059": "df28e2b92f57ba0486215f334edb649a58788712"
+	},
+	"mapping_Databricks_Delta_Lake.xml": {
+		"d48793d7173ea7d07090f5e683045c3f60cc12c8": "21f5ac777158fc55288af7337737aa675e20bdf3",
+		"dcbe4533fe16fee70f24702edddec78b81e26463": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Exasol.xml": {
+		"21ff2b1a69b7242fa48a1218b0d5f8a6b0ba607e": "a0d36282ff5d6825b206ab6f794d13e048ac2192",
+		"3768b1e7a941e66f8a70ad7e1a65aa7d2b598daa": "7ef9ede0f988f10489c1f5ffe16ea24d2d14ecdd",
+		"6babf3080a3baa05bcd8a2815d2f31a0b15e1550": "02a98e53d3b6457272768ce0ae5c82992b403465",
+		"7de8a81bc2eb7c4da639af148c2c67b5c6de4bc0": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"a728306274b817e8afa0101d3b7621398addc2f3": "b5b116b3758f58e7500058e1805bf93bf5a2f0c1",
+		"dc2eba14e50ce7c413fb7696355e67d26fe5fb9b": "57bacf1f97951fcf6f650f1afdec35b5ea22638c",
+		"f670268dfd5a8f80fbdbe6fe4ad668cb6c8f25d6": "ead0fb11f124cf05ad0f7fde21cdedbb3cf2160b"
+	},
+	"mapping_Firebird.xml": {
+		"51a041d0b43678433f6303aebac5f92bfdb7b8a6": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"d504ece6ca9e10e23f5e0f05660e5f49e7d999ff": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_Greenplum.xml": {
+		"16418522006e4505c7fb7d44c4d06928de20eaf8": "ec04f46618ef0586081fd3b17ad7b85239958194",
+		"4f3e1b53baca729eef796979e97592c8724a2d91": "caf54e3d2b6c6d685cdcf2a243c28c408a9cd652",
+		"525a7ca1a48599a840b1feca641ef6a413d7384b": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"c4ed635e67d7d82c24008677f313e17df98f5d08": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_H2.xml": {
+		"4e3ed630d3133326a0cf4728865b3efa4cbecc63": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"84b0b863c0532f93bffc0ab54d98a449f331e319": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"cb093084dc1dc3f999707a1b9d1474f87bbf6d17": "341b1220b6bc6bf59eef81e97c694d06134bd8a2"
+	},
+	"mapping_HSQLDB.xml": {
+		"0a37e2aec423d0c401aff092e4fda9e01c5dd4ff": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"73af8e3e8646ea58f4cfe60fe4905e90340b3e12": "890a391388725c112ffbbd2dd8b8d267305df4a7",
+		"98819a80cd8994a02579ea1d9b0992a0b68a5403": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Hive.xml": {
+		"0265c6f16ab2c9eea7da660e4e1c8a3ec7bc0ab3": "37ef13c438cda4cd1c3e091d99a00036b328e57f",
+		"1f5811f41b2836cd7baeb23daef91d2ea313f2c6": "3646a1bcd980a3209501a5c846338823f55d74b2",
+		"21a44cd9d32a5478a4de61a86b398a9ef80401ac": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"5444fa9a484704d774259430623e0db1495a867f": "ef872732cde37c6c7684dc773641be0b78f5c57c",
+		"e7f128915578dd29538a7debeb5f47528b5a6e59": "86ba7c19d9300a02dbcb0801852e728acd261132"
+	},
+	"mapping_IBMDB2.xml": {
+		"dc42cf143f3a0f10ad8c280f16ef44ae1f907123": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"f8aea23cc5b48ebb3cdd229be3f66b28890ff4f8": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Impala.xml": {
+		"55ed99aa28c989bd5777f41b7c87ed4eb9f245a8": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Informix.xml": {
+		"40da9213cf85b1712f38474dea4f2ec3447dfe3c": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"938e41f3719c29248d4f58c303464bbfb50e343a": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_Ingres.xml": {
+		"811e8bf4e7bc2e6b9c3fcb5f074601a873f15e1d": "15afc1b074c8a6e4aee39c1d5a3347555dbe36a0",
+		"95873faa81ee3de2eea02efab5c127e6188df796": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"9c5682f564e861e1db3b5184fd40e718e0912a4a": "d51edc7e08871897572c9b1f1cd2d2d2df347dfb"
+	},
+	"mapping_Interbase.xml": {
+		"4d37474d07991154aa0148e7a030c4725d45ef0d": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"71e8386c3e21f726550234c52d3ca50dcfa655de": "d51edc7e08871897572c9b1f1cd2d2d2df347dfb"
+	},
+	"mapping_JavaDB.xml": {
+		"652fd7f2f11fc27903d333e1699cc419804caa66": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"66dbe13a0043798498f37b6e5495bc3aaa8fb90b": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_MSSQL.xml": {
+		"305eeb294ae8bb07bee7d1e182e431e2e7f6273d": "d7761630e63b399f89eaaeb9e19e775bf1579dde",
+		"b93c0825ffd799d89608239385d7e4b60de96209": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_MaxDB.xml": {
+		"586fc7ac94a9abec8a76a587dc6aa0fae0079bf3": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_MicrosoftCrm.xml": {
+		"e1c5e77e19adea1406e5bb511a1c6adb8b610bfe": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_MicrosoftCrm_odata.xml": {
+		"1166b9ce6ce163d11a57046db5ee2dc9d5e496df": "e86fd3fd5c3b4ba9ff613155fba014a80c40cf01",
+		"3f25ced1039b99d1c07b23e3d27cac1562e52a6f": "c1190dfa35e839496745516dbcfeb8a309fa49d0",
+		"750541f00f3c5da6007623f3514add6dc3417a5f": "54331fa4ec501557eb9c32d434c332cf3d121349",
+		"9612a2611bd29461dd46fc70f0e2841892f3f096": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_MsOdbc.xml": {
+		"01561cb7b5630a4a6aed576215ccdb3991d2db52": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"a9c94a6255061e8100b15590da35196464b77d46": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Mysql.xml": {
+		"128d7d66eb994a032128949fcbe0c953c158beaa": "956802047d6623ba61e2da68aba2db8f38bca48a",
+		"522654fad6fa3d008ef386fc9360ae51df910729": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"5dfc7b71e1f6a9fad6ebf47a1d748893c85bbe5e": "341b1220b6bc6bf59eef81e97c694d06134bd8a2",
+		"894b0d1d2c23c98f2e14920013b82524334dd255": "74b3640e2923d4c60c92042ff03d15b4ac4e9341",
+		"8cb3d2b06d8a2b12e8673e6e9519f85ec08b35ec": "f22d442cbde13623a1b96c15ea2df8dd1a7d755e",
+		"a94341e5bd6c4ba0eef57f9d6d3cc6c0006c785b": "ebc9394c2728a3f3850fcbafac4156ef15aab37f",
+		"d7e74c8e9f8a47ab258472ec43236d2933c70838": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"edc9d1453c8f9ac8548822ff2f90a4defcd02094": "fd4d974c755ced1969b27126844b3f462bca1a52"
+	},
+	"mapping_Netezza.xml": {
+		"0c769aa277190990fb33a918cc57189b9ba6306f": "c8ca64da55ceb677fd97169f6a924ec80f01b2fc",
+		"0f5e9677f936a5414ce6593229aa47ea5b757276": "3074a57eee1407a413e460ed27e31d48d21d609b",
+		"b3e25e55f8281cb616b3f549e6a2e5a83d4ad62a": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Oracle.xml": {
+		"0407cea7e87144cb601bc9a3f039121feca79b65": "cb6b87dabdc71be0f1db4bdca694bcb61b679c05",
+		"064d2a5940379346638412dd7f4cb7dbcc30e672": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"26a2295f6401de6e17feb61b261f7fbdfc4d609d": "e7604a488f339028a3cf14ae4031b0fb3fd50bcc",
+		"9b0306aacec772d9d82be49ab702254ce1e08bea": "912702dc8ea921a34ea0522235db65f8655bf8e9",
+		"df2537b329d0b09828c281e62208daf379f7b60a": "544faa63bbe63dd070a94c84139c705ac6432314"
+	},
+	"mapping_ParAccel.xml": {
+		"1ba71027d3a60773c7c008143c2146e4db2ef112": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"5085a1e922f77895a2f7c85e2347acfe03034493": "d51edc7e08871897572c9b1f1cd2d2d2df347dfb"
+	},
+	"mapping_Postgres.xml": {
+		"ce8b7f58644b8f7814a5522d172b4192ff89bd4f": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e1c1f04f95222bcadda336d6a4f0ea07c6ebb08e": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_PostgresPlus.xml": {
+		"69b7d7f722538a322fb0bf867177d1ce5a0d7ad6": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"f576a7bb0327eeff1fd63a9a09106ae33f3ec90e": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_Redshift.xml": {
+		"0cc6e153fe35041a009cb222e0276e35ddbc92f1": "2023289b9965fc14b959463ba5050be6aead361a",
+		"3b941be88a5f13bd8fd905fb1fa5f2a241e89ed9": "915a307b629c7a75bcbedc86267db1e8995b77f3",
+		"85ba89fdadfca4a2d755856a75e904f6015926a9": "de08533f6561319fc2914181a2705ccd75e29c40",
+		"8f3eda24c1f413b17b2b8c48695dbd786fa29b6b": "93112768d7eea6df44d92a3efbd4f1dfa20e06b6",
+		"ab86d7fda94e0b368f739f73994ce2a2147be12d": "0fd3f58b7aa78aaae6fb40d042780bec64da75e6",
+		"ad0eecc7e9f25c3b904cc11b062a8185456478ee": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Redshift_new.xml": {
+		"43085952e178e2c570ab7d2a262278dd2896dd96": "699efe42a33aab3ca0bbaa7a1abee23368e61606"
+	},
+	"mapping_SAPHana.xml": {
+		"1a07a8174468a5a1d55378dd0e21d7c1f9e531bc": "48ea42be6b348a3c993760e7f2c94c58ac08fdae",
+		"331ae8a035e6b1f2cd722be6411df4ae4a95bb33": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_SQLite.xml": {
+		"0a97b6e8acf8bd16aa34a3c01707f1e2a9eeff1f": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"b7b7b7c690efacc208316c911571a8513b5ea713": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_SingleStore.xml": {
+		"9da7d92af5e9b0697436f74fffd190e8af061567": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Snowflake.xml": {
+		"d459c6be3786f9358615eaf692a1c7920b4c6e74": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_Sybase.xml": {
+		"081038547cac8342cf5cadf8bfd02fe4d2929323": "1ff9877dce90e2ef39b267ea60de534796035a95",
+		"09a0f4dc71ff9a844e1162600409317e92e1ff18": "28534ffb4ae599adec53853776856e82c23c815a",
+		"4ee2c12f372953e77404481a962b3aca14abadb0": "f02b1b6902098b2da90cde6b22a9a49ec328970a",
+		"5752dcfa409e903af77587f151d580c68c9e4ac7": "3db0fa1fbed8ae378d52aa8c36b6fed55d184e5b",
+		"6f4e7913b4b31e8fb4e097690c8b903a58842283": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"7676e2d94473564322ce37cad92b7f8b09751b1b": "1cc6237de63892e097c77637ac8457cf8fefbf6f",
+		"8bbad7895713f3a399ddb195c40353e18d3e83b9": "984ca27e4ee0177793b2111797700390424cb746",
+		"bbc091c50a7bd8a8fe630d99a9c2e3f2f878ac88": "67a9b521c9d698b3411fb49410ac61a15f4bc7db",
+		"d841719dcf79a12d0189301e40c0e9e973a45c4f": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"e103a9671d9bcf360fd2e61ee97f4547d0d52241": "e19031add3dc54bf9d0e731f3a05738af48ebb6d",
+		"e1c42d74cc0dc3681b5bd45a901a3bedeb53ec68": "75df15acaa5c8d1dcd4a8e855e0df969fdea25d5",
+		"e30d1f01e88bdaf926855e00d1aef3a37a7eb6e4": "c91dd79086a42dce5417de77bb7ce61c0bd6cbbf",
+		"ee5d7f5f9510f63c340f87862327b869bf4cb743": "607764748cdbff669d2ccfcbaafdaa0d83598f32"
+	},
+	"mapping_Teradata.xml": {
+		"10ed107c1d66b38d51739ffdd0820db676c42cef": "45dbf10541f6dd32283038bcc5b04b10e305770a",
+		"55e6a511c2cb39aca11de302a3850eb2d1f6e3a5": "fc652f1cc70f6caa05d5c65e57115f86653f7841",
+		"ac9ffae887ab4d20d4eca0eddc83163e99507ec8": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"f9b0367424f721cd8029d3540c9a82f39d74a6b4": "c002b50a69b8a0193780e7c0d1788bbd9a5145c3"
+	},
+	"mapping_VectorWise.xml": {
+		"06f86121a9492b3104047691b19718a5d9d49be9": "d51edc7e08871897572c9b1f1cd2d2d2df347dfb",
+		"edf255202bcfad77ff6f3fac11714891934225c4": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8"
+	},
+	"mapping_Vertica.xml": {
+		"28153eaab1c47b8718ca3c49553ec40b047d2878": "d4655e28a5da3e6a2cc03a1305cc1c2970d8e9b8",
+		"2ee78d7679d4201ad29adba4cc0a48084f161e25": "eecc481d671d330bfb46406ab2533830c668bf22",
+		"819be4680c04a7f77c51fc65ebd1d964a714aa78": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"9218d5e7b682513ddf1b891f5f0467ab9938fec3": "341b1220b6bc6bf59eef81e97c694d06134bd8a2",
+		"d9745a57d9f1b6c638ebd57cd5281be020e0614c": "e8f788c5c260f9b82eaaa88d0402423d86a5680d",
+		"dec55a19094d1bcc20f12a8888b27460e83c2e67": "3b582b21fc5ac7ccfb05321c7923591433ced716"
+	},
+	"mapping_XSD.xml": {
+		"1ef837521e274c5b93f5f228955204285b3dd28a": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"9c454252343dfe1400d356cbf41bf88e842b4e1e": "c615b3a622e2f6ba8577e812e71977d9f1b1930d"
+	},
+	"mapping_dynamodb.xml": {
+		"891099e88d8074570dc029f9b7d8b04bbc241383": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_ebcdic.xml": {
+		"b47b25edc9e40d312b548270dbb3f978475be4e7": "7007071c9cf718d34da7d61208ceea7f05de94d0"
+	},
+	"mapping_sap.xml": {
+		"0339bc60ae47e3796c343eee7e2fb1cb1869cefa": "ee49a27e5c3ba3217ab497b1cd4467c088e59f5e",
+		"1f41a55f6f7f1d6d2118e766daf7e3dbfd77551d": "7007071c9cf718d34da7d61208ceea7f05de94d0",
+		"64c23be0c363ab703528677c999e4ef707d54497": "27908d5685066221f02cd3890a5319838215eb8b",
+		"83688cf3134e60d9f5a08b316643a41246717e92": "740c431e0b623cc7d41166588961028ad3efab80",
+		"9df72b6a1f1a72d9be1a4a7fd428873ad9b75bff": "94804b5e96a71d63a294eb9bcfbbb5290824009f",
+		"a300fcd290aa65c254c44d683d30a9fa6ae14a2f": "45e5d88e9c49cb87b47413468073c571f60c0117",
+		"b74c01dff88a52afca5f8c84fbe41d71a34eb6b5": "32832fe0edfbd10d50ed85528481e5c9ca2ec8e0",
+		"c814f616005e1637ec107dd8c0f269bd69661d2e": "7d07608dceb06f7364b5bb8babc0f6e921fc443a"
+	},
+	"mapping_sas.xml": {
+		"4aeb0deb41f61dbe69e85e780fb1e985c9f3d758": "fd44bfb0ee3fc8288465507b937c53619f43c0ec"
+	}
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ICoreService.java

@@ -31,6 +31,7 @@ import org.talend.core.model.metadata.ColumnNameChanged;
 import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
 import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
@@ -116,6 +117,7 @@ public interface ICoreService extends IService {
 
     public String validateValueForDBType(String columnName);
 
+    @Deprecated
     public void synchronizeMapptingXML(ITalendProcessJavaProject talendJavaProject);
 
     public IPreferenceStore getPreferenceStore();
@@ -124,6 +126,7 @@ public interface ICoreService extends IService {
 
     public IMetadataTable convert(MetadataTable originalTable);
 
+    @Deprecated
     public void syncMappingsFileFromSystemToProject();
     
     /**
@@ -132,4 +135,17 @@ public interface ICoreService extends IService {
      */
     void installComponents(IProgressMonitor monitor);
 
+    Integer getSignatureVerifyResult(Property property, IPath resourcePath, boolean considerGP) throws Exception;
+
+    String getLicenseCustomer();
+
+    boolean isInValidGP();
+
+    public static ICoreService get() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
+            return GlobalServiceRegister.getDefault().getService(ICoreService.class);
+        }
+        return null;
+    }
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ILibraryManagerService.java

@@ -21,6 +21,7 @@ import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.talend.core.model.general.ModuleNeeded;
+import org.talend.core.model.general.RetrieveResult;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.nexus.ArtifactRepositoryBean;
 import org.talend.core.nexus.TalendLibsServerManager;
@@ -109,6 +110,8 @@ public interface ILibraryManagerService extends IService {
 
     public boolean retrieve(ModuleNeeded module, String pathToStore, boolean showDialog, IProgressMonitor... monitorWrap);
 
+    RetrieveResult retrieveModules(ERepositoryObjectType codeType, Set<ModuleNeeded> modulesNeeded, String pathToStore,
+            boolean showDialog, IProgressMonitor... monitorWrap);
     /**
      *
      * Resolve the jar from custom nexus
@@ -151,6 +154,10 @@ public interface ILibraryManagerService extends IService {
     public boolean contains(String jarName);
 
     public void clearCache();
+    
+    public void clearCache(boolean cleanIndex);
+    
+    public void deployLibsFromCustomComponents();
 
     @Deprecated
     public Set<String> list(boolean withComponent, IProgressMonitor... monitorWrap);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ITDQComponentService.java

@@ -0,0 +1,23 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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;
+
+import org.talend.core.model.process.IExternalNode;
+import org.talend.core.model.process.INode;
+
+public interface ITDQComponentService extends IService {
+
+    public boolean isTDQExternalComponent(String componentName);
+
+    public IExternalNode createExternalComponent(INode node);
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ITDQCryptoFileService.java

@@ -39,4 +39,9 @@ public interface ITDQCryptoFileService extends IService {
      */
     public void generateCryptoFile(String passwordM1, String cryptoMethod, String cryptoFilePath);
 
+    /**
+     * Generate Encrypty file
+     */
+    public void generateCryptoFile(String passwordM1, String cryptoMethod, String cryptoFilePath, int algoVersion);
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/context/RepositoryContext.java

@@ -15,8 +15,10 @@ package org.talend.core.context;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.User;
+import org.talend.core.service.ICloudSignOnService;
 
 /**
  * DOC smallet class global comment. Detailled comment <br/>
@@ -139,6 +141,14 @@ public class RepositoryContext {
      * @return the clearPassword
      */
     public String getClearPassword() {
+        try {
+            if (ICloudSignOnService.get() != null && ICloudSignOnService.get().isSignViaCloud()) {
+                return ICloudSignOnService.get().getLatestToken().getAccessToken();
+            }
+        }catch (Exception ex) {
+            ExceptionHandler.process(ex);
+        }
+
         return clearPassword;
     }
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabaseTypeName.java

@@ -147,8 +147,15 @@ public enum EDatabaseTypeName {
 
     MAPRDB(
             "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);
+            "SNOWFLAKE",
+            "SNOWFLAKE",
+            Boolean.TRUE,
+            "SNOWFLAKE",
+            EDatabaseSchemaOrCatalogMapping.None,
+            EDatabaseSchemaOrCatalogMapping.None,
+            true);
 
     // displayName is used in Java code.
     private String displayName;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/ERedshiftDriver.java

@@ -0,0 +1,108 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.database;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.talend.core.database.conn.version.EDatabaseVersion4Drivers;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public enum ERedshiftDriver {
+
+    DRIVER_V2("Driver v2", new String[] { "redshift-jdbc42-2.1.0.3.jar" }),
+    DRIVER_V1("Driver v1", new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar" });
+
+    private String displayName;
+
+    private String[] drivers = new String[] {};
+
+    private ERedshiftDriver(String displayName, String[] drivers) {
+        this.displayName = displayName;
+        this.drivers = drivers;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String[] getDrivers() {
+        return drivers;
+    }
+
+    public void setDrivers(String[] drivers) {
+        this.drivers = drivers;
+    }
+
+    public static Set<String> getDriversByVersion(EDatabaseVersion4Drivers v4d, String version) {
+        Set<String> drivers = new HashSet<String>();
+        Set<String> providerDrivers = v4d.getProviderDrivers();
+        ERedshiftDriver redshiftDriver = ERedshiftDriver.valueOf(version);
+        if (redshiftDriver != null && DRIVER_V1 != redshiftDriver) {
+            // to replace default one
+            String[] v1Drivers = DRIVER_V1.getDrivers();
+            for (String driver : providerDrivers) {
+                boolean replaced = false;
+                for (int i = 0; i < v1Drivers.length; i++) {
+                    if (driver.equals(v1Drivers[i])) {
+                        drivers.add(redshiftDriver.getDrivers()[i]);
+                        replaced = true;
+                        break;
+                    }
+                }
+                if (!replaced) {
+                    drivers.add(driver);
+                }
+            }
+        } else {
+            drivers.addAll(providerDrivers);
+        }
+        return drivers;
+    }
+
+    public static String[] getRedshiftDriverDisplayNames() {
+        List<String> names = new ArrayList<String>();
+        for (ERedshiftDriver eRedshiftDriver : ERedshiftDriver.values()) {
+            names.add(eRedshiftDriver.getDisplayName());
+        }
+        return names.toArray(new String[0]);
+    }
+
+    public static String getDisplayNameByEName(String eName) {
+        String displayName = eName;
+        ERedshiftDriver eRedshiftDriver = ERedshiftDriver.valueOf(eName);
+        if (eRedshiftDriver != null) {
+            displayName = eRedshiftDriver.getDisplayName();
+        }
+        return displayName;
+    }
+
+    public static String getEnameByDisplayName(String displayName) {
+        String eName = DRIVER_V1.name();
+        for (ERedshiftDriver eRedshiftDriver : ERedshiftDriver.values()) {
+            if (eRedshiftDriver.getDisplayName().equals(displayName)) {
+                eName = eRedshiftDriver.name();
+            }
+        }
+        return eName;
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/ConnParameterKeys.java

@@ -225,11 +225,23 @@ public class ConnParameterKeys {
     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_AUTH_MODE = "CONN_PARA_KEY_SYNAPSE_AUTH_MODE";
+    
     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_APPLICATION_ID = "CONN_PARA_KEY_SYNAPSE_APPLICATION_ID"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_SYNAPSE_DIRECTORY_ID = "CONN_PARA_KEY_SYNAPSE_DIRECTORY_ID"; //$NON-NLS-1$
+
+    public static final String CONN_PARA_KEY_SYNAPSE_CLIENT_KEY = "CONN_PARA_KEY_SYNAPSE_CLIENT_KEY"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_USE_SYNAPSE_CLIENT_CERTIFICATE = "CONN_PARA_KEY_USE_SYNAPSE_CLIENT_CERTIFICATE"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_KEY_SYNAPSE_CLIENT_CERTIFICATE = "CONN_PARA_KEY_SYNAPSE_CLIENT_CERTIFICATE"; //$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$
@@ -316,28 +328,42 @@ public class ConnParameterKeys {
     /**
      * Google Dataproc keys.
      */
-    public static final String CONN_PARA_KEY_GOOGLE_PROJECT_ID = "CONN_PARA_KEY_GOOGLE_PROJECT_ID"; //$NON-NLS-1$
+    public static final String CONN_PARA_KEY_GOOGLE_PROJECT_ID = "CONN_PARA_KEY_GOOGLE_PROJECT_ID";
 
-    public static final String CONN_PARA_KEY_GOOGLE_CLUSTER_ID = "CONN_PARA_KEY_GOOGLE_CLUSTER_ID";//$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_GOOGLE_REGION = "CONN_PARA_KEY_GOOGLE_REGION"; //$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_GOOGLE_JARS_BUCKET = "CONN_PARA_KEY_GOOGLE_JARS_BUCKET"; //$NON-NLS-1$
+    public static final String CONN_PARA_KEY_GOOGLE_CLUSTER_ID = "CONN_PARA_KEY_GOOGLE_CLUSTER_ID";
 
+    public static final String CONN_PARA_KEY_GOOGLE_REGION = "CONN_PARA_KEY_GOOGLE_REGION";
+    
+    public static final String CONN_PARA_KEY_GOOGLE_JARS_BUCKET = "CONN_PARA_KEY_GOOGLE_JARS_BUCKET";
+    
+    public static final String CONN_PARA_KEY_PROVIDE_GOOGLE_CREDENTIALS = "CONN_PARA_KEY_PROVIDE_GOOGLE_CREDENTIALS"; 
+    
+    public static final String CONN_PARA_KEY_AUTH_MODE = "CONN_PARA_KEY_AUTH_MODE";
+    
     public static final String CONN_PARA_KEY_DEFINE_PATH_TO_GOOGLE_CREDENTIALS = "CONN_PARA_KEY_DEFINE_PATH_TO_GOOGLE_CREDENTIALS"; //$NON-NLS-1$
 
     public static final String CONN_PARA_KEY_PATH_TO_GOOGLE_CREDENTIALS = "CONN_PARA_KEY_PATH_TO_GOOGLE_CREDENTIALS"; //$NON-NLS-1$
+    
+    public static final String CONN_PARA_OAUTH2_TOKEN_TO_GOOGLE_CREDENTIALS = "CONN_PARA_OAUTH2_TOKEN_TO_GOOGLE_CREDENTIALS"; //$NON-NLS-1$
 
     /**DataBricks*/
     public static final String CONN_PARA_KEY_DATABRICKS_ENDPOINT="CONN_PARA_KEY_DATABRICKS_ENDPOINT";
 
     public static final String CONN_PARA_KEY_DATABRICKS_CLOUD_PROVIDER = "CONN_PARA_KEY_DATABRICKS_CLOUD_PROVIDER";
     
+    public static final String CONN_PARA_KEY_DATABRICKS_CLUSTER_TYPE = "CONN_PARA_KEY_DATABRICKS_CLUSTER_TYPE";
+    
     public static final String CONN_PARA_KEY_DATABRICKS_RUN_MODE = "CONN_PARA_KEY_DATABRICKS_RUN_MODE";
 
     public static final String CONN_PARA_KEY_DATABRICKS_CLUSTER_ID="CONN_PARA_KEY_DATABRICKS_CLUSTER_ID";
 
     public static final String CONN_PARA_KEY_DATABRICKS_TOKEN="CONN_PARA_KEY_DATABRICKS_TOKEN";
+    
+    public static final String CONN_PARA_KEY_DATABRICKS_NODE_TYPE="CONN_PARA_KEY_DATABRICKS_NODE_TYPE";
+    
+    public static final String CONN_PARA_KEY_DATABRICKS_DRIVER_NODE_TYPE="CONN_PARA_KEY_DATABRICKS_DRIVER_NODE_TYPE";
+    
+    public static final String CONN_PARA_KEY_DATABRICKS_RUNTIME_VERSION="CONN_PARA_KEY_DATABRICKS_RUNTIME_VERSION";
 
     public static final String CONN_PARA_KEY_DATABRICKS_DBFS_DEP_FOLDER="CONN_PARA_KEY_DATABRICKS_DBFS_DEP_FOLDER";
 
@@ -361,5 +387,27 @@ public class ConnParameterKeys {
     
     public static final String CONN_PARA_KEY_KNOX_DIRECTORY="CONN_PARA_KEY_KNOX_DIRECTORY";
 
+    // CDE
+    public static final String CONN_PARA_KEY_CDE_API_ENDPOINT="CONN_PARA_KEY_CDE_API_ENDPOINT";
+    public static final String CONN_PARA_KEY_CDE_TOKEN="CONN_PARA_KEY_CDE_TOKEN";
+    public static final String CONN_PARA_KEY_CDE_AUTO_GENERATE_TOKEN="CONN_PARA_KEY_CDE_AUTO_GENERATE_TOKEN";
+    public static final String CONN_PARA_KEY_CDE_TOKEN_ENDPOINT="CONN_PARA_KEY_CDE_TOKEN_ENDPOINT";
+    public static final String CONN_PARA_KEY_CDE_WORKLOAD_USER="CONN_PARA_KEY_CDE_WORKLOAD_USER";
+    public static final String CONN_PARA_KEY_CDE_WORKLOAD_PASSWORD = "CONN_PARA_KEY_CDE_WORKLOAD_PASSWORD";
+    
+    // STANDALONE
+    public static final String CONN_PARA_KEY_UNIV_STANDALONE_MASTER="CONN_PARA_KEY_UNIV_STANDALONE_MASTER";
+    public static final String CONN_PARA_KEY_UNIV_STANDALONE_CONFIGURE_EXEC="CONN_PARA_KEY_UNIV_STANDALONE_CONFIGURE_EXEC";
+    public static final String CONN_PARA_KEY_UNIV_STANDALONE_EXEC_MEMORY="CONN_PARA_KEY_UNIV_STANDALONE_EXEC_MEMORY";
+    public static final String CONN_PARA_KEY_UNIV_STANDALONE_EXEC_CORE="CONN_PARA_KEY_UNIV_STANDALONE_EXEC_CORE";
+    
+    /**
+     * Redshift
+     */
+    public static final String CONN_PARA_KEY_REDSHIFT_DRIVER = "CONN_PARA_KEY_REDSHIFT_DRIVER";
+
+    public static final String CONN_PARA_KEY_REDSHIFT_STRINGPARA = "CONN_PARA_KEY_REDSHIFT_STRINGPARA";
+
+    public static final String CONN_PARA_KEY_REDSHIFT_PARATABLE = "CONN_PARA_KEY_REDSHIFT_PARATABLE";
 
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/template/EDatabaseConnTemplate.java

@@ -207,7 +207,13 @@ public enum EDatabaseConnTemplate {
             "2181")), //$NON-NLS-1$
 
     MAPRDB(new DbConnStr(EDatabaseTypeName.MAPRDB, "127.0.0.1", //$NON-NLS-1$
-            "5181")); //$NON-NLS-1$
+            "5181")), //$NON-NLS-1$
+
+    SNOWFLAKE(
+            new DbConnStr(EDatabaseTypeName.SNOWFLAKE, //
+                    "jdbc:snowflake://<host>:<port>/?<property>",
+                    "3306" //$NON-NLS-1$
+            )); // $NON-NLS-1$
 
     private DbConnStr connStr;
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java

@@ -13,10 +13,12 @@
 package org.talend.core.database.conn.version;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 import org.talend.core.database.EDatabaseTypeName;
+import org.talend.core.database.ERedshiftDriver;
 import org.talend.core.database.conn.DatabaseConnConstants;
 
 /**
@@ -54,22 +56,22 @@ public enum EDatabaseVersion4Drivers {
     HSQLDB_SERVER(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB_SERVER, "hsqldb.jar")), //$NON-NLS-1$
     HSQLDB_WEBSERVER(new DbVersion4Drivers(EDatabaseTypeName.HSQLDB_WEBSERVER, "hsqldb.jar")), //$NON-NLS-1$
 
-    H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-2.0.206.jar")), //$NON-NLS-1$
+    H2(new DbVersion4Drivers(EDatabaseTypeName.H2, "h2-2.1.214.jar")), //$NON-NLS-1$
 
     //
     JAVADB_EMBEDED(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_EMBEDED, "derby.jar")), //$NON-NLS-1$
     SQLITE(new DbVersion4Drivers(EDatabaseTypeName.SQLITE, "sqlitejdbc-v056.jar")), //$NON-NLS-1$
     FIREBIRD(new DbVersion4Drivers(EDatabaseTypeName.FIREBIRD, "jaybird-full-2.1.1.jar")), //$NON-NLS-1$
     TERADATA(new DbVersion4Drivers(EDatabaseTypeName.TERADATA,
-            new String[] { "terajdbc4-16.20.00.02.jar", "tdgssconfig-16.20.00.02.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            new String[] { "terajdbc4-17.10.00.27.jar" })), //$NON-NLS-1$
     JAVADB_DERBYCLIENT(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_DERBYCLIENT, "derbyclient.jar")), //$NON-NLS-1$
     NETEZZA(new DbVersion4Drivers(EDatabaseTypeName.NETEZZA, "nzjdbc.jar")), //$NON-NLS-1$
     INFORMIX(new DbVersion4Drivers(EDatabaseTypeName.INFORMIX, "ifxjdbc.jar")), //$NON-NLS-1$
 
     SAS_9_1(new DbVersion4Drivers(EDatabaseTypeName.SAS, "SAS 9.1", "SAS_9.1", new String[] { "sas.core.jar", //$NON-NLS-1$
-            "sas.intrnet.javatools.jar", "sas.svc.connection.jar", "org.apache.log4j_1.2.15.v201012070815.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            "sas.intrnet.javatools.jar", "sas.svc.connection.jar", "reload4j-1.2.19.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     SAS_9_2(new DbVersion4Drivers(EDatabaseTypeName.SAS,
-            "SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "org.apache.log4j_1.2.15.v201012070815.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            "SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "reload4j-1.2.19.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     SAPHana(new DbVersion4Drivers(EDatabaseTypeName.SAPHana, "HDB 1.0", "HDB_1_0", "ngdbc.jar")), //$NON-NLS-1$
     // MYSQL, add for 9594
     MYSQL_8(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 8", "MYSQL_8", "mysql-connector-java-8.0.18.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -81,10 +83,11 @@ 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.29.jar", "slf4j-log4j12-1.7.29.jar", "adal4j-1.6.7.jar", //$NON-NLS-1$
-                    "commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.6.jar", "oauth2-oidc-sdk-9.7.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","content-type-2.1.jar" })),
+            new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", "msal4j-1.11.0.jar", //$NON-NLS-1$
+                    "oauth2-oidc-sdk-9.7.jar", "reload4j-1.2.19.jar", "jackson-core-2.13.2.jar",
+                    "jackson-databind-2.13.2.2.jar", "jackson-annotations-2.13.2.jar", "jcip-annotations-1.0-1.jar",
+                    "json-smart-2.4.7.jar", "nimbus-jose-jwt-9.22.jar", "accessors-smart-2.4.7.jar", "asm-9.1.jar",
+                    "content-type-2.1.jar", "lang-tag-1.5.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$
 
@@ -92,19 +95,19 @@ public enum EDatabaseVersion4Drivers {
     GREENPLUM_PSQL(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"PostgreSQL", "POSTGRESQL", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$
     GREENPLUM(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"Greenplum", "GREENPLUM", "greenplum-5.1.4.000275.jar")), //$NON-NLS-1$
 //    PSQL_V10(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v10", "V10", "postgresql-42.2.5.jar")),
-    PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.14.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    PSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "v9 and later", "V9_X", "postgresql-42.2.26.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     PSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PSQL, "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     PLUSPSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL,
             "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.2.14.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-42.2.26.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     IBMDB2(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
             "db2jcc_license_cisuz.jar" })), //$NON-NLS-1$
     IBMDB2ZOS(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2ZOS, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
             "db2jcc_license_cisuz.jar" })), //$NON-NLS-1$
     SYBASEASE(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 12/15", "SYBSEIQ_12_15", "jconn3.jar")), //$NON-NLS-1$
     SYBASEIQ_16(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 16", "SYBSEIQ_16", "jconn4.jar")), //$NON-NLS-1$
-    SYBASEIQ_16_SA(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 16 (SQL Anywhere)", "SYBSEIQ_16_SA", "sajdbc4-17.0.0.jar")),
+    SYBASEIQ_16_SA(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "Sybase 16 (SQL Anywhere) and above", "SYBSEIQ_16_SA", "sajdbc4-17.0.0.jar")),
     SYBASEIQ(new DbVersion4Drivers(EDatabaseTypeName.SYBASEIQ, "jconn3.jar")), //$NON-NLS-1$
 
     EXASOL(new DbVersion4Drivers(EDatabaseTypeName.EXASOL, "exajdbc-6.0.9302.jar")), //$NON-NLS-1$
@@ -148,11 +151,12 @@ public enum EDatabaseVersion4Drivers {
     MAPRDB(new DbVersion4Drivers(EDatabaseTypeName.MAPRDB, new String[] {})),
 
     REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "redshift", "REDSHIFT", //$NON-NLS-1$ //$NON-NLS-2$
-            "redshift-jdbc42-no-awssdk-1.2.37.1061.jar")), //$NON-NLS-1$
+            new String[]{ "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     REDSHIFT_SSO(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT_SSO, "redshift sso", "REDSHIFT_SSO", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "redshift-jdbc42-no-awssdk-1.2.37.1061.jar", "aws-java-sdk-1.11.848.jar", "jackson-core-2.11.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar", "aws-java-sdk-1.11.848.jar", "jackson-core-2.11.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
                     "jackson-databind-2.11.4.jar", "jackson-annotations-2.11.4.jar", "httpcore-4.4.13.jar", "httpclient-4.5.13.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
-                    "joda-time-2.8.1.jar", "commons-logging-1.2.jar", "commons-codec-1.14.jar" })), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    "joda-time-2.8.1.jar", "commons-logging-1.2.jar", "commons-codec-1.14.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                    "aws-java-sdk-redshift-internal-1.12.x.jar" })), //$NON-NLS-1$
 
     AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.49.jar")); //$NON-NLS-1$
 
@@ -292,6 +296,9 @@ public enum EDatabaseVersion4Drivers {
                     if (version.equalsIgnoreCase(v4d.getVersionValue())) {
                         drivers.addAll(v4d.getProviderDrivers());
                     }
+                    if (drivers.isEmpty()) {
+                        drivers.addAll(getDriversByDriverVersion(v4d, version));
+                    }
                 }
             } else {
                 // only check the version value
@@ -303,6 +310,14 @@ public enum EDatabaseVersion4Drivers {
         return drivers;
     }
 
+    private static Set<String> getDriversByDriverVersion(EDatabaseVersion4Drivers v4d, String version) {
+        Set<String> drivers = new HashSet<String>();
+        if (REDSHIFT == v4d || REDSHIFT_SSO == v4d) {
+            drivers = ERedshiftDriver.getDriversByVersion(v4d, version);
+        }
+        return drivers;
+    }
+
     public static boolean containTypeAndVersion(final String dbType, final String version) {
         if (version == null) {
             return false;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopProperties.java

@@ -83,6 +83,12 @@ public enum EHadoopProperties {
     GOOGLE_REGION,
 
     GOOGLE_JARS_BUCKET,
+    
+    AUTH_MODE,
+    
+    PATH_TO_GOOGLE_CREDENTIALS,
+    
+    OAUTH_ACCESS_TOKEN,
 
     HD_WEBHCAT_HOSTNAME,
 
@@ -112,10 +118,22 @@ public enum EHadoopProperties {
     
     SYNAPSE_STORAGE_CONTAINER,
     
+    ADLSGEN2AUTH,
+    
     SYNAPSE_STORAGE_USERNAME,
     
     SYNAPSE_STORAGE_PASSWORD,
     
+    SYNAPSE_APPLICATION_ID,
+    
+    SYNAPSE_DIRECTORY_ID,
+    
+    SYNAPSE_CLIENT_KEY,
+    
+    SYNAPSE_USE_CERTIFICATE,
+    
+    SYNAPSE_CLIENT_CERTIFICATE,
+    
     DEPLOY_FOLDER,
     
     SPARK_DRIVER_MEM,
@@ -134,7 +152,21 @@ public enum EHadoopProperties {
     
     DATABRICKS_TOKEN,
     
-    DATABRICKS_DBFS_DEP_FOLDER;
+    DATABRICKS_DBFS_DEP_FOLDER,
+    
+    DATABRICKS_NODE_TYPE,
+    
+    DATABRICKS_DRIVER_NODE_TYPE,
+    
+    DATABRICKS_RUNTIME_VERSION,
+    
+    DATABRICKS_CLUSTER_TYPE,
+    
+    UNIV_STANDALONE_MASTER,
+    
+    UNIV_STANDALONE_EXEC_MEMORY,
+    
+    UNIV_STANDALONE_EXEC_CORE;
 
     public String getName() {
         return this.name();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/EDataprocAuthType.java

@@ -0,0 +1,75 @@
+// ============================================================================
+//
+// 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 EDataprocAuthType {
+
+	OAUTH_API("OAuth2 Access Token"), //$NON-NLS-1$
+
+	SERVICE_ACCOUNT("Service account"); //$NON-NLS-1$
+
+    private String displayName;
+
+    EDataprocAuthType(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getName() {
+        return name();
+    }
+
+    public String getDisplayName() {
+        return this.displayName;
+    }
+
+    public static List<String> getAllDataprocAuthTypes() {
+        return getAllDataprocAuthTypes(true);
+    }
+
+    public static List<String> getAllDataprocAuthTypes(boolean display) {
+        List<String> types = new ArrayList<String>();
+        EDataprocAuthType[] values = values();
+        for (EDataprocAuthType authType : values) {
+            if (display) {
+            	types.add(authType.getDisplayName());
+            } else {
+            	types.add(authType.getName());
+            }
+        }
+        return types;
+    }
+
+    public static EDataprocAuthType getDataprocAuthTypeByDisplayName(String name) {
+        return getDataprocAuthTypeByName(name, true);
+    }
+
+    public static EDataprocAuthType getDataprocAuthTypeByName(String type, boolean display) {
+        if (type != null) {
+            for (EDataprocAuthType authType : values()) {
+                if (display) {
+                    if (type.equalsIgnoreCase(authType.getDisplayName())) {
+                        return authType;
+                    }
+                } else {
+                    if (type.equalsIgnoreCase(authType.getName())) {
+                        return authType;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/ContextUtils.java

@@ -222,6 +222,32 @@ public class ContextUtils {
         }
         return parameterType;
     }
+    
+    // TUP-36519:For possible duplicate internalid scenario(TUP-36667) after several times' renaming in joblet. Loop all and find the nearest
+    // one.
+    public static ContextParameterType getContextParameterTypeById(ContextType contextType, final String uuId,
+            boolean isFromContextItem, String paraName) {
+        if (contextType == null || uuId == null) {
+            return null;
+        }
+
+        ContextParameterType parameterType = null;
+        for (ContextParameterType param : (List<ContextParameterType>) contextType.getContextParameter()) {
+            String paramId = null;
+            if (isFromContextItem) {
+                paramId = ResourceHelper.getUUID(param);
+            } else {
+                paramId = param.getInternalId();
+            }
+            if (uuId.equals(paramId)) {
+                parameterType = param;
+                if (paraName != null && StringUtils.equals(paraName, param.getName())) {
+                    break;
+                }
+            }
+        }
+        return parameterType;
+    }
 
     public static ContextParameterType getContextParameterTypeById(ContextType contextType, final String uuId,
             boolean isFromContextItem) {
@@ -766,11 +792,11 @@ public class ContextUtils {
             return ContextUtils.getContextTypeByName(contextItem, contextName, true);
         } else if (item instanceof JobletProcessItem) {
             JobletProcessItem jobletProcessItem = (JobletProcessItem) item;
-            return ContextUtils.getContextTypeByName((List<ContextType>) jobletProcessItem.getJobletProcess().getContext(),
+            return ContextUtils.getContextTypeByName(jobletProcessItem.getJobletProcess().getContext(),
                     contextName, jobletProcessItem.getJobletProcess().getDefaultContext());
         } else if (item instanceof ProcessItem) {
             ProcessItem processItem = (ProcessItem) item;
-            return ContextUtils.getContextTypeByName((List<ContextType>) processItem.getProcess().getContext(), contextName,
+            return ContextUtils.getContextTypeByName(processItem.getProcess().getContext(), contextName,
                     processItem.getProcess().getDefaultContext());
         }
         return null;
@@ -846,7 +872,7 @@ public class ContextUtils {
                         if (item != null) {
                             final ContextType repoContextType = ContextUtils.getContextTypeByName(item, contextType.getName());
                             ContextParameterType repoContextParam = ContextUtils.getContextParameterTypeById(repoContextType,
-                                    paramLink.getId(), item instanceof ContextItem);
+                                    paramLink.getId(), item instanceof ContextItem, contextParameterType.getName());
                             if (repoContextParam != null
                                     && !StringUtils.equals(repoContextParam.getName(), contextParameterType.getName())) {
                                 renamedMap.put(repoContextParam.getName(), contextParameterType.getName());
@@ -915,7 +941,7 @@ public class ContextUtils {
                                 if (item != null) {
                                     ContextType contextType = ContextUtils.getContextTypeByName(item, context.getName());
                                     ContextParameterType repoParameterType = ContextUtils.getContextParameterTypeById(contextType,
-                                            parameterLink.getId(), item instanceof ContextItem);
+                                            parameterLink.getId(), item instanceof ContextItem, parameterType.getName());
                                     if (repoParameterType != null
                                             && !StringUtils.equals(repoParameterType.getName(), parameterType.getName())) {
                                         renamedMap.put(repoParameterType.getName(), parameterType.getName());
@@ -975,7 +1001,7 @@ public class ContextUtils {
         ContextParameterType contextParameterType = null;
         if (paramLink != null && paramLink.getId() != null && contextType != null) {
             contextParameterType = getContextParameterTypeById(contextType, paramLink.getId(),
-                    contextItem instanceof ContextItem);
+                    contextItem instanceof ContextItem, paramName);
         }
         if (contextParameterType != null) {// Compare use UUID
             if (!StringUtils.equals(contextParameterType.getName(), paramName)) {
@@ -1134,5 +1160,31 @@ public class ContextUtils {
         }
         return list;
     }
+
+    public static IContext convert2IContext(ContextType contextType) {
+        return convert2IContext(contextType, null);
+    }
+
+    public static IContext convert2IContext(ContextType contextType, String repositoryContextId) {
+        if (contextType == null) {
+            return null;
+        }
+        IContext jobContext = new JobContext(contextType.getName());
+        List<ContextParameterType> repoParams = contextType.getContextParameter();
+        for (ContextParameterType repoParam : repoParams) {
+            IContextParameter jobParam = new JobContextParameter();
+            jobParam.setName(repoParam.getName());
+            jobParam.setContext(jobContext);
+            jobParam.setComment(repoParam.getComment());
+            jobParam.setPrompt(repoParam.getPrompt());
+            jobParam.setPromptNeeded(repoParam.isPromptNeeded());
+            jobParam.setSource(repositoryContextId != null ? repositoryContextId : repoParam.getRepositoryContextId());
+            jobParam.setType(repoParam.getType());
+            jobParam.setValue(repoParam.getValue());
+            jobParam.setInternalId(repoParam.getInternalId());
+            jobContext.getContextParameterList().add(jobParam);
+        }
+        return jobContext;
+    }
 }
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ConnectionBean.java

@@ -17,10 +17,14 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.pendo.PendoTrackSender;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.repository.model.RepositoryConstants;
+import org.talend.signon.util.TMCRepositoryUtil;
+import org.talend.signon.util.TokenMode;
 import org.talend.utils.json.JSONException;
 import org.talend.utils.json.JSONObject;
 
@@ -58,12 +62,14 @@ public class ConnectionBean implements Cloneable {
 
     private static final String TOKEN = "token"; //$NON-NLS-1$
 
-    private static final String URL = "url"; //$NON-NLS-1$
-
     private static final String STORECREDENTIALS = "storeCredentials"; //$NON-NLS-1$
 
     private String credentials = ""; //$NON-NLS-1$
 
+    public static final String CLOUD_TOKEN_ID ="cloud_token"; //$NON-NLS-1$
+    
+    private static final String LOGIN_VIA_CLOUD = "login_via_cloud"; //$NON-NLS-1$
+    
     /**
      * DOC smallet ConnectionBean constructor comment.
      */
@@ -89,6 +95,24 @@ public class ConnectionBean implements Cloneable {
         newConnection.setPassword(""); //$NON-NLS-1$
         return newConnection;
     }
+    
+    public static ConnectionBean getDefaultCloudConnectionBean(String dataCenter) {
+        ConnectionBean newConnection = new ConnectionBean();
+        newConnection.setName(Messages.getString("ConnectionBean.Cloud.name", TMCRepositoryUtil.getDisplayNameByDatacenter(dataCenter))); //$NON-NLS-1$
+        newConnection.setDescription(Messages.getString("ConnectionBean.CloudConnection.description", TMCRepositoryUtil.getDisplayNameByDatacenter(dataCenter))); //$NON-NLS-1$
+        newConnection.setRepositoryId(TMCRepositoryUtil.getRepositoryId(dataCenter));
+        newConnection.setToken(true);
+        newConnection.setStoreCredentials(true);
+        newConnection.setComplete(true);
+        newConnection.setLoginViaCloud(true);
+        newConnection.setWorkSpace(getRecentWorkSpace());
+        return newConnection;
+    }
+    
+    protected static String getRecentWorkSpace() {
+        String filePath = new Path(Platform.getInstanceLocation().getURL().getPath()).toFile().getPath();
+        return filePath;
+    }
 
     /**
      * Getter for ID.
@@ -184,11 +208,16 @@ public class ConnectionBean implements Cloneable {
      */
     public String getPassword() {
         try {
+            
             if (conDetails.has(PASSWORD)) {
                 if (isStoreCredentials() && credentials != null) {
                     return this.credentials;
                 }
                 return conDetails.getString(PASSWORD);
+            }  else if (conDetails.has(CLOUD_TOKEN_ID)){ 
+                String object = conDetails.getString(CLOUD_TOKEN_ID);
+                TokenMode token = TokenMode.parseFromJson(object, null);
+                return token.getAccessToken();
             }
         } catch (JSONException e) {
             ExceptionHandler.process(e);
@@ -215,7 +244,7 @@ public class ConnectionBean implements Cloneable {
      * @return the user
      */
     public String getUser() {
-        try {
+        try {       
             if (conDetails.has(USER)) {
                 String user = conDetails.getString(USER);
                 if (isToken()) {
@@ -226,7 +255,7 @@ public class ConnectionBean implements Cloneable {
                     }
                 }
                 return user;
-            }
+            } 
         } catch (JSONException e) {
             ExceptionHandler.process(e);
         }
@@ -320,6 +349,25 @@ public class ConnectionBean implements Cloneable {
             ExceptionHandler.process(e);
         }
     }
+    
+    public boolean isLoginViaCloud() {
+        try {
+            if (conDetails.has(LOGIN_VIA_CLOUD)) {
+                return (Boolean) conDetails.get(LOGIN_VIA_CLOUD);
+            }
+        } catch (JSONException e) {
+            // do nothing
+        }
+        return false;
+    }
+    
+    public void setLoginViaCloud(boolean isLoginViaCloud) {
+        try {
+            conDetails.put(LOGIN_VIA_CLOUD, isLoginViaCloud);
+        } catch (JSONException e) {
+            // do nothing
+        }
+    }
 
     @Override
     public ConnectionBean clone() throws CloneNotSupportedException {
@@ -418,14 +466,21 @@ public class ConnectionBean implements Cloneable {
 
     public String getUrl() {
         try {
-            if (conDetails.has(URL)) {
-                return conDetails.getString(URL);
+            if (dynamicFields.containsKey(RepositoryConstants.REPOSITORY_URL)) {
+                return dynamicFields.get(RepositoryConstants.REPOSITORY_URL);
+            }
+            if (conDetails.has(RepositoryConstants.REPOSITORY_URL)) {
+                return conDetails.getString(RepositoryConstants.REPOSITORY_URL);
             }
         } catch (JSONException e) {
             ExceptionHandler.process(e);
         }
         return "";
     }
+    
+    public void setUrl(String url) {
+        dynamicFields.put(RepositoryConstants.REPOSITORY_URL, url);
+    }
 
     public boolean isStoreCredentials() {
         try {
@@ -453,4 +508,27 @@ public class ConnectionBean implements Cloneable {
     public void setCredentials(String credentials) {
         this.credentials = credentials;
     }
+
+    
+    public TokenMode getConnectionToken() {
+        try {
+            if (conDetails.has(CLOUD_TOKEN_ID)) {
+                String object = conDetails.getString(CLOUD_TOKEN_ID);
+                return TokenMode.parseFromJson(object, null);
+            }
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
+    }
+
+    
+    public void setConnectionToken(TokenMode connectionToken) {
+        try {
+            conDetails.put(CLOUD_TOKEN_ID, TokenMode.writeToJson(connectionToken));
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+    }
+    
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/RetrieveResult.java

@@ -0,0 +1,42 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.model.general;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class RetrieveResult {
+
+    private boolean allResolved;
+
+    private Set<ModuleNeeded> resovledModules = new HashSet<>();
+
+    private Set<ModuleNeeded> unresolvedModules = new HashSet<>();
+
+    public boolean isAllResolved() {
+        return allResolved;
+    }
+
+    public void setAllResolved(boolean allResolved) {
+        this.allResolved = allResolved;
+    }
+
+    public Set<ModuleNeeded> getResovledModules() {
+        return resovledModules;
+    }
+
+    public Set<ModuleNeeded> getUnresolvedModules() {
+        return unresolvedModules;
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/IMetadataConnection.java

@@ -194,6 +194,10 @@ public interface IMetadataConnection extends IMetadata {
     public String getContextName();
 
     public void setContextName(String contextName);
+    
+    public boolean isSupportNLS();
+    
+    public void setSupportNLS(boolean newSupportNLS);
 
     /**
      * Returns the value that you stored in the data collection by the key. Normally, it is like this key-value. For

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/IMetadataTable.java

@@ -71,6 +71,8 @@ public interface IMetadataTable {
     
     public boolean sameMetadataAs(IMetadataTable other, int options, boolean order);
 
+    public boolean sameMetadataAs(List<IMetadataColumn> otherMetadataTableColumns, int options, boolean order);
+
     public void sortCustomColumns();
 
     public boolean isReadOnly();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataTable.java

@@ -257,8 +257,13 @@ public class MetadataTable implements IMetadataTable, Cloneable {
         if (!(input instanceof IMetadataTable)) {
             return false;
         }
-        List<IMetadataColumn> thisColumnListWithUnselected = this.getListColumns(true);
         List<IMetadataColumn> inputColumnListWithUnselected = input.getListColumns(true);
+        return sameMetadataAs(inputColumnListWithUnselected, options, order);
+    }
+
+    @Override
+    public boolean sameMetadataAs(List<IMetadataColumn> inputColumnListWithUnselected, int options, boolean order) {
+        List<IMetadataColumn> thisColumnListWithUnselected = this.getListColumns(true);
         if (thisColumnListWithUnselected == null) {
             if (inputColumnListWithUnselected != null) {
                 return false;
@@ -300,9 +305,6 @@ public class MetadataTable implements IMetadataTable, Cloneable {
                 // no matter if this one is custom or not (all custom must be propagated too)
                 for (int i = 0; i < inputColumnListWithUnselected.size(); i++) {
                     IMetadataColumn inputColumn = inputColumnListWithUnselected.get(i);
-                    if(inputColumn.isCustom()) {
-                        continue;
-                    }
                     IMetadataColumn myColumn = this.getColumn(inputColumn.getLabel());
                     outputColumnsNotTested.remove(myColumn);
                     if (!inputColumn.sameMetacolumnAs(myColumn, options)) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataTalendType.java

@@ -16,6 +16,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -24,18 +25,20 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ProjectScope;
 import org.eclipse.core.runtime.CoreException;
@@ -46,9 +49,9 @@ import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.Bundle;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.SystemException;
+import org.talend.commons.runtime.xml.XmlUtil;
+import org.talend.commons.utils.io.FilesUtils;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.ICoreService;
 import org.talend.core.database.EDatabaseTypeName;
 import org.talend.core.language.ECodeLanguage;
 import org.talend.core.language.LanguageManager;
@@ -59,6 +62,8 @@ import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.repository.ProjectManager;
+import org.talend.repository.model.RepositoryConstants;
+import org.talend.utils.json.JSONObject;
 import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -75,14 +80,13 @@ import org.xml.sax.SAXException;
  */
 public final class MetadataTalendType {
 
-    /**
-     *
-     */
     public static final String INTERNAL_MAPPINGS_FOLDER = "mappings"; //$NON-NLS-1$
 
     public static final String PROJECT_MAPPING_FOLDER = ".settings/mappings"; //$NON-NLS-1$
 
-    public static final String UPDATED_MAPPING_FILES = "updated.mapping.files"; //$NON-NLS-1$
+    public static final String FILE_MAPPING_REVISION = "mapping_revision.json"; //$NON-NLS-1$
+
+    public static final String MAPPING_FILE_PATTERN = "^mapping_.*\\.xml$"; //$NON-NLS-1$
 
     private static ECodeLanguage codeLanguage;
 
@@ -459,13 +463,14 @@ public final class MetadataTalendType {
         return list;
     }
 
-    public static URL getSystemForderURLOfMappingsFile() throws SystemException {
+    public static URL getSystemFolderURLOfMappingsFile() throws SystemException {
         String dirPath = "/" + INTERNAL_MAPPINGS_FOLDER; //$NON-NLS-1$
         URL url = null;
         Path filePath = new Path(dirPath);
         Bundle b = Platform.getBundle(CoreRuntimePlugin.PLUGIN_ID);
         if (b != null) {
             try {
+                // Enumeration<URL> entries = b.findEntries(dirPath, "mapping_*.xml", false);
                 url = FileLocator.toFileURL(FileLocator.find(b, filePath, null));
             } catch (IOException e) {
                 throw new SystemException(e);
@@ -474,46 +479,169 @@ public final class MetadataTalendType {
         return url;
     }
 
-    public static URL getProjectForderURLOfMappingsFile() throws SystemException {
+    public static URL getProjectFolderURLOfMappingsFile() throws SystemException {
         try {
             String dirPath = "/" + INTERNAL_MAPPINGS_FOLDER; //$NON-NLS-1$
             IProject project = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject());
             IPath settingPath = new ProjectScope(project).getLocation();
-            IPath mappingPath = settingPath.append(dirPath);
-            File mappingFolder = mappingPath.toFile();
-            if (!mappingFolder.exists() || mappingFolder.listFiles().length < 1) {
-                ICoreService service = null;
-                if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
-                    service = GlobalServiceRegister.getDefault().getService(ICoreService.class);
-                    service.syncMappingsFileFromSystemToProject();
-                }
-            }
-            return mappingFolder.toURL();
+            File mappingFolder = settingPath.append(dirPath).toFile();
+            return mappingFolder.toURI().toURL();
         } catch (Exception e) {
             throw new SystemException(e);
         }
     }
 
-    private static String getSha1OfFile(File file) {
-        String sha1 = null;
-        FileInputStream fileInputStream = null;
+    public static URL getProjectTempMappingFolder() {
         try {
-            fileInputStream = new FileInputStream(file);
-            sha1 = DigestUtils.shaHex(fileInputStream);
+            IProject project = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject());
+            File folder = ResourceUtils
+                    .getFolder(project, RepositoryConstants.TEMP_DIRECTORY + "/" + INTERNAL_MAPPINGS_FOLDER, false).getLocation()
+                    .toFile();
+            syncMappingFiles(folder, false);
+            return folder.toURI().toURL();
         } catch (Exception e) {
             ExceptionHandler.process(e);
-        } finally {
-            if (fileInputStream != null) {
-                try {
-                    fileInputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace(); // Just print the exception for debug.
+            return null;
+        }
+    }
+
+    public static void syncMappingFiles(File target, boolean rename) {
+        if (!target.exists()) {
+            target.mkdir();
+        }
+        File[] arr = target.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
+        if (arr == null) {
+            arr = new File[0];
+        }
+        try {
+            Map<String, File> targetFileMap = Stream.of(arr).collect(Collectors.toMap(File::getName, Function.identity()));
+            Map<String, File> workingFileMap = getWorkingMappingFiles().stream()
+                    .collect(Collectors.toMap(f -> getTargetName(f, rename), Function.identity(), (f1, f2) -> f1));
+
+            targetFileMap.entrySet().stream().filter(entry -> !workingFileMap.containsKey(entry.getKey()))
+                    .forEach(entry -> entry.getValue().delete());
+
+            for (Entry<String, File> entry : workingFileMap.entrySet()) {
+                String targetName = entry.getKey();
+                File workingMappingFile = entry.getValue();
+                boolean needUpdate = false;
+                File targetMappingFile = targetFileMap.get(targetName);
+                if (targetMappingFile == null) {
+                    targetMappingFile = new File(target, targetName);
+                    needUpdate = true;
+                } else if (!getSha1OfFile(workingMappingFile).equals(getSha1OfFile(targetMappingFile))) {
+                    needUpdate = true;
+                }
+                if (needUpdate) {
+                    if (targetMappingFile.exists()) {
+                        targetMappingFile.delete();
+                    }
+                    FilesUtils.copyFile(workingMappingFile, targetMappingFile);
                 }
             }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
         }
-        return sha1;
+    }
+
+    public static String getTargetName(File file, boolean rename) {
+        String targetName = file.getName();
+        if (!rename) {
+            return targetName;
+        }
+        try {
+            DocumentBuilderFactory documentBuilderFactory = XmlUtils.getSecureDocumentBuilderFactory();
+            DocumentBuilder analyser = documentBuilderFactory.newDocumentBuilder();
+            Document document = analyser.parse(file);
+            NodeList dbmsNodes = document.getElementsByTagName("dbms"); //$NON-NLS-1$
+            String dbmsIdValue = "";
+            for (int iDbms = 0; iDbms < dbmsNodes.getLength(); iDbms++) {
+                Node dbmsNode = dbmsNodes.item(iDbms);
+                NamedNodeMap dbmsAttributes = dbmsNode.getAttributes();
+                dbmsIdValue = dbmsAttributes.getNamedItem("id").getNodeValue(); //$NON-NLS-1$
+
+            }
+            if (dbmsIdValue != null && !"".equals(dbmsIdValue)) {
+                final String[] fileNameSplit = targetName.split("_");
+                String idA = "_id";
+                String idB = "id_";
+                final int indexA = dbmsIdValue.indexOf(idA);
+                final int indexB = dbmsIdValue.indexOf(idB);
+                String secondeName = "";
+                if (indexA > 0) {
+                    secondeName = dbmsIdValue.substring(0, dbmsIdValue.length() - idA.length());
+                } else if (indexB == 0) {
+                    secondeName = dbmsIdValue.substring(idB.length(), dbmsIdValue.length());
+                } else if (indexA == -1 && indexB == -1) {
+                    secondeName = dbmsIdValue;
+                }
+                if (secondeName != null && !"".equals(secondeName)) {
+                    targetName = fileNameSplit[0] + "_" + secondeName.toLowerCase() + XmlUtil.FILE_XML_SUFFIX;
+                }
+
+            }
+        } catch (ParserConfigurationException e) {
+            ExceptionHandler.process(e);
+        } catch (SAXException e) {
+            ExceptionHandler.process(e);
+        } catch (IOException e) {
+            ExceptionHandler.process(e);
+        }
+        return targetName;
+    }
+
+    public static JSONObject getRevisionObject() {
+        try {
+            File revisonFile = new File(MetadataTalendType.getSystemFolderURLOfMappingsFile().getFile(),
+                    MetadataTalendType.FILE_MAPPING_REVISION);
+            String jsonStr = new String(Files.readAllBytes(revisonFile.toPath()));
+            return new JSONObject(jsonStr);
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return new JSONObject();
+    }
+
+    public static boolean restoreMappingFiles() throws Exception {
+        List<File> toDelete = new ArrayList<>();
+        JSONObject revision = getRevisionObject();
+        File projectMappingFolder = new File(getProjectFolderURLOfMappingsFile().getFile());
+        if (projectMappingFolder.exists()) {
+            File[] projectMappingFiles = projectMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
+            if (projectMappingFiles != null) {
+                for (File file : projectMappingFiles) {
+                    if (revision.has(file.getName())) {
+                        String sha1 = MetadataTalendType.getSha1OfFile(file);
+                        if (revision.getJSONObject(file.getName()).has(sha1)) {
+                            toDelete.add(file);
+                        }
+                    }
+                }
+            }
+            File xsd = new File(projectMappingFolder, "mapping_validate.xsd"); //$NON-NLS-1$
+            if (xsd.exists()) {
+                xsd.delete();
+            }
+        }
+        toDelete.forEach(File::delete);
+        return !toDelete.isEmpty();
+    }
+
+    public static String getSha1OfFile(File file) {
+        try {
+            String text = new String(Files.readAllBytes(file.toPath()));
+            return getSha1OfText(text);
+        } catch (IOException e) {
+            ExceptionHandler.process(e);
+        }
+        return null;
     }
     
+    public static String getSha1OfText(String text) {
+        text = text.replace("\r\n", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+        return DigestUtils.sha1Hex(text);
+    }
+
     public static void copyFile(File in, IFile out) throws CoreException, IOException {
         FileInputStream fis = new FileInputStream(in);
         if (out.exists()) {
@@ -524,49 +652,6 @@ public final class MetadataTalendType {
         fis.close();
     }
 
-    public static void syncNewMappingFileToProject() throws SystemException {
-        try {
-            File sysMappingFiles = new File(MetadataTalendType.getSystemForderURLOfMappingsFile().getPath());
-            IFolder projectMappingFolder = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject())
-                    .getFolder(MetadataTalendType.PROJECT_MAPPING_FOLDER);
-            File projectMappingFiles = new File(projectMappingFolder.getLocationURI());
-            if (!sysMappingFiles.exists() || !projectMappingFiles.exists()) {
-                return;
-            }
-            for (File sysMapping : sysMappingFiles.listFiles()) {
-                IFile projectMapping = projectMappingFolder.getFile(sysMapping.getName());
-                if (projectMapping.exists() && StringUtils.equals(sysMapping.getName(), "mapping_Greenplum.xml")) {
-
-                    String sha1OfFile = DigestUtils.shaHex(projectMapping.getContents());
-                    String shalOfOldSystem = "8431f19215dacb3caa126778ae695954552cce2a";
-                    if (StringUtils.equals(sha1OfFile, shalOfOldSystem)) {
-                        copyFile(sysMapping, projectMapping);
-                    }
-                }
-                if (!projectMapping.exists()) {
-                    FileInputStream fis = null;
-                    try {
-                        fis = new FileInputStream(sysMapping);
-                        projectMapping.create(fis, true, null);
-                    } catch (CoreException coreExc) {
-                        throw new SystemException(coreExc);
-                    } finally {
-                        if (fis != null) {
-                            try {
-                                fis.close();
-                            } catch (IOException ioExc) {
-                                throw new SystemException(ioExc);
-                            }
-                        }
-                    }
-                }
-            }
-
-        } catch (Exception e) {
-            throw new SystemException(e);
-        }
-    }
-
     /**
      *
      * Load db types and mapping with the current activated language (Java, Perl, ...).
@@ -574,20 +659,38 @@ public final class MetadataTalendType {
      * @throws SystemException
      */
     public static void loadCommonMappings() throws SystemException {
-        URL url = getProjectForderURLOfMappingsFile();
-        File dir = new File(url.getPath());
         metadataMappingFiles = new ArrayList<File>();
         dbmsSet.clear();
-        if (dir.isDirectory()) {
-            File[] files = dir.listFiles();
-            for (File file : files) {
-                if (file.getName().matches("^mapping_.*\\.xml$")) { //$NON-NLS-1$
-                    loadMapping(file);
-                    metadataMappingFiles.add(file);
-                }
-            }
+        for (File file : getWorkingMappingFiles()) {
+            loadMapping(file);
+            metadataMappingFiles.add(file);
         }
+    }
 
+    public static List<File> getWorkingMappingFiles() throws SystemException {
+        File projectMappingFolder = new File(getProjectFolderURLOfMappingsFile().getFile());
+        File[] projectMappingFiles = projectMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
+        File systemMappingFolder = new File(getSystemFolderURLOfMappingsFile().getFile());
+        File[] systemMappingFiles = systemMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
+        if (projectMappingFiles == null || projectMappingFiles.length == 0) {
+            return Arrays.asList(systemMappingFiles);
+        }
+        List<File> workingMappingFiles = new ArrayList<>();
+        Map<String, File> projectMappingFilesMap = Stream.of(projectMappingFiles)
+                .collect(Collectors.toMap(File::getName, Function.identity()));
+        workingMappingFiles.addAll(projectMappingFilesMap.values());
+        Stream.of(systemMappingFiles).filter(f -> !projectMappingFilesMap.containsKey(f.getName()))
+                .forEach(f -> workingMappingFiles.add(f));
+        return workingMappingFiles;
+    }
+
+    public static String getSha1OfSystemMappingFile(String fileName) {
+        try {
+            return getSha1OfFile(new File(getSystemFolderURLOfMappingsFile().getFile(), fileName));
+        } catch (SystemException e) {
+            ExceptionHandler.process(e);
+            return null;
+        }
     }
 
     private static void loadMapping(File file) throws SystemException {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/builder/ConvertionHelper.java

@@ -24,13 +24,13 @@ import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.emf.common.util.EMap;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.runtime.model.components.IComponentConstants;
 import org.talend.commons.utils.resource.FileExtensions;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.ICoreService;
 import org.talend.core.IRepositoryContextService;
 import org.talend.core.database.EDatabase4DriverClassName;
 import org.talend.core.database.EDatabaseTypeName;
+import org.talend.core.database.ERedshiftDriver;
 import org.talend.core.database.conn.ConnParameterKeys;
 import org.talend.core.database.conn.template.EDatabaseConnTemplate;
 import org.talend.core.model.metadata.Dbms;
@@ -54,6 +54,7 @@ import org.talend.core.model.metadata.builder.connection.SAPBWTable;
 import org.talend.core.prefs.SSLPreferenceConstants;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.utils.KeywordsValidator;
+import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.helper.SAPBWTableHelper;
 import org.talend.cwm.helper.TaggedValueHelper;
@@ -61,6 +62,10 @@ import org.talend.cwm.relational.RelationalFactory;
 import org.talend.model.bridge.ReponsitoryContextBridge;
 import org.talend.repository.model.IProxyRepositoryFactory;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import orgomg.cwm.objectmodel.core.TaggedValue;
 
 /**
@@ -223,8 +228,9 @@ public final class ConvertionHelper {
         } else {
             result.setDbType(connection.getDatabaseType());
         }
+        String dbVersionString = getDriverVersionString(connection);
         result.setDriverJarPath(connection.getDriverJarPath());
-        result.setDbVersionString(connection.getDbVersionString());
+        result.setDbVersionString(dbVersionString);
         result.setDriverClass(connection.getDriverClass());
         result.setFileFieldName(connection.getFileFieldName());
         result.setId(connection.getId());
@@ -254,6 +260,7 @@ public final class ConvertionHelper {
         result.setContentModel(connection.isContextMode());
         result.setContextId(sourceConnection.getContextId());
         result.setContextName(sourceConnection.getContextName());
+        result.setSupportNLS(sourceConnection.isSupportNLS());
         // handle oracle database connnection of general_jdbc.
         result.setSchema(getMeataConnectionSchema(result));
         convertOtherParameters(result, connection);
@@ -265,6 +272,23 @@ public final class ConvertionHelper {
 
     }
 
+    private static String getDriverVersionString(DatabaseConnection dbConn) {
+        String dbVersionString = dbConn.getDbVersionString();
+        if (EDatabaseTypeName.REDSHIFT.getDisplayName().equals(dbConn.getDatabaseType())
+                || EDatabaseTypeName.REDSHIFT_SSO.getDisplayName().equals(dbConn.getDatabaseType())) {
+            EMap<String, String> parameters = dbConn.getParameters();
+            if (parameters != null) {
+                String driverString = parameters.get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_DRIVER);
+                if (StringUtils.isNotBlank(driverString)) {
+                    dbVersionString = driverString;
+                } else {
+                    dbVersionString = ERedshiftDriver.DRIVER_V1.name();
+                }
+            }
+        }
+        return dbVersionString;
+    }
+
     /**
      * Copies other parameters from <code>DatabaseConnection</code> to <code>IMetadataConnection</code>. Added by Marvin
      * Wang on Aug.8, 2012.
@@ -705,6 +729,26 @@ public final class ConvertionHelper {
                             origValueConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_SSL_KEY_STORE_PASSWORD), false));
                 }
             }
+        } else if (EDatabaseTypeName.REDSHIFT.getDisplayName().equals(origValueConn.getDatabaseType())
+                || EDatabaseTypeName.REDSHIFT_SSO.getDisplayName().equals(origValueConn.getDatabaseType())) {
+            Properties info = new Properties();
+            EMap<String, String> parameters = origValueConn.getParameters();
+            if (parameters != null
+                    && ERedshiftDriver.DRIVER_V2.name().equals(parameters.get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_DRIVER))
+                    && !Boolean.valueOf(parameters.get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_STRINGPARA))) {
+                additionParamStr = "";
+                String tableValue = parameters.get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_PARATABLE);
+                if (StringUtils.isNotBlank(tableValue)) {
+                    List<Map<String, Object>> entryProperties = getEntryProperties(tableValue);
+                    for (Map<String, Object> entryMap : entryProperties) {
+                        String key = TalendQuoteUtils.removeQuotes(String.valueOf(entryMap.get("KEY")));
+                        if (StringUtils.isNotBlank(key)) {
+                            String value = TalendQuoteUtils.removeQuotes(String.valueOf(entryMap.get("VALUE")));
+                            updateAdditionParam(sgb, info, key, value);
+                        }
+                    }
+                }
+            }
         }
         return additionParamStr + sgb.toString();
     }
@@ -714,4 +758,27 @@ public final class ConvertionHelper {
             sgb.append("&").append(key).append("=").append(value);//$NON-NLS-1$ //$NON-NLS-2$
         }
     }
+
+    public static List<Map<String, Object>> getEntryProperties(String paramString) {
+        List<Map<String, Object>> tableProperties = new ArrayList<Map<String, Object>>();
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            tableProperties = objectMapper.readValue(paramString, new TypeReference<List<Map<String, Object>>>() {
+            });
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        return tableProperties;
+    }
+
+    public static String getEntryPropertiesString(List<Map<String, Object>> entryProperties) {
+        String entryString = "";
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            entryString = objectMapper.writeValueAsString(entryProperties);
+        } catch (JsonProcessingException e) {
+            ExceptionHandler.process(e);
+        }
+        return entryString;
+    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/builder/MetadataConnection.java

@@ -113,6 +113,7 @@ public class MetadataConnection implements IMetadataConnection {
 
     private String contextName;
 
+    private boolean supportNLS = false;
     // ~
 
     private String comment;
@@ -729,6 +730,14 @@ public class MetadataConnection implements IMetadataConnection {
     public void setContextName(String contextName) {
         this.contextName = contextName;
     }
+    
+    public boolean isSupportNLS() {
+        return supportNLS;
+    }
+    
+    public void setSupportNLS(boolean supportNLS) {
+        this.supportNLS = supportNLS;
+    }
 
     /*
      * (non-Javadoc)

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/ComponentToRepositoryProperty.java

@@ -489,6 +489,11 @@ public class ComponentToRepositoryProperty {
             }
         }
 
+        else if (EDatabaseTypeName.REDSHIFT_SSO.getDbType().equals((String) parameter.getValue())) {
+            connection.setProductId(EDatabaseTypeName.REDSHIFT_SSO.getProduct());
+            connection.setDatabaseType(EDatabaseTypeName.REDSHIFT_SSO.getDisplayName());
+        }
+
         // NeTezza
         else if (EDatabaseTypeName.NETEZZA.getProduct().equalsIgnoreCase((String) parameter.getValue())) {
             connection.setDatabaseType(EDatabaseTypeName.NETEZZA.getDisplayName());
@@ -664,6 +669,26 @@ public class ComponentToRepositoryProperty {
                 connection.setAdditionalParams(value);
             }
         }
+        if ("USE_STRING_PROPERTIES".equals(param.getRepositoryValue())) {
+            String value = getParameterValue(connection, node, param);
+            if (value != null) {
+                connection.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_STRINGPARA, value);
+            }
+        }
+        if ("DRIVER_VERSION".equals(param.getRepositoryValue())) {
+            String value = getParameterValue(connection, node, param);
+            if (value != null) {
+                connection.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_DRIVER, value);
+            }
+        }
+        if ("ENTRY_PROPERTIES".equals(param.getRepositoryValue())) {
+            Object value = param.getValue();
+            if (value instanceof List) {
+                List<Map<String, Object>> entryProperties = (List<Map<String, Object>>) value;
+                connection.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_PARATABLE,
+                        ConvertionHelper.getEntryPropertiesString(entryProperties));
+            }
+        }
         if ("FILE".equals(param.getRepositoryValue())) { //$NON-NLS-1$
             String value = getParameterValue(connection, node, param);
             if (value != null) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java

@@ -29,6 +29,7 @@ import org.talend.commons.ui.utils.PathUtils;
 import org.talend.components.api.properties.ComponentProperties;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.database.EDatabaseTypeName;
+import org.talend.core.database.ERedshiftDriver;
 import org.talend.core.database.conn.ConnParameterKeys;
 import org.talend.core.database.conn.template.EDatabaseConnTemplate;
 import org.talend.core.database.conn.version.EDatabaseVersion4Drivers;
@@ -43,6 +44,7 @@ import org.talend.core.model.metadata.MappingType;
 import org.talend.core.model.metadata.MetadataTalendType;
 import org.talend.core.model.metadata.MetadataToolHelper;
 import org.talend.core.model.metadata.MultiSchemasUtil;
+import org.talend.core.model.metadata.builder.ConvertionHelper;
 import org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty;
 import org.talend.core.model.metadata.builder.connection.BRMSConnection;
 import org.talend.core.model.metadata.builder.connection.Concept;
@@ -1039,6 +1041,26 @@ public class RepositoryToComponentProperty {
         if (value.equals("PROPERTIES_STRING")) { //$NON-NLS-1$
             return getAppropriateValue(connection, connection.getAdditionalParams());
         }
+        if (value.equals("USE_STRING_PROPERTIES")) {
+            return Boolean.valueOf(connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_STRINGPARA));
+        }
+        if (value.equals("ENTRY_PROPERTIES")) {
+            List<Map<String, Object>> tableProperties = new ArrayList<Map<String, Object>>();
+            String propertiesInfo = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_PARATABLE);
+            if (org.apache.commons.lang.StringUtils.isNotBlank(propertiesInfo)) {
+                tableProperties = ConvertionHelper
+                        .getEntryProperties(connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_PARATABLE));
+            }
+            return tableProperties;
+        }
+        if (value.equals("DRIVER_VERSION")) {
+            String driverVersion = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_DRIVER);
+            if (org.apache.commons.lang.StringUtils.isBlank(driverVersion)) {
+                driverVersion = ERedshiftDriver.DRIVER_V1.name();
+            }
+            return driverVersion;
+        }
+
         if (value.equals("DRIVER")) { //$NON-NLS-1$
             String dbVersionString = connection.getDbVersionString();
             if (dbVersionString != null && EDatabaseConnTemplate.MSSQL.getDBDisplayName().equals(databaseType)) {
@@ -1228,6 +1250,11 @@ public class RepositoryToComponentProperty {
             return value2;
 
         }
+        
+        if(value.equals("SUPPORT_NLS")) {
+            return connection.isSupportNLS();
+        }
+        
         if (value.equals("CDC_TYPE_MODE")) { //$NON-NLS-1$
             return new Boolean(CDCTypeMode.LOG_MODE.getName().equals(connection.getCdcTypeMode()));
         }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ElementParameterParser.java

@@ -24,6 +24,7 @@ import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.utils.PasswordEncryptUtil;
 import org.talend.commons.utils.generation.CodeGenerationUtils;
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.language.ECodeLanguage;
 import org.talend.core.language.LanguageManager;
 import org.talend.core.model.metadata.types.JavaType;
@@ -37,6 +38,7 @@ import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.utils.JavaResourcesHelper;
 import org.talend.core.model.utils.SQLPatternUtils;
 import org.talend.core.runtime.CoreRuntimePlugin;
+import org.talend.core.service.IDesignerXMLMapperService;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
 import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
@@ -293,8 +295,7 @@ public final class ElementParameterParser {
 
         List<IElementParameter> params = (List<IElementParameter>) element.getElementParametersWithChildrens();
         if (params != null && !params.isEmpty()) {
-            for (int i = 0; i < params.size(); i++) {
-                IElementParameter param = params.get(i);
+            for (IElementParameter param : params) {
                 if (text.indexOf(param.getVariableName()) != -1
                         || (param.getVariableName() != null && param.getVariableName().contains(text))) {
                     if (param.getFieldType() == EParameterFieldType.TABLE) {
@@ -422,8 +423,8 @@ public final class ElementParameterParser {
         }
         IElementParameter param;
 
-        for (int i = 0; i < element.getElementParameters().size(); i++) {
-            param = element.getElementParameters().get(i);
+        for (IElementParameter element2 : element.getElementParameters()) {
+            param = element2;
             if (text.indexOf(param.getVariableName()) != -1) {
                 if (param.getFieldType() == EParameterFieldType.TABLE) {
                     return createTableValuesXML((List<Map<String, Object>>) param.getValue(), param);
@@ -483,7 +484,21 @@ public final class ElementParameterParser {
         if (element instanceof INode) {
             INode node = (INode) element;
             if (node.getExternalNode() != null) {
-                return EcoreUtil.copy(node.getExternalNode().getExternalEmfData());
+                Object obj = null;
+                if (node.isVirtualGenerateNode()) {
+                    if (GlobalServiceRegister.getDefault().isServiceRegistered(IDesignerXMLMapperService.class)) {
+                        final IDesignerXMLMapperService service = GlobalServiceRegister.getDefault()
+                                .getService(IDesignerXMLMapperService.class);
+                        if (service != null) {
+                            obj = service.rebuildXmlMapData(node.getExternalNode());
+                        }
+                    }
+                }
+                if (obj != null) {
+                    return obj;
+                } else {
+                    return EcoreUtil.copy(node.getExternalNode().getExternalEmfData());
+                }
             }
         }
         return null;
@@ -496,8 +511,8 @@ public final class ElementParameterParser {
         }
         IElementParameter param;
         newText = text;
-        for (int i = 0; i < element.getElementParameters().size(); i++) {
-            param = element.getElementParameters().get(i);
+        for (IElementParameter element2 : element.getElementParameters()) {
+            param = element2;
             if (newText.contains(param.getVariableName())) {
                 String value = getDisplayValue(param);
                 newText = newText.replace(param.getVariableName(), value);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ElementParameterValueModel.java

@@ -0,0 +1,86 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.model.process;
+
+import java.util.Objects;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class ElementParameterValueModel {
+
+    private String label;
+
+    private String value;
+
+    /**
+     * Getter for lebel.
+     * 
+     * @return the lebel
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Sets the lebel.
+     * 
+     * @param lebel the lebel to set
+     */
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    /**
+     * Getter for value.
+     * 
+     * @return the value
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value.
+     * 
+     * @param value the value to set
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return StringUtils.isNotBlank(this.label) ? this.label : this.value;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(label, value);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        ElementParameterValueModel other = (ElementParameterValueModel) obj;
+        return Objects.equals(label, other.label) && Objects.equals(value, other.value);
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/IProcess.java

@@ -58,6 +58,11 @@ public interface IProcess extends IElement {
 
     public static final String SCREEN_OFFSET_Y = "SCREEN_OFFSET_Y"; //$NON-NLS-1$
 
+    public static final String PROP_ERR_ON_COMPONENT_MISSING = "error.on.component.missing";
+
+    public static final boolean ERR_ON_COMPONENT_MISSING = Boolean
+            .valueOf(System.getProperty(PROP_ERR_ON_COMPONENT_MISSING, Boolean.TRUE.toString()));
+
     public String getName();
 
     public String getId();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ProcessUtils.java

@@ -1086,6 +1086,18 @@ public final class ProcessUtils {
                     }
                 }
             }
+            if ("cHttp".equals(node.getComponentName())) {
+                for (Object elementParameter : node.getElementParameter()) {
+                    ElementParameterType elementParameterType = (ElementParameterType)elementParameter;
+
+                    String name = elementParameterType.getName();
+                    String value = elementParameterType.getValue();
+
+                    if ("SERVER".equals(name) && (value != null && "true".equals(value.toString()))) {
+                        return true;
+                    }
+                }
+            }
         }
 
         return false;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/relationship/AbstractJobParameterInRepositoryRelationshipHandler.java

@@ -37,7 +37,7 @@ public abstract class AbstractJobParameterInRepositoryRelationshipHandler extend
         Set<Relation> relationSet = new HashSet<Relation>();
 
         for (ElementParameterType paramType : parametersMap.values()) {
-            if (paramType.getName().endsWith(":" + getRepositoryTypeName())) { //$NON-NLS-1$
+            if (paramType.getName() != null && paramType.getName().endsWith(":" + getRepositoryTypeName())) { //$NON-NLS-1$
                 String name = paramType.getName().split(":")[0]; //$NON-NLS-1$
                 ElementParameterType repositoryTypeParam = parametersMap.get(name + ":" //$NON-NLS-1$
                         + getRepositoryTypeName());

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/ERepositoryObjectType.java

@@ -571,8 +571,11 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
      */
     public final static ERepositoryObjectType PROCESS_SPARKSTREAMING = ERepositoryObjectType.valueOf("PROCESS_SPARKSTREAMING");
 
-    public final static ERepositoryObjectType METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT = ERepositoryObjectType
-            .valueOf("METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT"); //$NON-NLS-1$
+    public final static ERepositoryObjectType METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT_INPUT = ERepositoryObjectType
+            .valueOf("METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT_INPUT"); //$NON-NLS-1$
+
+    public final static ERepositoryObjectType METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT_OUTPUT = ERepositoryObjectType
+            .valueOf("METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT_OUTPUT"); //$NON-NLS-1$
 
     public final static ERepositoryObjectType METADATA_SAP_BW_DATASOURCE = ERepositoryObjectType
             .valueOf("METADATA_SAP_BW_DATASOURCE"); //$NON-NLS-1$
@@ -919,7 +922,7 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
         } else if (type.getType().equals("TEST_CONTAINER")) {
             return "test case";
         } else if (GlobalServiceRegister.getDefault().isServiceRegistered(ICamelDesignerCoreService.class)) {
-            ICamelDesignerCoreService camelService = (ICamelDesignerCoreService) GlobalServiceRegister.getDefault()
+            ICamelDesignerCoreService camelService = GlobalServiceRegister.getDefault()
                     .getService(ICamelDesignerCoreService.class);
             String deleteFolderName = camelService.getDeleteFolderName(type);
             if (deleteFolderName != null) {
@@ -1465,7 +1468,7 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
             allTypes.add(ERepositoryObjectType.SPARK_STREAMING_JOBLET);
         }
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
-            IESBService esbService = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
+            IESBService esbService = GlobalServiceRegister.getDefault().getService(IESBService.class);
             ERepositoryObjectType serviceType = esbService.getServicesType();
             if (serviceType != null) {
                 allTypes.add(serviceType);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/IStudioUpdateConfig.java

@@ -0,0 +1,52 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.model.update;
+
+import java.util.Date;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public interface IStudioUpdateConfig {
+
+    Boolean isEnabled();
+
+    IStudioUpdate getStudioUpdate();
+
+    public interface IStudioUpdate {
+
+        String getName();
+
+        String getStudioVersion();
+
+        Date getReleaseDate();
+
+        Date getApprovedDate();
+
+        String getInfoUrl();
+
+        String getBaseUrl();
+
+        String getUpdateUrl();
+
+        String getApprovedBy();
+
+        String getApprovedName();
+
+        String getProjectId();
+
+        Boolean isCustom();
+
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/RepositoryUpdateManager.java

@@ -359,7 +359,9 @@ public abstract class RepositoryUpdateManager {
             List<UpdateResult> checkedResults = null;
 
             if (parameter == null) { // update all job
-                checkedResults = filterSpecialCheckedResult(results);
+                // TUP-36519: comment out the filter for only opening job
+                // checkedResults = filterSpecialCheckedResult(results);
+                checkedResults = results;
             } else { // filter
                 checkedResults = filterCheckedResult(results);
             }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/StudioUpdateConfig.java

@@ -0,0 +1,169 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.model.update;
+
+import java.util.Date;
+
+/**
+ * DOC cmeng  class global comment. Detailled comment
+ */
+public class StudioUpdateConfig implements IStudioUpdateConfig {
+
+    private Boolean enabled;
+
+    private IStudioUpdate studioUpdate;
+
+    @Override
+    public Boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(Boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    @Override
+    public IStudioUpdate getStudioUpdate() {
+        return studioUpdate;
+    }
+
+    public void setStudioUpdate(IStudioUpdate studioUpdate) {
+        this.studioUpdate = studioUpdate;
+    }
+
+    public static class StudioUpdate implements IStudioUpdate {
+
+        private String name;
+
+        private String studioVersion;
+
+        private String updateUrl;
+
+        private Date releaseDate;
+
+        private String infoUrl;
+
+        private String baseUrl;
+
+        private String approvedBy;
+
+        private String approvedName;
+
+        private Date approvedDate;
+
+        private String projectId;
+
+        private Boolean custom;
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String getStudioVersion() {
+            return studioVersion;
+        }
+
+        public void setStudioVersion(String studioVersion) {
+            this.studioVersion = studioVersion;
+        }
+
+        @Override
+        public String getUpdateUrl() {
+            return updateUrl;
+        }
+
+        public void setUpdateUrl(String updateUrl) {
+            this.updateUrl = updateUrl;
+        }
+
+        @Override
+        public Date getReleaseDate() {
+            return releaseDate;
+        }
+
+        public void setReleaseDate(Date releaseDate) {
+            this.releaseDate = releaseDate;
+        }
+
+        @Override
+        public String getInfoUrl() {
+            return infoUrl;
+        }
+
+        public void setInfoUrl(String infoUrl) {
+            this.infoUrl = infoUrl;
+        }
+
+        @Override
+        public String getBaseUrl() {
+            return baseUrl;
+        }
+
+        public void setBaseUrl(String baseUrl) {
+            this.baseUrl = baseUrl;
+        }
+
+        @Override
+        public String getApprovedBy() {
+            return approvedBy;
+        }
+
+        public void setApprovedBy(String approvedBy) {
+            this.approvedBy = approvedBy;
+        }
+
+        @Override
+        public String getApprovedName() {
+            return approvedName;
+        }
+
+        public void setApprovedName(String approvedName) {
+            this.approvedName = approvedName;
+        }
+
+        @Override
+        public Date getApprovedDate() {
+            return approvedDate;
+        }
+
+        public void setApprovedDate(Date approvedDate) {
+            this.approvedDate = approvedDate;
+        }
+
+        @Override
+        public String getProjectId() {
+            return projectId;
+        }
+
+        public void setProjectId(String projectId) {
+            this.projectId = projectId;
+        }
+
+        @Override
+        public Boolean isCustom() {
+            return custom;
+        }
+
+        public void setCustom(Boolean custom) {
+            this.custom = custom;
+        }
+
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/TalendLibsServerManager.java

@@ -27,6 +27,7 @@ import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
 import org.talend.core.service.IRemoteService;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.RepositoryConstants;
+import org.talend.utils.security.StudioEncryption;
 
 /**
  * created by wchen on 2015年6月16日 Detailled comment
@@ -255,7 +256,7 @@ public class TalendLibsServerManager {
             if (enableProxyFlag) {
                 serverBean.setServer(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_URL));
                 serverBean.setUserName(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_USERNAME));
-                serverBean.setPassword(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_PASSWORD));
+                serverBean.setPassword(StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM).decrypt(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_PASSWORD)));
                 serverBean.setRepositoryId(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_REPOSITORY_ID));
                 serverBean.setType(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_TYPE));
             }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoItemSignatureUtil.java

@@ -0,0 +1,161 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.commons.lang.StringUtils;
+import org.eclipse.emf.common.util.EMap;
+import org.talend.commons.utils.VersionUtils;
+import org.talend.core.model.general.Project;
+import org.talend.core.model.properties.Property;
+import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
+import org.talend.core.runtime.util.EmfResourceUtil;
+import org.talend.repository.ProjectManager;
+import org.talend.utils.security.CryptoMigrationUtil;
+import org.talend.utils.security.StudioEncryption;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoItemSignatureUtil {
+
+    public static final String MIGRATION_TOKEN_KEY = "force_import_unsupported_job";
+
+    public static final String REPOSITORY_PLUGIN_ID = "org.talend.repository";
+
+    public static final String PROJ_DATE_ID = "repository.project.id";
+
+    public static final String PROD_DATE_ID = "product.date.id";
+
+    public static String getCurrentProjectCreateDate() {
+        Project currentProject = ProjectManager.getInstance().getCurrentProject();
+        if (currentProject != null) {
+            ProjectPreferenceManager projectPrefManager = new ProjectPreferenceManager(
+                    PendoItemSignatureUtil.REPOSITORY_PLUGIN_ID, false);
+            String projDate = projectPrefManager.getValue(PendoItemSignatureUtil.PROJ_DATE_ID);
+            if (StringUtils.isNotBlank(projDate)) {
+                String decrypt = null;
+                if (StudioEncryption.hasEncryptionSymbol(projDate)) {
+                    decrypt = StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.MIGRATION_TOKEN)
+                            .decrypt(projDate);
+                } else {
+                    decrypt = CryptoMigrationUtil.decrypt(projDate);
+                }
+                return decrypt;
+            }
+        }
+        return null;
+    }
+
+    public static String getStudioVersion() {
+        String studioVersion = VersionUtils.getDisplayVersion();
+        String patchInstalledVersion = PendoTrackDataUtil.getLatestPatchInstalledVersion();
+        if (StringUtils.isNotBlank(patchInstalledVersion)) {
+            studioVersion = patchInstalledVersion;
+        }
+        return studioVersion;
+    }
+
+    public static String getItemProductVersion(Property property) {
+        String productVersion = null;
+        EMap additionalProperties = property.getAdditionalProperties();
+        if (additionalProperties.get("modified_product_version") != null) {
+            productVersion = additionalProperties.get("modified_product_version").toString();
+        } else if (additionalProperties.get("created_product_version") != null) {
+            productVersion = additionalProperties.get("created_product_version").toString();
+        }
+        if (StringUtils.isNotBlank(productVersion)) {
+            productVersion = VersionUtils.getTalendPureVersion(productVersion);
+        }
+        return productVersion;
+    }
+
+    public static String getItemProductName(Property property) {
+        String productName = null;
+        EMap additionalProperties = property.getAdditionalProperties();
+        if (additionalProperties.get("modified_product_fullname") != null) {
+            productName = additionalProperties.get("modified_product_fullname").toString();
+        } else if (additionalProperties.get("created_product_fullname") != null) {
+            productName = additionalProperties.get("created_product_fullname").toString();
+        }
+        return productName;
+    }
+
+    public static String formatDate(String dateString, String pattern) {
+        String formattedDate = "";
+        if (StringUtils.isNotBlank(dateString)) {
+            Date date = new Date(Long.parseLong(dateString));
+            SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+            formattedDate = sdf.format(date);
+        }
+        return formattedDate;
+    }
+
+    public interface SignatureStatus {
+
+        public static final int V_VALID = 0;
+
+        public static final int V_INVALID = EmfResourceUtil.V_INVALID << 0;
+
+        public static final int V_UNSIGNED = V_INVALID << 1;
+    }
+
+    public enum TOSProdNameEnum {
+
+        TOS_DI("Talend Open Studio for Data Integration"),
+        TOS_BD("Talend Open Studio for Big Data"),
+        TOS_ESB("Talend Open Studio for ESB"),
+        TOS_TOP("Talend Open Studio for Data Quality");
+
+        private String prodName;
+
+        TOSProdNameEnum(String prodName) {
+            this.prodName = prodName;
+        }
+
+        public String getProdName() {
+            return prodName;
+        }
+
+        public static String getTOSCategoryByProdName(String prodName) {
+            String category = null;
+            for (TOSProdNameEnum tosProdNameEnum : TOSProdNameEnum.values()) {
+                if (tosProdNameEnum.getProdName().equals(prodName)) {
+                    category = tosProdNameEnum.name();
+                    break;
+                }
+            }
+            return category;
+        }
+
+    }
+
+    public enum ValueEnum {
+
+        YES("Y"),
+        NO("N"),
+        NOT_APPLICATE("N/A");
+
+        private String displayValue;
+
+        ValueEnum(String displayValue) {
+            this.displayValue = displayValue;
+        }
+
+        public String getDisplayValue() {
+            return displayValue;
+        }
+    }
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackDataUtil.java

@@ -0,0 +1,191 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.utils.VersionUtils;
+import org.talend.core.model.general.Project;
+import org.talend.core.model.properties.ProjectReference;
+import org.talend.core.pendo.properties.IPendoDataProperties;
+import org.talend.core.pendo.properties.PendoLoginProperties;
+import org.talend.core.service.ICloudSignOnService;
+import org.talend.core.service.IStudioLiteP2Service;
+import org.talend.core.ui.IInstalledPatchService;
+import org.talend.repository.ProjectManager;
+import org.talend.utils.json.JSONObject;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoTrackDataUtil {
+
+    private static final String FEATURE_PREFIX = "org.talend.lite.";
+
+    private static final String FEATURE_TAIL = ".feature.feature.group";
+
+    public static String generateTrackData(String pendoInfo, TrackEvent event, IPendoDataProperties properties) throws Exception {
+        JSONObject infoJson = new JSONObject(pendoInfo);
+        String visitorId = ((JSONObject) infoJson.get("visitor")).getString("id");
+        String accountId = ((JSONObject) infoJson.get("account")).getString("id");
+
+        PendoEventEntity entity = new PendoEventEntity();
+        entity.setType("track");
+        entity.setEvent(event.getEvent());
+        entity.setVisitorId(visitorId);
+        entity.setAccountId(accountId);
+        entity.setTimestamp(new Date().getTime());
+        entity.setProperties(properties);
+
+        ObjectMapper mapper = new ObjectMapper();
+        String content = mapper.writeValueAsString(entity);
+        return content;
+    }
+
+    public static IPendoDataProperties getLoginEventProperties() {
+        String studioPatch = getLatestPatchInstalledVersion();
+        PendoLoginProperties loginEvent = new PendoLoginProperties();
+        IStudioLiteP2Service studioLiteP2Service = IStudioLiteP2Service.get();
+        try {
+            if (studioLiteP2Service != null) {
+                List<String> enabledFeatures = new ArrayList<String>();
+                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);
+                });
+                loginEvent.setEnabledFeatures(enabledFeatures);
+            }
+            setUpRefProjectsStructure(loginEvent);
+            loginEvent.setIsOneClickLogin(Boolean.FALSE.toString());
+            if (ICloudSignOnService.get() != null && ICloudSignOnService.get().isSignViaCloud()) {
+                loginEvent.setIsOneClickLogin(Boolean.TRUE.toString());
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+        loginEvent.setStudioVersion(VersionUtils.getInternalMajorVersion());
+        loginEvent.setStudioPatch(studioPatch);
+        return loginEvent;
+    }
+
+    public static String getLatestPatchInstalledVersion() {
+        String studioPatch = "";
+        IInstalledPatchService installedPatchService = IInstalledPatchService.get();
+        if (installedPatchService != null) {
+            studioPatch = installedPatchService.getLatestInstalledVersion(true);
+        }
+        return studioPatch;
+    }
+
+    private static void setUpRefProjectsStructure(PendoLoginProperties loginEvent) {
+        ProjectManager projectManager = ProjectManager.getInstance();
+        Project currentProject = projectManager.getCurrentProject();
+        Map<String, Project> teclabelProjectMap = new HashMap<String, Project>();
+        List<Project> allReferencedProjects = projectManager.getAllReferencedProjects();
+        allReferencedProjects.forEach(refProject -> {
+            String technicalLabel = refProject.getTechnicalLabel();
+            if (StringUtils.isNotBlank(technicalLabel)) {
+                teclabelProjectMap.put(technicalLabel, refProject);
+            }
+        });
+
+        int[] refCount = new int[] {0};
+        List<String> resultList = new ArrayList<String>();
+        Map<String, String> desensitiveLabelMap = new HashMap<String, String>();
+        findReferencePorjectPath(currentProject, "Main", resultList, refCount, desensitiveLabelMap, teclabelProjectMap);
+        loginEvent.setRefProjectList(resultList);
+        loginEvent.setRefProjectCount(String.valueOf(desensitiveLabelMap.keySet().size()));
+    }
+
+    public static void findReferencePorjectPath(Project currentProject, String path, List<String> resultList, int[] refCount,
+            Map<String, String> desensitiveLabelMap, Map<String, Project> teclabelProjectMap) {
+        List<ProjectReference> projectReferenceList = currentProject.getProjectReferenceList();
+        for (ProjectReference projectReference : projectReferenceList) {
+            String structPath = path;
+            if (projectReference.getReferencedProject() == null) {
+                continue;
+            }
+            String technicalLabel = projectReference.getReferencedProject().getTechnicalLabel();
+            Project refProject = teclabelProjectMap.get(technicalLabel);
+            if (StringUtils.isBlank(technicalLabel) || refProject == null) {
+                continue;
+            }
+            String desensitiveLabel = desensitiveLabelMap.get(technicalLabel);
+            if (StringUtils.isBlank(desensitiveLabel)) {
+                refCount[0] = refCount[0] + 1;
+                desensitiveLabel = "Ref" + refCount[0];
+                desensitiveLabelMap.put(technicalLabel, desensitiveLabel);
+            }
+            structPath = structPath + "/" + desensitiveLabel;
+            resultList.add(structPath);
+            findReferencePorjectPath(refProject, structPath, resultList, refCount, desensitiveLabelMap, teclabelProjectMap);
+        }
+
+    }
+
+    public static String convertEntityJsonString(Object entity) {
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+            String content = mapper.writeValueAsString(entity);
+            if (StringUtils.isNotBlank(content)) {
+                return content;
+            }
+        } catch (JsonProcessingException e) {
+            ExceptionHandler.process(e);
+        }
+        return "";
+    }
+
+    public enum TrackEvent {
+
+        PROJECT_LOGIN("Project Login"),
+        IMPORT_API_DEF("Import API Definition"),
+        UPDATE_API_DEF("Update API Definition"),
+        USE_API_DEF("Use API Definition"),
+        OPEN_IN_APIDesigner("Open in API Designer"),
+        OPEN_IN_APITester("Open in API Tester"),
+        OPEN_API_DOCUMENTATION("Open API Documentation"),
+        AUTOMAP("tMap Automap"),
+        TMAP("tMap"),
+        ITEM_IMPORT("Import items"),
+        ITEM_SIGNATURE("Item Signature");
+
+        private String event;
+
+        TrackEvent(String event) {
+            this.event = event;
+        }
+
+        public String getEvent() {
+            return event;
+        }
+
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/PendoTrackSender.java

@@ -17,9 +17,6 @@ import java.net.MalformedURLException;
 import java.net.URI;
 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;
 
@@ -40,27 +37,28 @@ 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.IProxySelectorProvider;
 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.nexus.HttpClientTransport;
+import org.talend.core.pendo.PendoTrackDataUtil.TrackEvent;
+import org.talend.core.pendo.properties.IPendoDataProperties;
 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 {
     
+    public static final String PROP_PENDO_LOCAL_CHECK = "talend.pendo.localDebug";
+
+    public static final String PROP_PENDO_LOG_DATA = "talend.pendo.logRuntimeData";
+
     private static final String PREFIX_API = "api";
 
     private static final String PENDO_INFO = "/monitoring/pendo/info";
@@ -73,20 +71,26 @@ public class PendoTrackSender {
 
     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();
+    private static String pendoInfo;
+
+    private PendoTrackSender() {
+    }
+
+    static {
+        instance = new PendoTrackSender();
+        RepositoryContext repositoryContext = getRepositoryContext();
+        if (repositoryContext != null) {
+            adminUrl = repositoryContext.getFields().get(RepositoryConstants.REPOSITORY_URL);
         }
+    }
+
+    public static PendoTrackSender getInstance() {
         if (StringUtils.isBlank(adminUrl)) {
             RepositoryContext repositoryContext = getRepositoryContext();
             if (repositoryContext != null) {
@@ -96,13 +100,15 @@ public class PendoTrackSender {
         return instance;
     }
 
-    public void sendToPendo() {
+    public void sendToPendo(TrackEvent event, IPendoDataProperties properties) {
         Job job = new Job("send pendo track") {
 
             @Override
             protected IStatus run(IProgressMonitor monitor) {
                 try {
-                    sendTrackData();
+                    if (isTrackSendAvailable()) {
+                        sendTrackData(event, properties);
+                    }
                 } catch (Exception e) {
                     // warning only
                     ExceptionHandler.process(e, Level.WARN);
@@ -115,11 +121,11 @@ public class PendoTrackSender {
         job.schedule();
     }
 
-    public void sendTrackData() throws Exception {
-        if (!checkTokenUsed(adminUrl) || !NetworkUtil.isNetworkValid()) {
+    public void sendTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception {
+        if (isPendoLocalDebug()) {
+            ExceptionHandler.log(event.getEvent() + ":" + PendoTrackDataUtil.convertEntityJsonString(properties));
             return;
         }
-
         DefaultHttpClient client = null;
         CloseableHttpResponse response = null;
         IProxySelectorProvider proxySelectorProvider = null;
@@ -142,12 +148,16 @@ public class PendoTrackSender {
             proxySelectorProvider = HttpClientTransport.addProxy(client, new URI(url));
 
             EntityBuilder entityBuilder = EntityBuilder.create();
-            entityBuilder.setText(generateTrackData(pendoInfo)).setContentType(ContentType.APPLICATION_JSON);
+            String trackData = PendoTrackDataUtil.generateTrackData(pendoInfo, event, properties);
+            entityBuilder.setText(trackData).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 (isLogPendoData()) {
+                ExceptionHandler.log(trackData);
+            }
             if (HttpURLConnection.HTTP_OK != statusLine.getStatusCode()) {
                 throw new Exception(statusLine.toString() + ", server message: [" + responseStr + "]");
             }
@@ -171,53 +181,26 @@ public class PendoTrackSender {
         }
     }
 
-    // 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();
+    public boolean isTrackSendAvailable() throws Exception {
+        if (isPendoLocalDebug() || checkTokenUsed(adminUrl) && NetworkUtil.isNetworkValid()) {
+            return true;
         }
-        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);
+        return false;
+    }
 
-        PendoEventEntity entity = new PendoEventEntity();
-        entity.setType("track");
-        entity.setEvent("Project Login");
-        entity.setVisitorId(visitorId);
-        entity.setAccountId(accountId);
-        entity.setTimestamp(date.getTime());
-        entity.setProperties(loginEvent);
+    public boolean isPendoLocalDebug() {
+        return Boolean.TRUE.toString().equals(System.getProperty(PROP_PENDO_LOCAL_CHECK));
+    }
 
-        ObjectMapper mapper = new ObjectMapper();
-        String content = mapper.writeValueAsString(entity);
-        return content;
+    public boolean isLogPendoData() {
+        return Boolean.TRUE.toString().equals(System.getProperty(PROP_PENDO_LOG_DATA));
     }
 
     private String getPendoInfo() throws Exception {
-        return getPendoInfo(getBaseUrl(), getToken());
+        if (StringUtils.isBlank(pendoInfo)) {
+            pendoInfo = getPendoInfo(getBaseUrl(), getToken());
+        }
+        return pendoInfo;
     }
 
     private String getPendoInfo(String baseUrl, String token) throws Exception {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/mapper/AbstractPendoTMapManager.java

@@ -0,0 +1,54 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.mapper;
+
+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.core.pendo.PendoTrackDataUtil.TrackEvent;
+import org.talend.core.pendo.PendoTrackSender;
+import org.talend.core.pendo.properties.PendoTMapProperties;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public abstract class AbstractPendoTMapManager {
+
+    protected abstract PendoTMapProperties calculateProperties();
+
+    public void sendTrackToPendo() {
+        Job job = new Job("send pendo track") {
+
+            @Override
+            protected IStatus run(IProgressMonitor monitor) {
+                try {
+                    if (PendoTrackSender.getInstance().isTrackSendAvailable()) {
+                        PendoTMapProperties properties = calculateProperties();
+                        PendoTrackSender.getInstance().sendTrackData(TrackEvent.TMAP, properties);
+                    }
+                } catch (Exception e) {
+                    // warning only
+                    ExceptionHandler.process(e, Level.WARN);
+                }
+                return Status.OK_STATUS;
+            }
+        };
+        job.setUser(false);
+        job.setPriority(Job.INTERACTIVE);
+        job.schedule();
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/mapper/PendoAutoMapManager.java

@@ -0,0 +1,53 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.mapper;
+
+import org.talend.core.pendo.PendoTrackDataUtil.TrackEvent;
+import org.talend.core.pendo.PendoTrackSender;
+import org.talend.core.pendo.properties.PendoAutoMapProperties;
+
+/**
+ * Assume no multiple thread, one AutoMapper one PendoAutoMapManager
+ * 
+ * DOC jding class global comment. Detailled comment
+ */
+public class PendoAutoMapManager {
+    
+    private int mappingChangeCount = 0;
+
+    public void setMappingChangeCount(int mappingChangeCount) {
+        this.mappingChangeCount = mappingChangeCount;
+    }
+
+    public void incrementMappingChangeCount() {
+        this.mappingChangeCount++;
+    }
+
+    public void resetMappingChangeCount() {
+        this.mappingChangeCount = 0;
+    }
+
+    public int getMappingChangeCount() {
+        return mappingChangeCount;
+    }
+
+    public void sendTrackToPendo() {
+        if (mappingChangeCount < 1) {
+            return;
+        }
+        PendoAutoMapProperties properties = new PendoAutoMapProperties();
+        properties.setAutoMappings(mappingChangeCount);
+        PendoTrackSender.getInstance().sendToPendo(TrackEvent.AUTOMAP, properties);
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/IPendoDataProperties.java

@@ -1,18 +1,21 @@
-// ============================================================================
-//
-// 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.commons.utils.network;
-
-public interface ITalendNexusPrefConstants {
-
-    public static final String NEXUS_TIMEOUT = "NEXUS_TIMEOUT"; //$NON-NLS-1$
-}
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.properties;
+
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public interface IPendoDataProperties {
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoAutoMapProperties.java

@@ -0,0 +1,45 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.properties;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoAutoMapProperties implements IPendoDataProperties {
+
+    @JsonProperty("auto_mapping")
+    private int autoMappings;
+
+    /**
+     * Getter for autoMappings.
+     * 
+     * @return the autoMappings
+     */
+    public int getAutoMappings() {
+        return autoMappings;
+    }
+
+
+    /**
+     * Sets the autoMappings.
+     * 
+     * @param autoMappings the autoMappings to set
+     */
+    public void setAutoMappings(int autoMappings) {
+        this.autoMappings = autoMappings;
+    }
+
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoImportAPIproperties.java

@@ -0,0 +1,75 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.properties;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoImportAPIproperties implements IPendoDataProperties {
+
+    @JsonProperty("source")
+    private String source;
+
+    public PendoImportAPIproperties(String source) {
+        super();
+        this.source = SourceType.getSourceLabelByType(source);
+    }
+
+    /**
+     * Getter for source.
+     * 
+     * @return the source
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * Sets the source.
+     * 
+     * @param source the source to set
+     */
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    enum SourceType {
+
+        LOCAL_FILE("file"),
+        API_DESIGNER("API Designer"),
+        REMOTE_URL("Remote URL");
+
+        private String sourceLabel;
+
+        SourceType(String sourceLabel) {
+            this.sourceLabel = sourceLabel;
+        }
+
+        public String getSourceLabel() {
+            return sourceLabel;
+        }
+
+        public static String getSourceLabelByType(String type) {
+            String label = type;
+            SourceType sourceType = SourceType.valueOf(type);
+            if (sourceType != null) {
+                label = sourceType.getSourceLabel();
+            }
+            return label;
+        }
+
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoLoginProperties.java

@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2021 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2022 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
@@ -10,7 +10,7 @@
 // 9 rue Pages 92150 Suresnes, France
 //
 // ============================================================================
-package org.talend.core.pendo;
+package org.talend.core.pendo.properties;
 
 import java.util.List;
 
@@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 /**
  * DOC jding  class global comment. Detailled comment
  */
-public class PendoLoginProperties {
+public class PendoLoginProperties implements IPendoDataProperties {
 
     @JsonProperty("studio_version")
     private String studioVersion;
@@ -30,6 +30,15 @@ public class PendoLoginProperties {
     @JsonProperty("enabled_features")
     private List<String> enabledFeatures;
 
+    @JsonProperty("referenced_project_number")
+    private String refProjectCount;
+
+    @JsonProperty("referenced_projects")
+    private List<String> refProjectList;
+
+    @JsonProperty("one_click_login")
+    private String isOneClickLogin;
+
     /**
      * Getter for studio_version.
      * 
@@ -84,4 +93,58 @@ public class PendoLoginProperties {
         this.enabledFeatures = enabledFeatures;
     }
 
+    /**
+     * Getter for refProjectCount.
+     * 
+     * @return the refProjectCount
+     */
+    public String getRefProjectCount() {
+        return refProjectCount;
+    }
+
+    /**
+     * Sets the refProjectCount.
+     * 
+     * @param refProjectCount the refProjectCount to set
+     */
+    public void setRefProjectCount(String refProjectCount) {
+        this.refProjectCount = refProjectCount;
+    }
+
+    /**
+     * Getter for refProjectList.
+     * 
+     * @return the refProjectList
+     */
+    public List<String> getRefProjectList() {
+        return refProjectList;
+    }
+
+    /**
+     * Sets the refProjectList.
+     * 
+     * @param refProjectList the refProjectList to set
+     */
+    public void setRefProjectList(List<String> refProjectList) {
+        this.refProjectList = refProjectList;
+    }
+
+    /**
+     * Getter for isOneClickLogin.
+     * 
+     * @return the isOneClickLogin
+     */
+    public String getIsOneClickLogin() {
+        return isOneClickLogin;
+    }
+
+    /**
+     * Sets the isOneClickLogin.
+     * 
+     * @param isOneClickLogin the isOneClickLogin to set
+     */
+    public void setIsOneClickLogin(String isOneClickLogin) {
+        this.isOneClickLogin = isOneClickLogin;
+    }
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoSignImportProperties.java

@@ -0,0 +1,211 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.properties;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoSignImportProperties implements IPendoDataProperties {
+
+    @JsonProperty("source_version")
+    private List<String> sourceVersion;
+
+    @JsonProperty("studio_version")
+    private String studioVersion;
+
+    @JsonProperty("valid_items")
+    private int validItems;
+
+    @JsonProperty("unsigned_items_from_SE")
+    private String unsignSEItems;
+
+    @JsonProperty("unsigned_items_from_EE")
+    private int unsignEEItems;
+
+    @JsonProperty("grace_period")
+    private String gracePeriod;
+
+    @JsonProperty("installed_date")
+    private String installDate;
+
+    @JsonProperty("project_creation_date")
+    private String projectCreateDate;
+
+    @JsonProperty("valid_migration_token")
+    private String validMigrationToken;
+
+
+    /**
+     * Getter for sourceVersion.
+     * @return the sourceVersion
+     */
+    public List<String> getSourceVersion() {
+        return sourceVersion;
+    }
+
+
+    /**
+     * Sets the sourceVersion.
+     * @param sourceVersion the sourceVersion to set
+     */
+    public void setSourceVersion(List<String> sourceVersion) {
+        this.sourceVersion = sourceVersion;
+    }
+
+    /**
+     * Getter for studioVersion.
+     * 
+     * @return the studioVersion
+     */
+    public String getStudioVersion() {
+        return studioVersion;
+    }
+
+    /**
+     * Sets the studioVersion.
+     * 
+     * @param studioVersion the studioVersion to set
+     */
+    public void setStudioVersion(String studioVersion) {
+        this.studioVersion = studioVersion;
+    }
+
+    /**
+     * Getter for validItems.
+     * 
+     * @return the validItems
+     */
+    public int getValidItems() {
+        return validItems;
+    }
+
+    /**
+     * Sets the validItems.
+     * 
+     * @param validItems the validItems to set
+     */
+    public void setValidItems(int validItems) {
+        this.validItems = validItems;
+    }
+
+    /**
+     * Getter for unsignSEItems.
+     * @return the unsignSEItems
+     */
+    public String getUnsignSEItems() {
+        return unsignSEItems;
+    }
+
+    /**
+     * Sets the unsignSEItems.
+     * @param unsignSEItems the unsignSEItems to set
+     */
+    public void setUnsignSEItems(String unsignSEItems) {
+        this.unsignSEItems = unsignSEItems;
+    }
+
+    /**
+     * Getter for unsignEEItems.
+     * 
+     * @return the unsignEEItems
+     */
+    public int getUnsignEEItems() {
+        return unsignEEItems;
+    }
+
+    /**
+     * Sets the unsignEEItems.
+     * 
+     * @param unsignEEItems the unsignEEItems to set
+     */
+    public void setUnsignEEItems(int unsignEEItems) {
+        this.unsignEEItems = unsignEEItems;
+    }
+
+    /**
+     * Getter for gracePeriod.
+     * 
+     * @return the gracePeriod
+     */
+    public String getGracePeriod() {
+        return gracePeriod;
+    }
+
+    /**
+     * Sets the gracePeriod.
+     * 
+     * @param gracePeriod the gracePeriod to set
+     */
+    public void setGracePeriod(String gracePeriod) {
+        this.gracePeriod = gracePeriod;
+    }
+
+    /**
+     * Getter for installDate.
+     * 
+     * @return the installDate
+     */
+    public String getInstallDate() {
+        return installDate;
+    }
+
+    /**
+     * Sets the installDate.
+     * 
+     * @param installDate the installDate to set
+     */
+    public void setInstallDate(String installDate) {
+        this.installDate = installDate;
+    }
+
+    /**
+     * Getter for projectCreateDate.
+     * 
+     * @return the projectCreateDate
+     */
+    public String getProjectCreateDate() {
+        return projectCreateDate;
+    }
+
+    /**
+     * Sets the projectCreateDate.
+     * 
+     * @param projectCreateDate the projectCreateDate to set
+     */
+    public void setProjectCreateDate(String projectCreateDate) {
+        this.projectCreateDate = projectCreateDate;
+    }
+
+    /**
+     * Getter for validMigrationToken.
+     * 
+     * @return the validMigrationToken
+     */
+    public String getValidMigrationToken() {
+        return validMigrationToken;
+    }
+
+    /**
+     * Sets the validMigrationToken.
+     * 
+     * @param validMigrationToken the validMigrationToken to set
+     */
+    public void setValidMigrationToken(String validMigrationToken) {
+        this.validMigrationToken = validMigrationToken;
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoSignLogonProperties.java

@@ -0,0 +1,251 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.properties;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoSignLogonProperties implements IPendoDataProperties {
+
+    @JsonProperty("studio_version")
+    private String studioVersion;
+
+    @JsonProperty("valid_items")
+    private int validItems;
+
+    @JsonProperty("signature_invalid_items")
+    private int invalidSignItems;
+
+    @JsonProperty("unsigned_items_from_SE")
+    private String unsignSEItems;
+
+    @JsonProperty("unsigned_items_from_EE")
+    private int unsignEEItems;
+
+    @JsonProperty("invalid_item_source_version")
+    private String invalidItemSourceVersion;
+
+    @JsonProperty("signed_by_migration")
+    private int signByMigration;
+
+    @JsonProperty("grace_period")
+    private String gracePeriod;
+
+    @JsonProperty("installed_date")
+    private String installDate;
+
+    @JsonProperty("project_creation_date")
+    private String projectCreateDate;
+
+    @JsonProperty("valid_migration_token")
+    private String validMigrationToken;
+
+    /**
+     * Getter for studioVersion.
+     * 
+     * @return the studioVersion
+     */
+    public String getStudioVersion() {
+        return studioVersion;
+    }
+
+    /**
+     * Sets the studioVersion.
+     * 
+     * @param studioVersion the studioVersion to set
+     */
+    public void setStudioVersion(String studioVersion) {
+        this.studioVersion = studioVersion;
+    }
+
+    /**
+     * Getter for validItems.
+     * 
+     * @return the validItems
+     */
+    public int getValidItems() {
+        return validItems;
+    }
+
+    /**
+     * Sets the validItems.
+     * 
+     * @param validItems the validItems to set
+     */
+    public void setValidItems(int validItems) {
+        this.validItems = validItems;
+    }
+
+    /**
+     * Getter for invalidSignItems.
+     * 
+     * @return the invalidSignItems
+     */
+    public int getInvalidSignItems() {
+        return invalidSignItems;
+    }
+
+    /**
+     * Sets the invalidSignItems.
+     * 
+     * @param invalidSignItems the invalidSignItems to set
+     */
+    public void setInvalidSignItems(int invalidSignItems) {
+        this.invalidSignItems = invalidSignItems;
+    }
+
+    /**
+     * Getter for unsignSEItems.
+     * @return the unsignSEItems
+     */
+    public String getUnsignSEItems() {
+        return unsignSEItems;
+    }
+
+    /**
+     * Sets the unsignSEItems.
+     * @param unsignSEItems the unsignSEItems to set
+     */
+    public void setUnsignSEItems(String unsignSEItems) {
+        this.unsignSEItems = unsignSEItems;
+    }
+
+    /**
+     * Getter for unsignEEItems.
+     * 
+     * @return the unsignEEItems
+     */
+    public int getUnsignEEItems() {
+        return unsignEEItems;
+    }
+
+    /**
+     * Sets the unsignEEItems.
+     * 
+     * @param unsignEEItems the unsignEEItems to set
+     */
+    public void setUnsignEEItems(int unsignEEItems) {
+        this.unsignEEItems = unsignEEItems;
+    }
+
+    /**
+     * Getter for invalidItemSourceVersion.
+     * 
+     * @return the invalidItemSourceVersion
+     */
+    public String getInvalidItemSourceVersion() {
+        return invalidItemSourceVersion;
+    }
+
+    /**
+     * Sets the invalidItemSourceVersion.
+     * 
+     * @param invalidItemSourceVersion the invalidItemSourceVersion to set
+     */
+    public void setInvalidItemSourceVersion(String invalidItemSourceVersion) {
+        this.invalidItemSourceVersion = invalidItemSourceVersion;
+    }
+
+    /**
+     * Getter for signByMigration.
+     * 
+     * @return the signByMigration
+     */
+    public int getSignByMigration() {
+        return signByMigration;
+    }
+
+    /**
+     * Sets the signByMigration.
+     * 
+     * @param signByMigration the signByMigration to set
+     */
+    public void setSignByMigration(int signByMigration) {
+        this.signByMigration = signByMigration;
+    }
+
+    /**
+     * Getter for gracePeriod.
+     * 
+     * @return the gracePeriod
+     */
+    public String getGracePeriod() {
+        return gracePeriod;
+    }
+
+    /**
+     * Sets the gracePeriod.
+     * 
+     * @param gracePeriod the gracePeriod to set
+     */
+    public void setGracePeriod(String gracePeriod) {
+        this.gracePeriod = gracePeriod;
+    }
+
+    /**
+     * Getter for installDate.
+     * 
+     * @return the installDate
+     */
+    public String getInstallDate() {
+        return installDate;
+    }
+
+    /**
+     * Sets the installDate.
+     * 
+     * @param installDate the installDate to set
+     */
+    public void setInstallDate(String installDate) {
+        this.installDate = installDate;
+    }
+
+    /**
+     * Getter for projectCreateDate.
+     * 
+     * @return the projectCreateDate
+     */
+    public String getProjectCreateDate() {
+        return projectCreateDate;
+    }
+
+    /**
+     * Sets the projectCreateDate.
+     * 
+     * @param projectCreateDate the projectCreateDate to set
+     */
+    public void setProjectCreateDate(String projectCreateDate) {
+        this.projectCreateDate = projectCreateDate;
+    }
+
+    /**
+     * Getter for validMigrationToken.
+     * 
+     * @return the validMigrationToken
+     */
+    public String getValidMigrationToken() {
+        return validMigrationToken;
+    }
+
+    /**
+     * Sets the validMigrationToken.
+     * 
+     * @param validMigrationToken the validMigrationToken to set
+     */
+    public void setValidMigrationToken(String validMigrationToken) {
+        this.validMigrationToken = validMigrationToken;
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoTMapProperties.java

@@ -0,0 +1,462 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.properties;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoTMapProperties implements IPendoDataProperties {
+
+    /**
+     * Number of input columns
+     */
+    @JsonProperty("input_columns")
+    private int inputColumns;
+
+    /**
+     * Number of output columns
+     */
+    @JsonProperty("output_columns")
+    private int outputColumns;
+
+    /**
+     * Number of var columns
+     */
+    @JsonProperty("var_columns")
+    private int varColumns;
+
+    /**
+     * Number of input tables which have at least 1 mapping to an output table
+     */
+    @JsonProperty("number_of_sources")
+    private int sourceNumber;
+
+    /**
+     * Number of output tables have mapping from the main input table 
+     */
+    @JsonProperty("number_of_destinations")
+    private int destinationNumber;
+
+    /**
+     * Number of output tables
+     */
+    @JsonProperty("number_of_outputs")
+    private int outputNumber;
+
+    /**
+     * Number of expressions without java transformation(expressions in input_columns/var_columns/output_columns but not
+     * include filter expressions)
+     */
+    @JsonProperty("simple_expressions")
+    private int simpleExpressions;
+
+    /**
+     * Number of expressions with java transformation(expressions in input_columns/var_columns/output_columns but not
+     * include filter expressions)
+     */
+    @JsonProperty("transformed_expressions")
+    private int transformExpressions;
+
+    /**
+     * Number of mappings(links) between input and var
+     */
+    @JsonProperty("input_var_mapping")
+    private int inputVarMappings;
+
+    /**
+     * Number of mappings(links) between var and output
+     */
+    @JsonProperty("var_output_mapping")
+    private int varOutputMappings;
+
+    /**
+     * Number of mappings(links) between input and output
+     */
+    @JsonProperty("input_output_mapping")
+    private int inputOutputMappings;
+
+    /**
+     * Number of input columns which are mapped to multiple output columns, either mapped directly or mapped through the
+     * Var column
+     */
+    @JsonProperty("1-to-n mapping")
+    private int oneToNMappings;
+
+    /**
+     * Number of output columns which have multiple source columns, either input columns or var columns
+     */
+    @JsonProperty("n-to-1 mapping")
+    private int nToOneMappings;
+
+    /**
+     * Number of mappings(links) between main input table and join tables
+     */
+    @JsonProperty("join_mappings")
+    private int joinMappingCounts;
+
+    /**
+     * Number of left out join used in join table
+     */
+    @JsonProperty("left_joins")
+    private int leftJoinCounts;
+
+    /**
+     * Number of inner join used in join table
+     */
+    @JsonProperty("inner_joins")
+    private int innerJoinCounts;
+
+    /**
+     * Number of filter activated on input/output tables  
+     */
+    @JsonProperty("filters")
+    private int filterCounts;
+
+    /**
+     * Number of field types for each type in OUTPUT tables
+     */
+    @JsonProperty("field_types")
+    private String outputFieldTypes;
+
+
+    /**
+     * Getter for inputColumns.
+     * @return the inputColumns
+     */
+    public int getInputColumns() {
+        return inputColumns;
+    }
+
+
+    /**
+     * Sets the inputColumns.
+     * @param inputColumns the inputColumns to set
+     */
+    public void setInputColumns(int inputColumns) {
+        this.inputColumns = inputColumns;
+    }
+
+
+    /**
+     * Getter for outputColumns.
+     * @return the outputColumns
+     */
+    public int getOutputColumns() {
+        return outputColumns;
+    }
+
+
+    /**
+     * Sets the outputColumns.
+     * @param outputColumns the outputColumns to set
+     */
+    public void setOutputColumns(int outputColumns) {
+        this.outputColumns = outputColumns;
+    }
+
+
+    /**
+     * Getter for varColumns.
+     * @return the varColumns
+     */
+    public int getVarColumns() {
+        return varColumns;
+    }
+
+
+    /**
+     * Sets the varColumns.
+     * @param varColumns the varColumns to set
+     */
+    public void setVarColumns(int varColumns) {
+        this.varColumns = varColumns;
+    }
+
+
+    /**
+     * Getter for sourceNumber.
+     * @return the sourceNumber
+     */
+    public int getSourceNumber() {
+        return sourceNumber;
+    }
+
+
+    /**
+     * Sets the sourceNumber.
+     * @param sourceNumber the sourceNumber to set
+     */
+    public void setSourceNumber(int sourceNumber) {
+        this.sourceNumber = sourceNumber;
+    }
+
+
+    /**
+     * Getter for destinationNumber.
+     * @return the destinationNumber
+     */
+    public int getDestinationNumber() {
+        return destinationNumber;
+    }
+
+
+    /**
+     * Sets the destinationNumber.
+     * @param destinationNumber the destinationNumber to set
+     */
+    public void setDestinationNumber(int destinationNumber) {
+        this.destinationNumber = destinationNumber;
+    }
+
+
+    /**
+     * Getter for outputNumber.
+     * @return the outputNumber
+     */
+    public int getOutputNumber() {
+        return outputNumber;
+    }
+
+
+    /**
+     * Sets the outputNumber.
+     * @param outputNumber the outputNumber to set
+     */
+    public void setOutputNumber(int outputNumber) {
+        this.outputNumber = outputNumber;
+    }
+
+
+    /**
+     * Getter for simpleExpressions.
+     * 
+     * @return the simpleExpressions
+     */
+    public int getSimpleExpressions() {
+        return simpleExpressions;
+    }
+
+
+    /**
+     * Sets the simpleExpressions.
+     * 
+     * @param simpleExpressions the simpleExpressions to set
+     */
+    public void setSimpleExpressions(int simpleExpressions) {
+        this.simpleExpressions = simpleExpressions;
+    }
+
+
+    /**
+     * Getter for transformExpressions.
+     * 
+     * @return the transformExpressions
+     */
+    public int getTransformExpressions() {
+        return transformExpressions;
+    }
+
+
+    /**
+     * Sets the transformExpressions.
+     * 
+     * @param transformExpressions the transformExpressions to set
+     */
+    public void setTransformExpressions(int transformExpressions) {
+        this.transformExpressions = transformExpressions;
+    }
+
+
+    /**
+     * Getter for inputVarMappings.
+     * @return the inputVarMappings
+     */
+    public int getInputVarMappings() {
+        return inputVarMappings;
+    }
+
+
+    /**
+     * Sets the inputVarMappings.
+     * @param inputVarMappings the inputVarMappings to set
+     */
+    public void setInputVarMappings(int inputVarMappings) {
+        this.inputVarMappings = inputVarMappings;
+    }
+
+
+    /**
+     * Getter for varOutputMappings.
+     * @return the varOutputMappings
+     */
+    public int getVarOutputMappings() {
+        return varOutputMappings;
+    }
+
+
+    /**
+     * Sets the varOutputMappings.
+     * @param varOutputMappings the varOutputMappings to set
+     */
+    public void setVarOutputMappings(int varOutputMappings) {
+        this.varOutputMappings = varOutputMappings;
+    }
+
+
+    /**
+     * Getter for inputOutputMappings.
+     * @return the inputOutputMappings
+     */
+    public int getInputOutputMappings() {
+        return inputOutputMappings;
+    }
+
+
+    /**
+     * Sets the inputOutputMappings.
+     * @param inputOutputMappings the inputOutputMappings to set
+     */
+    public void setInputOutputMappings(int inputOutputMappings) {
+        this.inputOutputMappings = inputOutputMappings;
+    }
+
+
+    /**
+     * Getter for oneToNMappings.
+     * @return the oneToNMappings
+     */
+    public int getOneToNMappings() {
+        return oneToNMappings;
+    }
+
+
+    /**
+     * Sets the oneToNMappings.
+     * @param oneToNMappings the oneToNMappings to set
+     */
+    public void setOneToNMappings(int oneToNMappings) {
+        this.oneToNMappings = oneToNMappings;
+    }
+
+
+    /**
+     * Getter for nToOneMappings.
+     * @return the nToOneMappings
+     */
+    public int getnToOneMappings() {
+        return nToOneMappings;
+    }
+
+
+    /**
+     * Sets the nToOneMappings.
+     * @param nToOneMappings the nToOneMappings to set
+     */
+    public void setnToOneMappings(int nToOneMappings) {
+        this.nToOneMappings = nToOneMappings;
+    }
+
+
+    /**
+     * Getter for joinMappingCounts.
+     * @return the joinMappingCounts
+     */
+    public int getJoinMappingCounts() {
+        return joinMappingCounts;
+    }
+
+
+    /**
+     * Sets the joinMappingCounts.
+     * @param joinMappingCounts the joinMappingCounts to set
+     */
+    public void setJoinMappingCounts(int joinMappingCounts) {
+        this.joinMappingCounts = joinMappingCounts;
+    }
+
+
+    /**
+     * Getter for leftJoinCounts.
+     * @return the leftJoinCounts
+     */
+    public int getLeftJoinCounts() {
+        return leftJoinCounts;
+    }
+
+
+    /**
+     * Sets the leftJoinCounts.
+     * @param leftJoinCounts the leftJoinCounts to set
+     */
+    public void setLeftJoinCounts(int leftJoinCounts) {
+        this.leftJoinCounts = leftJoinCounts;
+    }
+
+
+    /**
+     * Getter for innerJoinCounts.
+     * @return the innerJoinCounts
+     */
+    public int getInnerJoinCounts() {
+        return innerJoinCounts;
+    }
+
+
+    /**
+     * Sets the innerJoinCounts.
+     * @param innerJoinCounts the innerJoinCounts to set
+     */
+    public void setInnerJoinCounts(int innerJoinCounts) {
+        this.innerJoinCounts = innerJoinCounts;
+    }
+
+
+    /**
+     * Getter for filterCounts.
+     * @return the filterCounts
+     */
+    public int getFilterCounts() {
+        return filterCounts;
+    }
+
+
+    /**
+     * Sets the filterCounts.
+     * @param filterCounts the filterCounts to set
+     */
+    public void setFilterCounts(int filterCounts) {
+        this.filterCounts = filterCounts;
+    }
+
+
+    /**
+     * Getter for outputFieldTypes.
+     * @return the outputFieldTypes
+     */
+    public String getOutputFieldTypes() {
+        return outputFieldTypes;
+    }
+
+
+    /**
+     * Sets the outputFieldTypes.
+     * @param outputFieldTypes the outputFieldTypes to set
+     */
+    public void setOutputFieldTypes(String outputFieldTypes) {
+        this.outputFieldTypes = outputFieldTypes;
+    }
+
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/pendo/properties/PendoUseAPIProperties.java

@@ -0,0 +1,48 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.properties;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * DOC jding  class global comment. Detailled comment
+ */
+public class PendoUseAPIProperties implements IPendoDataProperties {
+
+    @JsonProperty("component")
+    private String component;
+
+    public PendoUseAPIProperties(String component) {
+        super();
+        this.component = component;
+    }
+
+    /**
+     * Getter for component.
+     * 
+     * @return the component
+     */
+    public String getComponent() {
+        return component;
+    }
+
+    /**
+     * Sets the component.
+     * 
+     * @param component the component to set
+     */
+    public void setComponent(String component) {
+        this.component = component;
+    }
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/prefs/ITalendCorePrefConstants.java

@@ -12,8 +12,6 @@
 // ============================================================================
 package org.talend.core.prefs;
 
-import org.talend.commons.utils.network.ITalendNexusPrefConstants;
-
 /**
  * Core preferences. Detailled comment <br/>
  *
@@ -187,8 +185,6 @@ public interface ITalendCorePrefConstants {
 
     public static final String PERFORMANCE_JAVA_PROCESS_CODE_FORMATE_TIMEOUT = "PERFORMANCE_JAVA_PROCESS_CODE_FORMATE_TIMEOUT"; //$NON-NLS-1$
 
-    public static final String NEXUS_TIMEOUT = ITalendNexusPrefConstants.NEXUS_TIMEOUT;
-
     public static final String NEXUS_REFRESH_FREQUENCY = "NEXUS_REFRESH_FREQUENCY"; //$NON-NLS-1$
 
     /**

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/prefs/SecurityPreferenceConstants.java

@@ -0,0 +1,31 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2022 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.prefs;
+
+
+/**
+ * created by hcyi on May 17, 2022
+ * Detailled comment
+ *
+ */
+public class SecurityPreferenceConstants {
+
+    public static final String SIGNER_PATH = "signer.path"; //$NON-NLS-1$
+
+    public static final String SIGNER_KEYSTORE_PASSWORD = "signer.keystore.password"; //$NON-NLS-1$
+
+    public static final String SIGNER_KEY_PASSWORD = "signer.key.password"; //$NON-NLS-1$
+
+    public static final String SIGNER_KEY_ALIAS = "signer.key.alias"; //$NON-NLS-1$
+
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages.properties

@@ -449,7 +449,7 @@ repository.rulesSql=SQL
 repository.rulesParser=Parser
 repository.rulesMatcher=Match
 repository.systemIndicators=System Indicators
-repository.userDefineIndicators=User Defined Indicators
+repository.userDefineIndicators=User-defined Indicators
 repository.userDefineIndicators.lib=lib
 repository.systemIndicators.advancedStatistics=Advanced Statistics
 repository.systemIndicators.businessRules=Business Rules
@@ -552,6 +552,8 @@ BusinessAppearanceComposite.textAlignment.vertical.centre=Centre
 ConnectionBean.Local=Local
 ConnectionBean.Remote=Remote
 ConnectionBean.DefaultConnection=Default connection
+ConnectionBean.Cloud.name=Signed in: Cloud ({0})
+ConnectionBean.CloudConnection.description=Remote connection to Cloud - Signed in: Cloud ({0})
 InegerCellEditorListener.NegativeNumberMessage=The value of {0} can't be set by negative number.
 InegerCellEditorListener.NumeralMessage=The value of {0} should be numeral.
 OpenXSDFileDialog.cancel=Cancel

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_fr.properties

@@ -1,6 +1,6 @@
 
-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).
+AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2010, Talend SA.\n//\n// Le code source a \u00E9t\u00E9 automatiquement g\u00E9n\u00E9r\u00E9 par_{0}\n// / JobDesigner (CodeGenerator version {1}).\n// Vous pouvez trouver plus d'informations sur les produits Talend sur www.talend.com.\n// Vous pouvez distribuer ce code sous les termes de la licence GNU LGPL\n// (http://www.gnu.org/licenses/lgpl.html).\n//\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 sur les produits Talend sur www.talend.com.\n// Vous pouvez distribuer ce code sous les termes de la licence GNU LGPL\n// (http://www.gnu.org/licenses/lgpl.html).
 AbstractComponentsProvider.folderNotExist=Le dossier {0} n'existe pas.
 AbstractItemMigrationTask.taskFailed=La t\u00E2che de migration {0} a \u00E9chou\u00E9 \u00E0 l'\u00E9l\u00E9ment {1}
 AdvancedSocketFactory.failedInitial=Erreur : impossible d'initialiser :
@@ -303,7 +303,7 @@ RepositoryToComponentProperty.xmlFileSelection=S\u00E9lectionnez un fichier XML
 RepositoryUpdateManager.Title=Modification
 RepositoryUpdateManager.Check=V\u00E9rification...
 RepositoryUpdateManager.Messages=Voulez-vous propager les modifications \u00E0 tous les Jobs ? \n Cela peut prendre un moment.
-RepositoryUpdateManager.MessagesForTDQ=Propager les modifications \u00E0 tous les Jobs ?\nCertaines d\u00E9pendances d'analyses vont perdre des informations.\nCela peut prendre un moment.
+RepositoryUpdateManager.MessagesForTDQ=Voulez-vous propager les modifications \u00E0 tous les Jobs ?\nCertaines d\u00E9pendances d'analyses vont perdre des informations.\nCela peut prendre un moment.
 RepositoryUpdateManager.NoModificationTitle=Aucune modification n\u00E9cessaire
 RepositoryUpdateManager.NoModificationMessages=Aucune modification n\u00E9cessaire pour effectuer la mise \u00E0 jour.
 RepositoryUpdateManager.NotFoundMessages=Aucune relation \u00E0 trouver.
@@ -338,7 +338,7 @@ SchemaOperationChoiceDialog.StatusMessage=Le sch\u00E9ma est invalide, ou il exi
 SchemaOperationChoiceDialog.Title=Sch\u00E9ma
 SchemaOperationChoiceDialog.ViewSchemaMessage=Voir le sch\u00E9ma (lecture seule)
 SchemaXPathQuerysDialog.Mappings=Correspondances
-SelectRepositoryContextDialog.DeselectAll=D\u00E9s\u00E9lectionner tout
+SelectRepositoryContextDialog.DeselectAll=Tout d\u00E9s\u00E9lectionner
 SelectRepositoryContextDialog.CollapseAll=Tout r\u00E9duire
 SelectRepositoryContextDialog.DuplicationMessage=Vous avez s\u00E9lectionn\u00E9 la variable "{0}" dans le contexte "{1}".
 SelectRepositoryContextDialog.DuplicationTitle=Avertissement de duplication !
@@ -558,7 +558,7 @@ OpenXSDFileDialog.cancel=Annuler
 OpenXSDFileDialog.confirm=Confirmer
 OpenXSDFileDialog.fileName=Nom de fichier\u00A0:
 OpenXSDFileDialog.xmlFileSelection=S\u00E9lectionnez un fichier XML \u00E0 valider
-OpenXSDFileDialog.xmlSelectedOrNot=Comme vous avez s\u00E9lectionn\u00E9 un fichier de m\u00E9tadonn\u00E9es XSD, \n il devrait y avoir un fichier XML \u00E0 valider.
+OpenXSDFileDialog.xmlSelectedOrNot=Comme vous avez s\u00E9lectionn\u00E9 un fichier XSD de m\u00E9tadonn\u00E9es, \n un fichier XML doit \u00EAtre \u00E0 valider.
 RepositoryContentProvider.repositoryLabel.Queries=Requ\u00EAtes
 RepositoryContentProvider.repositoryLabel.sapBapi=SAP Bapi
 RepositoryContentProvider.repositoryLabel.sapBapi.input=Lecture

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_ja.properties

@@ -1,6 +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}\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)
+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\u306E\u3055\u3089\u306B\u8A73\u3057\u3044\u60C5\u5831\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\n// (http://www.gnu.org/licenses/lgpl.html)\u306B\u57FA\u3065\u3044\u3066\u914D\u5E03\u3067\u304D\u307E\u3059\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\u306E\u3055\u3089\u306B\u8A73\u3057\u3044\u60C5\u5831\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\n// (http://www.gnu.org/licenses/lgpl.html)\u306B\u57FA\u3065\u3044\u3066\u914D\u5E03\u3067\u304D\u307E\u3059\u3002
 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 :
@@ -302,16 +302,16 @@ RepositoryObject.NotImplemented=\u672A\u5B9F\u88C5
 RepositoryToComponentProperty.xmlFileSelection=\u691C\u8A3C\u3059\u308BXML\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E
 RepositoryUpdateManager.Title=\u5909\u66F4
 RepositoryUpdateManager.Check=\u30C1\u30A7\u30C3\u30AF\u4E2D...
-RepositoryUpdateManager.Messages=\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u5909\u66F4\u3092\u53CD\u6620\u3057\u307E\u3059\u304B? \n\u3053\u306E\u51E6\u7406\u306B\u306F\u6642\u9593\u304C\u304B\u304B\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-RepositoryUpdateManager.MessagesForTDQ=Do you want to propagate the modifications to all jobs?\nAnd some analysis which dependency it will lost information.\nIt might be quite long
+RepositoryUpdateManager.Messages=\u5909\u66F4\u3092\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n \u3053\u306E\u64CD\u4F5C\u306B\u306F\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
+RepositoryUpdateManager.MessagesForTDQ=\u5909\u66F4\u3092\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B?\n\u307E\u305F\u3001\u4E00\u90E8\u306E\u5206\u6790\u4F9D\u5B58\u9805\u76EE\u3067\u60C5\u5831\u304C\u5931\u308F\u308C\u307E\u3059\u3002\n\u3053\u306E\u64CD\u4F5C\u306B\u306F\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
 RepositoryUpdateManager.NoModificationTitle=\u5909\u66F4\u4E0D\u8981
-RepositoryUpdateManager.NoModificationMessages=\u66F4\u65B0\u306B\u5FC5\u8981\u306A\u5909\u66F4\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+RepositoryUpdateManager.NoModificationMessages=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306B\u5FC5\u8981\u306A\u5909\u66F4\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 RepositoryUpdateManager.NotFoundMessages=\u95A2\u4FC2\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
 RepositoryUpdateManager.NotFoundTitle=\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-RepositoryUpdateManager.RenameContextMessagesNoBuiltIn=\u540D\u524D\u304C\u5909\u66F4\u3055\u308C\u305F\u5909\u6570\u3092\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u4ECA\u3059\u3050\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n\n [\u306F\u3044]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u66F4\u65B0\u306B\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-RepositoryUpdateManager.RenameContextTitle=Rename Question
-RepositoryUpdateManager.ItemsToUpdate=\u66F4\u65B0\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u30C1\u30A7\u30C3\u30AF
-RepositoryUpdateManager.job.title=\u30A2\u30A4\u30C6\u30E0\u3092\u66F4\u65B0\u4E2D...
+RepositoryUpdateManager.RenameContextMessagesNoBuiltIn=\u540D\u524D\u5909\u66F4\u5909\u6570\u3092\u4ECA\u3059\u3050\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u306B\u30D7\u30ED\u30D1\u30B2\u30FC\u30C8\u3057\u307E\u3059\u304B? \n\n [\u306F\u3044]\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306B\u975E\u5E38\u306B\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
+RepositoryUpdateManager.RenameContextTitle=\u540D\u524D\u5909\u66F4\u306E\u8CEA\u554F
+RepositoryUpdateManager.ItemsToUpdate=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3059\u308B\u30A2\u30A4\u30C6\u30E0\u3092\u30C1\u30A7\u30C3\u30AF
+RepositoryUpdateManager.job.title=\u30A2\u30A4\u30C6\u30E0\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u4E2D...
 RoutinesFunctionProposal.CreatedBy=\u4F5C\u6210\u8005:
 RoutinesFunctionProposal.Description=\u8AAC\u660E:
 RoutinesFunctionProposal.Example=\u4F8B:
@@ -402,7 +402,7 @@ repository.SAPIDoc=SAP iDoc
 repository.SAPTable=SAP\u30C6\u30FC\u30D6\u30EB
 repository.metadataSQLPatterns=SQL\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
 repository.metadataSQLPatterns.alias=SQLTemplates
-repository.metadataFileDelimited=\u533A\u5207\u308A\u6587\u5B57\u4ED8\u304D\u30D5\u30A1\u30A4\u30EB
+repository.metadataFileDelimited=\u533A\u5207\u308A\u4ED8\u304D\u30D5\u30A1\u30A4\u30EB
 repository.metadataFileDelimited.alias=DELIM
 repository.metadataTable=\u30E1\u30BF\u30C7\u30FC\u30BF\u30B9\u30AD\u30FC\u30DE
 repository.metadataColumn=\u30E1\u30BF\u30C7\u30FC\u30BF\u30AB\u30E9\u30E0
@@ -449,7 +449,7 @@ repository.rulesSql=SQL
 repository.rulesParser=\u30D1\u30FC\u30B5\u30FC
 repository.rulesMatcher=\u4E00\u81F4
 repository.systemIndicators=\u30B7\u30B9\u30C6\u30E0\u30A4\u30F3\u30C7\u30A3\u30B1\u30FC\u30BF\u30FC
-repository.userDefineIndicators=\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u30A4\u30F3\u30B8\u30B1\u30FC\u30BF\u30FC
+repository.userDefineIndicators=\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9\u306E\u30A4\u30F3\u30B8\u30B1\u30FC\u30BF\u30FC
 repository.userDefineIndicators.lib=lib
 repository.systemIndicators.advancedStatistics=\u8A73\u7D30\u7D71\u8A08
 repository.systemIndicators.businessRules=\u30D3\u30B8\u30CD\u30B9\u30EB\u30FC\u30EB
@@ -483,11 +483,11 @@ EUpdateItemType.Name=\u540D\u524D
 EUpdateItemType.JobVersion=\u30B8\u30E7\u30D6\u30D0\u30FC\u30B8\u30E7\u30F3
 EUpdateItemType.ValidationRule=\u691C\u8A3C\u30EB\u30FC\u30EB
 EUpdateResult.BuiltIn=\u7D44\u307F\u8FBC\u307F\u30E2\u30FC\u30C9\u306B\u5909\u66F4
-EUpdateResult.JobletUpdate=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u30CE\u30FC\u30C9\u306E\u66F4\u65B0
-EUpdateResult.JobUpdate=\u30B8\u30E7\u30D6\u30CE\u30FC\u30C9\u306E\u66F4\u65B0
-EUpdateResult.PathUpdate=\u30DE\u30C3\u30D7\u30D1\u30B9\u306E\u66F4\u65B0
-EUpdateResult.StructurePathUpdate=\u30B9\u30C8\u30E9\u30AF\u30C1\u30E3\u30FC\u30D1\u30B9\u306E\u66F4\u65B0
-EUpdateResult.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u66F4\u65B0
+EUpdateResult.JobletUpdate=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u30CE\u30FC\u30C9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+EUpdateResult.JobUpdate=\u30B8\u30E7\u30D6\u30CE\u30FC\u30C9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+EUpdateResult.PathUpdate=\u30DE\u30C3\u30D7\u30D1\u30B9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+EUpdateResult.StructurePathUpdate=\u30B9\u30C8\u30E9\u30AF\u30C1\u30E3\u30FC\u30D1\u30B9\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+EUpdateResult.Update=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
 EUpdateResult.Reload=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30EA\u30ED\u30FC\u30C9
 EUpdateResult.Rename=\u540D\u524D\u3092\u5909\u66F4
 EUpdateResult.Add=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304B\u3089\u8FFD\u52A0
@@ -558,7 +558,7 @@ OpenXSDFileDialog.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
 OpenXSDFileDialog.confirm=\u78BA\u8A8D
 OpenXSDFileDialog.fileName=\u30D5\u30A1\u30A4\u30EB\u540D:
 OpenXSDFileDialog.xmlFileSelection=\u691C\u8A3C\u3059\u308BXML\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E
-OpenXSDFileDialog.xmlSelectedOrNot=XSD\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u305F\u305F\u3081\u3001\n\u691C\u8A3C\u3059\u308Bxml\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u3059\u3002
+OpenXSDFileDialog.xmlSelectedOrNot=XSD\u30E1\u30BF\u30C7\u30FC\u30BF\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3057\u305F\u305F\u3081\u3001 \n \u691C\u8A3C\u7528\u306Exml\u30D5\u30A1\u30A4\u30EB\u304C\u5FC5\u8981\u3067\u3059\u3002
 RepositoryContentProvider.repositoryLabel.Queries=\u30AF\u30A8\u30EA\u30FC
 RepositoryContentProvider.repositoryLabel.sapBapi=SAP Bapi
 RepositoryContentProvider.repositoryLabel.sapBapi.input=\u5165\u529B

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages_zh_CN.properties

@@ -1,6 +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}\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
+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 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\n//\n// ============================================================================
+AbstractBrandingService.routines_license_header_content2014=\u7248\u6743\u6240\u6709 (c) 2006-2014, 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 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
@@ -253,7 +253,7 @@ MetadataTool.schemaInvalid=Schema \u540D\u79F0\u65E0\u6548\u3002
 MetadataTool.schemaNull=Schema \u540D\u79F0\u4E3A null\u3002
 NodeReturnProposal.Availability=\n\u53EF\u7528\u6027\uFF1A {4}
 NodeReturnProposal.Description=\u63CF\u8FF0\uFF1A{0}
-NodeReturnProposal.GlobalVariable=\n\n\u5168\u5C40\u53D8\u91CF\uFF0C\u7EC4\u4EF6 {1} [{2}] \u7684\u5C5E\u6027\u3002
+NodeReturnProposal.GlobalVariable=\n\n\u5168\u5C40\u53D8\u91CF\uFF0C\u7EC4\u4EF6\u5C5E\u6027 {1} [{2}].
 NodeReturnProposal.Type=\n\u7C7B\u578B\uFF1A {3}
 NodeReturnProposal.VariableName=\n\n\u53D8\u91CF\u540D\uFF1A {5}
 PaletteContentDialog.connection=\u683C\u5F0F\u8FDE\u63A5\u9ED8\u8BA4\u503C:
@@ -302,13 +302,13 @@ RepositoryObject.NotImplemented=\u672A\u5B9E\u73B0
 RepositoryToComponentProperty.xmlFileSelection=\u9009\u62E9\u8981\u9A8C\u8BC1\u7684 XML \u6587\u4EF6
 RepositoryUpdateManager.Title=\u4FEE\u6539
 RepositoryUpdateManager.Check=\u68C0\u67E5\u4E2D...
-RepositoryUpdateManager.Messages=\u662F\u5426\u5C06\u4FEE\u6539\u4F20\u64AD\u5230\u6240\u6709\u4F5C\u4E1A\uFF1F\n\u53EF\u80FD\u8981\u5F88\u4E45\u3002
-RepositoryUpdateManager.MessagesForTDQ=\u662F\u5426\u8981\u5C06\u4FEE\u6539\u4F20\u64AD\u5230\u6240\u6709\u4F5C\u4E1A\uFF1F\n\u67D0\u4E9B\u5206\u6790\u4F9D\u8D56\u5173\u7CFB\u4F1A\u4E22\u5931\u4FE1\u606F\u3002\n\u53EF\u80FD\u8981\u5F88\u4E45
+RepositoryUpdateManager.Messages=\u662F\u5426\u5C06\u4FEE\u6539\u4F20\u64AD\u5230\u6240\u6709\u4F5C\u4E1A\uFF1F \n \u6B64\u8FC7\u7A0B\u53EF\u80FD\u6BD4\u8F83\u8017\u65F6\u3002
+RepositoryUpdateManager.MessagesForTDQ=\u662F\u5426\u5C06\u4FEE\u6539\u4F20\u64AD\u5230\u6240\u6709\u4F5C\u4E1A\uFF1F\n\u67D0\u4E9B\u5206\u6790\u4F9D\u8D56\u5173\u7CFB\u4F1A\u4E22\u5931\u4FE1\u606F\u3002\n\u6B64\u8FC7\u7A0B\u53EF\u80FD\u6BD4\u8F83\u8017\u65F6\u3002
 RepositoryUpdateManager.NoModificationTitle=\u6CA1\u6709\u9700\u8981\u7684\u4FEE\u6539
 RepositoryUpdateManager.NoModificationMessages=\u6CA1\u6709\u66F4\u65B0\u6240\u9700\u7684\u4FEE\u6539\u3002
 RepositoryUpdateManager.NotFoundMessages=\u6CA1\u6709\u53EF\u5BFB\u627E\u7684\u5173\u7CFB\u3002
 RepositoryUpdateManager.NotFoundTitle=\u627E\u4E0D\u5230
-RepositoryUpdateManager.RenameContextMessagesNoBuiltIn=\u662F\u5426\u771F\u7684\u8981\u7ACB\u5373\u5C06\u91CD\u547D\u540D\u53D8\u91CF\u4F20\u64AD\u5230\u6240\u6709\u4F5C\u4E1A\uFF1F\n\n\u5982\u679C\u662F\uFF0C\u66F4\u65B0\u53EF\u80FD\u9700\u8981\u5F88\u957F\u65F6\u95F4\u3002
+RepositoryUpdateManager.RenameContextMessagesNoBuiltIn=\u662F\u5426\u786E\u5B9A\u8981\u628A\u91CD\u547D\u540D\u53D8\u91CF\u4F20\u64AD\u5230\u6240\u6709\u4F5C\u4E1A\uFF1F \n\n \u5982\u7EE7\u7EED\uFF0C\u5219\u53EF\u80FD\u9700\u8981\u5F88\u957F\u65F6\u95F4\u8FDB\u884C\u66F4\u65B0\u3002
 RepositoryUpdateManager.RenameContextTitle=\u91CD\u547D\u540D\u95EE\u9898
 RepositoryUpdateManager.ItemsToUpdate=\u68C0\u67E5\u8981\u66F4\u65B0\u7684\u9879\u76EE
 RepositoryUpdateManager.job.title=\u6B63\u5728\u66F4\u65B0\u9879\u76EE...
@@ -558,7 +558,7 @@ OpenXSDFileDialog.cancel=\u53D6\u6D88
 OpenXSDFileDialog.confirm=\u786E\u8BA4
 OpenXSDFileDialog.fileName=\u6587\u4EF6\u540D:
 OpenXSDFileDialog.xmlFileSelection=\u9009\u62E9\u8981\u9A8C\u8BC1\u7684 XML \u6587\u4EF6
-OpenXSDFileDialog.xmlSelectedOrNot=\u7531\u4E8E\u60A8\u9009\u62E9\u4E86 XSD \u5143\u6570\u636E\u6587\u4EF6\uFF0C\n \u5E94\u8BE5\u6709\u4E00\u4E2A xml \u6587\u4EF6\u9700\u8981\u9A8C\u8BC1\u3002
+OpenXSDFileDialog.xmlSelectedOrNot=\u7531\u4E8E\u60A8\u9009\u62E9\u4E86 XSD \u5143\u6570\u636E\u6587\u4EF6\uFF0C \n \u5E94\u8BE5\u6709\u4E00\u4E2A XML \u6587\u4EF6\u9700\u8981\u9A8C\u8BC1\u3002
 RepositoryContentProvider.repositoryLabel.Queries=\u67E5\u8BE2
 RepositoryContentProvider.repositoryLabel.sapBapi=SAP Bapi
 RepositoryContentProvider.repositoryLabel.sapBapi.input=\u8F93\u5165

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/TalendProcessOptionConstants.java

@@ -48,6 +48,10 @@ public interface TalendProcessOptionConstants {
     
     public static final int GENERATE_POM_NOT_CLEAR_CACHE = 1 << 11;
 
+    /**
+     * for DQ clean item
+     */
+    public static final int GENERATE_NO_RESET_DQ = 1 << 12;
     /**
      * clean options
      */

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/ICloudSignOnService.java

@@ -0,0 +1,58 @@
+// ============================================================================
+//
+// 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.GlobalServiceRegister;
+import org.talend.core.IService;
+import org.talend.signon.util.TokenMode;
+import org.talend.signon.util.listener.LoginEventListener;
+
+public interface ICloudSignOnService extends IService {
+
+    TokenMode getToken(String authCode, String codeVerifier, String dataCenter) throws Exception;
+
+    void startHeartBeat() throws Exception;
+
+    void stopHeartBeat();
+
+    String generateCodeVerifier();
+
+    String getCodeChallenge(String seed) throws Exception;
+
+    boolean hasValidToken() throws Exception;
+
+    String getTokenUser(String url, TokenMode token) throws Exception;
+
+    void signonCloud(LoginEventListener listener) throws Exception;
+    
+    TokenMode getLatestToken() throws Exception;
+    
+    public boolean refreshToken() throws Exception;
+    
+    boolean isSignViaCloud();
+    
+    boolean isNeedShowSSOPage();
+    
+    public void showReloginDialog();
+    
+    public boolean isReloginDialogRunning();
+    
+    public void reload();
+
+    public static ICloudSignOnService get() {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ICloudSignOnService.class)) {
+            return GlobalServiceRegister.getDefault().getService(ICloudSignOnService.class);
+        }
+        return null;
+    }
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IDQComponentService.java

@@ -15,6 +15,7 @@ package org.talend.core.service;
 import org.talend.core.IService;
 import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.process.IConnection;
+import org.talend.core.model.process.INode;
 import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
 
 /**
@@ -46,4 +47,24 @@ public interface IDQComponentService extends IService {
      */
     void covertConfindWeight2Int(NodeType node);
 
+    /**
+     *
+     * Handle component chaged
+     *
+     * @param oldMetadataTable
+     * @param newMetadataTable
+     */
+    void externalComponentInputMetadataChange(INode node, IMetadataTable newMetadataTable,
+            IMetadataTable oldMetadataTable);
+
+    /**
+     *
+     * Handle component chaged
+     *
+     * @param oldMetadataTable
+     * @param newMetadataTable
+     */
+    void externalComponentOutputMetadataChange(INode node, IMetadataTable newMetadataTable,
+            IMetadataTable oldMetadataTable);
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/service/IDesignerXMLMapperService.java

@@ -30,4 +30,6 @@ public interface IDesignerXMLMapperService extends IService {
      */
     public boolean isVirtualComponent(final INode node);
 
+    public Object rebuildXmlMapData(final INode node);
+
 }