feat(TUP-37353):Guess Schema for tBigQueryInput (#5953)

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

@@ -37,8 +37,6 @@ 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 ERROR_FONT_COLOR = new Color(null, new RGB(255, 0, 0));// 255
 
     static final Color VERTICAL_SEPERATOR_LINE_COLOR = new Color(null, 162, 179, 195);
 

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

@@ -96,7 +96,7 @@ ProposalUtils.CtrlProposal.ErrorMsg=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5236\u
 RemovePushButton.RemoveButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u524A\u9664
 ResetDBTypesButton.ResetDBTypesButton.Tip=DB\u30BF\u30A4\u30D7\u3092\u30EA\u30BB\u30C3\u30C8
 Rule.rule=\u30EB\u30FC\u30EB[{0}]
-SaveAsGenericSchemaPushButton.saveAsSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
+SaveAsGenericSchemaPushButton.saveAsSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
 SelectContextVariablesPushButton.Label=\u30B3\u30F3\u30C6\u30AF\u30B9\u30C8\u5909\u6570\u3092\u9078\u629E
 SWTCalendarWithTime.contentEvening=\u5915\u65B9
 SWTCalendarWithTime.contentHr=\u6642:

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/model/emf/CustomXMIResource.java

@@ -1,85 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2023 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.runtime.model.emf;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.StringJoiner;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.XMLSave;
-import org.eclipse.emf.ecore.xmi.impl.XMISaveImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLString;
-
-/**
- * DOC jding  class global comment. Detailled comment
- */
-public class CustomXMIResource extends TalendXMIResource {
-
-    public static final String ENCODING = "UTF-8"; //$NON-NLS-1$
-
-    CustomXMISave xmiSave;
-
-    public CustomXMIResource() {
-        super();
-    }
-
-    public CustomXMIResource(URI uri) {
-        super(uri);
-    }
-
-    @Override
-    protected void init() {
-        super.init();
-        encoding = ENCODING;
-    }
-
-    @Override
-    protected XMLSave createXMLSave() {
-        xmiSave = new CustomXMISave(createXMLHelper());
-        return xmiSave;
-    }
-
-    public String getResourceContent(Map<?, ?> options) {
-        if (xmiSave == null) {
-            createXMLSave();
-        }
-        return xmiSave.getXMLContent(this, options);
-    }
-
-}
-
-class CustomXMISave extends XMISaveImpl {
-
-    public CustomXMISave(XMLHelper helper) {
-        super(helper);
-    }
-
-    public String getXMLContent(XMLResource resource, Map<?, ?> options) {
-        StringJoiner strJoin = new StringJoiner("");
-        super.init(resource, options);
-        super.traverse(resource.getContents());
-        XMLString xmlString = this.doc;
-        Iterator<String> iterator = xmlString.stringIterator();
-        while (iterator.hasNext()) {
-            String string = (String) iterator.next();
-            if (string != null) {
-                strJoin.add(string);
-            }
-        }
-        return strJoin.toString();
-    }
-
-}

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/model/emf/EmfHelper.java

@@ -16,7 +16,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -264,12 +263,4 @@ public class EmfHelper {
         return result;
     }
 
-    public static String getEmfModelContent(EObject model) throws Exception {
-        String content = "";
-        CustomXMIResource xmiResource = new CustomXMIResource();
-        xmiResource.getContents().add(model);
-        content = xmiResource.getResourceContent(Collections.EMPTY_MAP);
-        return content;
-    }
-
 }

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

@@ -92,7 +92,7 @@ ProposalUtils.CtrlProposal.ErrorMsg=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u5236\u
 RemovePushButton.RemoveButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u524A\u9664
 ResetDBTypesButton.ResetDBTypesButton.Tip=DB\u30BF\u30A4\u30D7\u3092\u30EA\u30BB\u30C3\u30C8
 Rule.rule=\u30EB\u30FC\u30EB[{0}]
-SaveAsGenericSchemaPushButton.saveAsSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
+SaveAsGenericSchemaPushButton.saveAsSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
 SelectContextVariablesPushButton.Label=\u30B3\u30F3\u30C6\u30AF\u30B9\u30C8\u5909\u6570\u3092\u9078\u629E
 SWTCalendarWithTime.contentEvening=\u5915\u65B9
 SWTCalendarWithTime.contentHr=\u6642:

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

@@ -204,4 +204,3 @@ RenameFolderAction.warning.cannotFind.title=Action not available
 ConvertJobsUtil.warning.title=Warning
 ConvertJobsUtil.warning.message=The target framework is not fully supported for this release.
 SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=Create stats log and implicit parameters
-WizardPageAPIDefinition_operationIdMissing=API is missing operationIds. operationIds are used to initialize tRESTRequest/cRest output flows. See tRESTRequest/cRest online help.

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

@@ -156,7 +156,7 @@ ProjectRepositoryNode.invalidItem=\u7121\u52B9\u306A\u30A2\u30A4\u30C6\u30E0
 ProjectRepositoryNode.columns=\u30AB\u30E9\u30E0
 ProjectRepositoryNode.validationRules=\u691C\u8A3C\u30EB\u30FC\u30EB
 ProjectRepositoryNode.cdcFoundation=CDC Foundation
-ProjectRepositoryNode.genericSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE
+ProjectRepositoryNode.genericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE
 ProjectRepositoryNode.queries=\u30AF\u30A8\u30EA\u30FC
 ProjectRepositoryNode.synonymSchemas=\u30B7\u30CE\u30CB\u30E0\u30B9\u30AD\u30FC\u30DE
 ProjectRepositoryNode.calculationViewSchemas=\u8A08\u7B97\u30D3\u30E5\u30FC\u30B9\u30AD\u30FC\u30DE

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

@@ -139,5 +139,3 @@ Bundle-ClassPath: .,
  lib/delight-rhino-sandbox-0.0.15.jar,
  lib/rhino-1.7.13.jar
 Eclipse-RegisterBuddy: org.talend.testutils
-Import-Package: org.eclipse.equinox.p2.repository,
- org.eclipse.equinox.security.storage

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

@@ -366,57 +366,7 @@ public class ConnParameterKeys {
     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";
-    
-    /**kubernetes*/
 
-    public static final String CONN_PARA_KEY_K8S_SUBMIT_MODE="CONN_PARA_KEY_K8S_SUBMIT_MODE";
-    
-    public static final String CONN_PARA_KEY_K8S_MASTER="CONN_PARA_KEY_K8S_MASTER";
-    
-    public static final String CONN_PARA_KEY_K8S_INSTANCES="CONN_PARA_KEY_K8S_INSTANCES";
-    
-    public static final String CONN_PARA_KEY_K8S_REGISTRYSECRET_CHECK="CONN_PARA_KEY_K8S_REGISTRYSECRET_CHECK";
-    
-    public static final String CONN_PARA_KEY_K8S_REGISTRYSECRET="CONN_PARA_KEY_K8S_REGISTRYSECRET";
-    
-    public static final String CONN_PARA_KEY_K8S_IMAGE="CONN_PARA_KEY_K8S_IMAGE";
-    
-    public static final String CONN_PARA_KEY_K8S_NAMESPACE="CONN_PARA_KEY_K8S_NAMESPACE";
-    
-    public static final String CONN_PARA_KEY_K8S_SERVICEACCOUNT="CONN_PARA_KEY_K8S_SERVICEACCOUNT";
-    
-    public static final String CONN_PARA_KEY_K8S_DISTUPLOAD="CONN_PARA_KEY_K8S_DISTUPLOAD";
-    
-    public static final String CONN_PARA_KEY_K8S_S3BUCKET="CONN_PARA_KEY_K8S_S3BUCKET";
-    
-    public static final String CONN_PARA_KEY_K8S_S3FOLDER="CONN_PARA_KEY_K8S_S3FOLDER";
-    
-    public static final String CONN_PARA_KEY_K8S_S3CREDENTIALS="CONN_PARA_KEY_K8S_S3CREDENTIALS";
-    
-    public static final String CONN_PARA_KEY_K8S_S3ACCESSKEY="CONN_PARA_KEY_K8S_S3ACCESSKEY";
-    
-    public static final String CONN_PARA_KEY_K8S_S3SECRETKEY="CONN_PARA_KEY_K8S_S3SECRETKEY";
-    
-    public static final String CONN_PARA_KEY_K8S_BLOBACCOUNT="CONN_PARA_KEY_K8S_BLOBACCOUNT";
-    
-    public static final String CONN_PARA_KEY_K8S_BLOBCONTAINER="CONN_PARA_KEY_K8S_BLOBCONTAINER";
-    
-    public static final String CONN_PARA_KEY_K8S_BLOBSECRETKEY="CONN_PARA_KEY_K8S_BLOBSECRETKEY";
-    
-    public static final String CONN_PARA_KEY_K8S_AZUREACCOUNT="CONN_PARA_KEY_K8S_AZUREACCOUNT";
-    
-    public static final String CONN_PARA_KEY_K8S_AZURECREDENTIALS="CONN_PARA_KEY_K8S_AZURECREDENTIALS";
-    
-    public static final String CONN_PARA_KEY_K8S_AZURECONTAINER="CONN_PARA_KEY_K8S_AZURECONTAINER";
-    
-    public static final String CONN_PARA_KEY_K8S_AZURESECRETKEY="CONN_PARA_KEY_K8S_AZURESECRETKEY";
-    
-    public static final String CONN_PARA_KEY_K8S_AZUREAADKEY="CONN_PARA_KEY_K8S_AZUREAADKEY";
-    
-    public static final String CONN_PARA_KEY_K8S_AZUREAADCLIENTID="CONN_PARA_KEY_K8S_AZUREAADCLIENTID";
-    
-    public static final String CONN_PARA_KEY_K8S_AZUREAADDIRECTORYID="CONN_PARA_KEY_K8S_AZUREAADDIRECTORYID";
-    
     /**
      * Override hadoop configuration
      */

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

@@ -150,11 +150,10 @@ public enum EDatabaseVersion4Drivers {
     REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "redshift", "REDSHIFT", //$NON-NLS-1$ //$NON-NLS-2$
             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.55.1083.jar", "antlr4-runtime-4.8-1.jar", "jackson-core-2.13.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                    "jackson-databind-2.13.4.2.jar", "jackson-annotations-2.13.4.jar", "httpcore-4.4.13.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                    "httpclient-4.5.13.jar", "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$//$NON-NLS-4$
-                    "aws-java-sdk-redshift-internal-1.12.x.jar", "aws-java-sdk-core-1.12.315.jar", //$NON-NLS-1$ //$NON-NLS-2$
-                    "aws-java-sdk-sts-1.12.315.jar", "aws-java-sdk-redshift-1.12.315.jar", "jmespath-java-1.12.315.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.13.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                    "jackson-databind-2.13.4.2.jar", "jackson-annotations-2.13.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$
+                    "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$
 

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

@@ -153,52 +153,6 @@ public enum EHadoopProperties {
     DATABRICKS_TOKEN,
     
     DATABRICKS_DBFS_DEP_FOLDER,
-
-    K8S_SUBMIT_MODE,
-    
-    K8S_MASTER,
-    
-    K8S_INSTANCES,
-    
-    K8S_REGISTRYSECRET,
-    
-    K8S_IMAGE,
-    
-    K8S_NAMESPACE,
-    
-    K8S_SERVICEACCOUNT,
-    
-    K8S_DISTUPLOAD,
-    
-    K8S_S3BUCKET,
-    
-    K8S_S3FOLDER,
-    
-    K8S_S3CREDENTIALS,
-    
-    K8S_S3ACCESSKEY,
-    
-    K8S_S3SECRETKEY,
-    
-    K8S_BLOBACCOUNT,
-    
-    K8S_BLOBCONTAINER,
-    
-    K8S_BLOBSECRETKEY,
-    
-    K8S_AZUREACCOUNT,
-    
-    K8S_AZURECREDENTIALS,
-    
-    K8S_AZURECONTAINER,
-    
-    K8S_AZURESECRETKEY,
-    
-    K8S_AZUREAADKEY,
-    
-    K8S_AZUREAADCLIENTID,
-    
-    K8S_AZUREAADDIRECTORYID,
     
     DATABRICKS_NODE_TYPE,
     

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

@@ -13,7 +13,7 @@
 package org.talend.core.pendo;
 
 import org.talend.core.pendo.properties.IPendoDataProperties;
-import org.talend.core.service.ICoreTisRuntimeService;
+import org.talend.core.service.IRemoteService;
 
 /**
  * DOC jding  class global comment. Detailled comment
@@ -22,11 +22,11 @@ public class PendoDataTrackFactory {
 
     private static PendoDataTrackFactory instance;
 
-    private static ICoreTisRuntimeService coreRuntimeService;
+    private static IRemoteService remoteService;
 
     static {
         instance = new PendoDataTrackFactory();
-        coreRuntimeService = ICoreTisRuntimeService.get();
+        remoteService = IRemoteService.get();
     }
 
     private PendoDataTrackFactory() {
@@ -37,35 +37,35 @@ public class PendoDataTrackFactory {
     }
 
     public boolean isTrackSendAvailable() throws Exception {
-        if (coreRuntimeService != null) {
-            return coreRuntimeService.isPendoTrackAvailable();
+        if (remoteService != null) {
+            return remoteService.isPendoTrackAvailable();
         }
         return false;
     }
 
     public void sendTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception {
-        if (coreRuntimeService != null) {
-            coreRuntimeService.sendPendoTrackData(event, properties);
+        if (remoteService != null) {
+            remoteService.sendPendoTrackData(event, properties);
         }
     }
 
     public void sendProjectLoginTrack() {
-        if (coreRuntimeService != null) {
-            AbstractPendoTrackManager pendoProjectLoginManager = coreRuntimeService.getPendoProjectLoginManager();
+        if (remoteService != null) {
+            AbstractPendoTrackManager pendoProjectLoginManager = remoteService.getPendoProjectLoginManager();
             pendoProjectLoginManager.sendTrackToPendo();
         }
     }
 
     public void sendGenericTrack(TrackEvent event, IPendoDataProperties properties) {
-        if (coreRuntimeService != null) {
-            AbstractPendoTrackManager genericManager = coreRuntimeService.getPendoGenericManager(event, properties);
+        if (remoteService != null) {
+            AbstractPendoTrackManager genericManager = remoteService.getPendoGenericManager(event, properties);
             genericManager.sendTrackToPendo();
         }
     }
 
     public String getTmcUser(String url, String token) {
-        if (coreRuntimeService != null) {
-            return coreRuntimeService.getTmcUser(url, token);
+        if (remoteService != null) {
+            return remoteService.getTmcUser(url, token);
         }
         return "";
     }

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

@@ -656,7 +656,3 @@ AnalysisReportAccessDialog.shellTitle=Analyse du projet
 AnalysisReportAccessDialog.generateSuccess=Analyse du projet termin\u00E9e.
 AnalysisReportAccessDialog.completeReportAvailable=Consulter le rapport
 AnalysisReportAccessDialog.accessReport=ici
-AbstractPomTemplateProjectSettingPage.defaultTabLabel=Par d\u00E9faut
-AbstractPomTemplateProjectSettingPage.customTabLabel=Personnalis\u00E9
-AbstractPomTemplateProjectSettingPage.previewButton=Aper\u00E7u
-AbstractPomTemplateProjectSettingPage.learnMoreLink=En savoir plus

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

@@ -637,8 +637,8 @@ DynamicPlugin.addExtension.empty=ExtensionPoint\u307E\u305F\u306FID\u304C\u7A7A\
 BigDataBasicUtil.loadDynamicDistribution.IDynamicDistributionManager.notFound={0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
 TalendLibsServerManager.connectUserLibraryFailureMessage=\u7BA1\u7406\u8005\u30E2\u30FC\u30C9\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u304C\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3002{0}\u3078\u306E\u63A5\u7D9A\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F
 TalendLibsServerManager.cannotGetUserLibraryServer=\u30EA\u30E2\u30FC\u30C8\u7BA1\u7406\u8005\u304B\u3089\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u30B5\u30FC\u30D0\u30FC\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093
-MigrationReportAccessDialog.title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u9805\u76EE\u3092\u79FB\u884C
-MigrationReportAccessDialog.migrateSuccess=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u9805\u76EE\u304C\u6B63\u3057\u304F\u79FB\u884C\u3055\u308C\u307E\u3057\u305F\u3002
+MigrationReportAccessDialog.title=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30A2\u30A4\u30C6\u30E0\u3092\u79FB\u884C
+MigrationReportAccessDialog.migrateSuccess=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30A2\u30A4\u30C6\u30E0\u304C\u6B63\u3057\u304F\u79FB\u884C\u3055\u308C\u307E\u3057\u305F\u3002
 MigrationReportAccessDialog.completeReportAvailable=\u30EC\u30DD\u30FC\u30C8\u3092\u30C1\u30A7\u30C3\u30AF
 MigrationReportAccessDialog.accessReport=\u3053\u3061\u3089
 MigrationReportAccessDialog.provideAnalysisTool=\u4ECA\u3059\u3050\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790\u3092\u5B9F\u884C\u3057\u3066\u3001\u79FB\u884C\u3055\u308C\u305F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u5206\u6790\u3067\u304D\u307E\u3059\u3002\u3053\u306E\u8A66\u9A13\u7684\u306A\u30C4\u30FC\u30EB\u306B\u3088\u3063\u3066\u3001\u4EE5\u4E0B\u304C\u542B\u307E\u308C\u308B\u30EC\u30DD\u30FC\u30C8\u304C\u751F\u6210\u3055\u308C\u307E\u3059:
@@ -656,7 +656,3 @@ AnalysisReportAccessDialog.shellTitle=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206
 AnalysisReportAccessDialog.generateSuccess=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5206\u6790\u304C\u6B63\u3057\u304F\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002
 AnalysisReportAccessDialog.completeReportAvailable=\u30EC\u30DD\u30FC\u30C8\u3092\u30C1\u30A7\u30C3\u30AF
 AnalysisReportAccessDialog.accessReport=\u3053\u3061\u3089
-AbstractPomTemplateProjectSettingPage.defaultTabLabel=\u30C7\u30D5\u30A9\u30EB\u30C8
-AbstractPomTemplateProjectSettingPage.customTabLabel=\u30AB\u30B9\u30BF\u30E0
-AbstractPomTemplateProjectSettingPage.previewButton=\u30D7\u30EC\u30D3\u30E5\u30FC
-AbstractPomTemplateProjectSettingPage.learnMoreLink=\u8A73\u7D30

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

@@ -656,7 +656,3 @@ AnalysisReportAccessDialog.shellTitle=\u5DE5\u7A0B\u5206\u6790
 AnalysisReportAccessDialog.generateSuccess=\u5DE5\u7A0B\u5206\u6790\u6210\u529F\u5B8C\u6210\u3002
 AnalysisReportAccessDialog.completeReportAvailable=\u8BF7\u68C0\u67E5\u62A5\u544A
 AnalysisReportAccessDialog.accessReport=\u6B64\u5904
-AbstractPomTemplateProjectSettingPage.defaultTabLabel=\u9ED8\u8BA4
-AbstractPomTemplateProjectSettingPage.customTabLabel=\u81EA\u5B9A\u4E49
-AbstractPomTemplateProjectSettingPage.previewButton=\u9884\u89C8
-AbstractPomTemplateProjectSettingPage.learnMoreLink=\u4E86\u89E3\u66F4\u591A

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

@@ -21,6 +21,10 @@ 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;
@@ -39,13 +43,11 @@ public interface ICloudSignOnService extends IService {
     
     boolean isNeedShowSSOPage();
     
-    public boolean showReloginDialog();
+    public void showReloginDialog();
     
     public boolean isReloginDialogRunning();
     
     public void reload();
-    
-    public boolean isRelogined4CurrentTask(String clazz);
 
     public static ICloudSignOnService get() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ICloudSignOnService.class)) {

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

@@ -1,45 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2023 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.core.pendo.AbstractPendoTrackManager;
-import org.talend.core.pendo.TrackEvent;
-import org.talend.core.pendo.properties.IPendoDataProperties;
-
-/**
- * DOC jding  class global comment. Detailled comment
- */
-public interface ICoreTisRuntimeService extends IService {
-
-    String getTmcUser(String url, String token);
-
-    AbstractPendoTrackManager getPendoProjectLoginManager();
-
-    AbstractPendoTrackManager getPendoGenericManager(TrackEvent event, IPendoDataProperties peoperties);
-
-    boolean isPendoTrackAvailable() throws Exception;
-
-    void sendPendoTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception;
-
-    void sendPTPTrackData(String componentName, String componentUniqName, String jobId, String data);
-
-    static ICoreTisRuntimeService get() {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreTisRuntimeService.class)) {
-            return GlobalServiceRegister.getDefault().getService(ICoreTisRuntimeService.class);
-        }
-        return null;
-    }
-
-}

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

@@ -17,6 +17,9 @@ import org.talend.commons.exception.PersistenceException;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.nexus.ArtifactRepositoryBean;
+import org.talend.core.pendo.AbstractPendoTrackManager;
+import org.talend.core.pendo.TrackEvent;
+import org.talend.core.pendo.properties.IPendoDataProperties;
 import org.talend.utils.json.JSONException;
 import org.talend.utils.json.JSONObject;
 
@@ -36,6 +39,16 @@ public interface IRemoteService extends IService {
 
     boolean isAuthorized(String value);
     
+    boolean isPendoTrackAvailable() throws Exception;
+
+    void sendPendoTrackData(TrackEvent event, IPendoDataProperties properties) throws Exception;
+
+    AbstractPendoTrackManager getPendoProjectLoginManager();
+
+    AbstractPendoTrackManager getPendoGenericManager(TrackEvent event, IPendoDataProperties peoperties);
+
+    String getTmcUser(String url, String token);
+
     public boolean isCloudConnection();
     
     public static IRemoteService get() {

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

@@ -12,23 +12,14 @@
 // ============================================================================
 package org.talend.core.service;
 
-import java.net.HttpURLConnection;
 import java.net.URI;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.equinox.p2.repository.IRepository;
-import org.eclipse.equinox.security.storage.ISecurePreferences;
-import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.general.Project;
@@ -210,12 +201,6 @@ public interface IStudioLiteP2Service extends IService {
     }
 
     public static interface UpdateSiteConfig {
-        
-        public static final int DEFAULT_TIMEOUT = 4000;
-
-        public static final String PROTOCOL_HTTP = "http";
-
-        public static final String PROTOCOL_HTTPS = "https";
 
         boolean isReleaseEditable();
 
@@ -254,79 +239,6 @@ public interface IStudioLiteP2Service extends IService {
         boolean isOverwriteTmcUpdateSettings(IProgressMonitor monitor) throws Exception;
 
         void overwriteTmcUpdateSettings(IProgressMonitor monitor, boolean overwrite) throws Exception;
-        
-        void enableBasicAuth(String uri, boolean enable) throws Exception;
-        
-        boolean isEnabledBasicAuth(String uri) throws Exception;
-        
-        public static boolean requireCredentials(URI uri, String nameAndPwd) throws Exception {
-            String scheme = uri.getScheme();
-            if (StringUtils.isEmpty(scheme) || (!StringUtils.equals(scheme, PROTOCOL_HTTP) && !StringUtils.equals(scheme, PROTOCOL_HTTPS))) {
-                return false;
-            }
-            URL url = new URL(uri.toString() + "/p2.index");
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-            conn.setConnectTimeout(DEFAULT_TIMEOUT);
-            conn.setReadTimeout(DEFAULT_TIMEOUT);
-            conn.setRequestMethod("HEAD");
-            if (!StringUtils.isEmpty(nameAndPwd)) {
-                nameAndPwd = Base64.encodeBase64String(nameAndPwd.getBytes());
-                conn.addRequestProperty("Authorization", "Basic " + nameAndPwd);
-            }
-
-            int responseCode = conn.getResponseCode();
-            if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED || responseCode == HttpURLConnection.HTTP_FORBIDDEN) {
-                return true;
-            }
-
-            return false;
-        }
-
-        public static void saveCredentialsIntoSecureStore(URI uri, String uname, String pwd) throws Exception {
-            ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
-            String nodeKey = URLEncoder.encode(uri.getHost(), StandardCharsets.UTF_8.name());
-
-            String nodeName = IRepository.PREFERENCE_NODE + '/' + nodeKey;
-            ISecurePreferences prefNode = null;
-
-            prefNode = securePreferences.node(nodeName);
-            prefNode.put(IRepository.PROP_USERNAME, uname, true);
-            prefNode.put(IRepository.PROP_PASSWORD, pwd, true);
-            securePreferences.flush();
-        }
-        
-        public static String[] loadCredentialsFromSecureStore(URI uri) throws Exception {
-            ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
-            String nodeKey = URLEncoder.encode(uri.getHost(), StandardCharsets.UTF_8.name());
-
-            String nodeName = IRepository.PREFERENCE_NODE + '/' + nodeKey;
-            ISecurePreferences prefNode = null;
-
-            String[] namePwd = new String[2];
-
-            if (!securePreferences.nodeExists(nodeName)) {
-                return null;
-            }
-            prefNode = securePreferences.node(nodeName);
-
-            namePwd[0] = prefNode.get(IRepository.PROP_USERNAME, "");
-            namePwd[1] = prefNode.get(IRepository.PROP_PASSWORD, "");
-
-            return namePwd;
-        }
-        
-        public static void deleteCredentialsFromSecureStore(URI uri) throws Exception {
-            ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
-            String nodeKey = URLEncoder.encode(uri.getHost(), StandardCharsets.UTF_8.name());
-
-            String nodeName = IRepository.PREFERENCE_NODE + '/' + nodeKey;
-
-            if (securePreferences.nodeExists(nodeName)) {
-                securePreferences.remove(nodeName);
-                securePreferences.flush();
-            }
-        }
-
 
     }
     

main/plugins/org.talend.core.ui/src/main/java/messages.properties

@@ -560,7 +560,6 @@ ContextNebulaComposite.ContextsUnAvailable=Context view is not available.
 ContextNebulaComposite.ContextGroupLabel=Default context environment
 ContextTreeTable.PromptToolTips=activate prompt on variable
 ContextValidator.ParameterNotValid=parameter name is not valid
-ContextValidator.ParameterValueNotMatch=Type/value mismatch: the value of a variable must match its type
 WorkspaceMnu.switch.text=Switch &Workspace
 WorkspaceMnu.switch.tooltip=Open Workspace
 WorkspaceMnu.choose.text=&Choose...

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

@@ -321,7 +321,7 @@ repository.metadataFileRegexp=\u6B63\u898F\u8868\u73FE\u30D5\u30A1\u30A4\u30EB
 repository.metadataFileRegexp.alias=REGX
 repository.metadataFileXml=XML\u30D5\u30A1\u30A4\u30EB
 repository.metadataFileXml.alias=XML
-repository.metadataGenericSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE
+repository.metadataGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE
 repository.metadataGenericSchema.alias=GENERIC
 repository.metadataLDAPSchema=LDAP
 repository.metadataLDAPSchema.alias=LDAP

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextTreeTable.java

@@ -59,7 +59,6 @@ import org.eclipse.nebula.widgets.nattable.hideshow.RowHideShowLayer;
 import org.eclipse.nebula.widgets.nattable.hideshow.command.ColumnHideCommand;
 import org.eclipse.nebula.widgets.nattable.layer.DataLayer;
 import org.eclipse.nebula.widgets.nattable.layer.cell.ColumnOverrideLabelAccumulator;
-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
 import org.eclipse.nebula.widgets.nattable.layer.config.DefaultColumnHeaderStyleConfiguration;
 import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
 import org.eclipse.nebula.widgets.nattable.painter.layer.NatGridLayerPainter;
@@ -112,7 +111,6 @@ import org.talend.core.ui.context.nattableTree.ContextNatTableStyleConfiguration
 import org.talend.core.ui.context.nattableTree.ContextNatTableUtils;
 import org.talend.core.ui.context.nattableTree.ContextParaModeChangeMenuConfiguration;
 import org.talend.core.ui.context.nattableTree.ContextRowDataListFixture;
-import org.talend.core.ui.context.nattableTree.ContextValueLabelAccumulator;
 import org.talend.core.ui.context.nattableTree.ExtendedContextColumnPropertyAccessor;
 import org.talend.core.ui.i18n.Messages;
 import org.talend.repository.ProjectManager;
@@ -274,7 +272,7 @@ public class ContextTreeTable {
             final GridLayer gridLayer = new GridLayer(viewportLayer, sortHeaderLayer, rowHeaderLayer, cornerLayer);
 
             // config the column edit configuration
-            ContextValueLabelAccumulator labelAccumulator = new ContextValueLabelAccumulator(bodyDataLayer, bodyDataProvider, manager.getContextManager(), columnGroupModel);
+            ColumnOverrideLabelAccumulator labelAccumulator = new ColumnOverrideLabelAccumulator(bodyDataLayer);
             bodyDataLayer.setConfigLabelAccumulator(labelAccumulator);
             registerColumnLabels(labelAccumulator, ContextRowDataListFixture.getContexts(manager.getContextManager()));
 
@@ -806,32 +804,12 @@ public class ContextTreeTable {
             if (cellValue instanceof Boolean) {
                 return new Point(col, row);
             }
-            ILayerCell cell = this.nt.getCellByPosition(col, row);
-            if (cell != null && cell.getConfigLabels() != null
-                    && cell.getConfigLabels().contains(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE)
-                    && cell.getConfigLabels().contains(ContextTableConstants.COLUMN_CONTEXT_VALUE)) {
-                return new Point(col, row);
-            }
             return null;
         }
 
         @Override
         protected String getText(Event event) {
-            int col = this.nt.getColumnPositionByX(event.x);
-            int row = this.nt.getRowPositionByY(event.y);
-
-            Object cellValue = this.nt.getDataValueByPosition(col, row);
-
-            if (cellValue instanceof Boolean) {
-                return Messages.getString("ContextTreeTable.PromptToolTips");
-            }
-            ILayerCell cell = this.nt.getCellByPosition(col, row);
-            if (cell != null && cell.getConfigLabels() != null
-                    && cell.getConfigLabels().contains(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE)
-                    && cell.getConfigLabels().contains(ContextTableConstants.COLUMN_CONTEXT_VALUE)) {
-                return Messages.getString("ContextValidator.ParameterValueNotMatch");
-            }
-            return null;
+            return Messages.getString("ContextTreeTable.PromptToolTips"); //$NON-NLS-1$
         }
 
         @Override

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/model/table/ContextTableConstants.java

@@ -28,10 +28,6 @@ public class ContextTableConstants {
     public static final String COLUMN_PROMPT_PROPERTY = "Prompt label"; //$NON-NLS-1$
 
     public static final String COLUMN_CONTEXT_VALUE = "Value"; //$NON-NLS-1$
-    
-    public static final String LABEL_VALUE_NOT_MATCH_TYPE = "LABEL_VALUE_NOT_MATCH_TYPE";
-    
-    public static final String LABEL_CHANGED_FORCEGROUND = "LABEL_CHANGED_FORCEGROUND";
-    
+
     public static final int DEFAULT_COLUMN_COUNT = 8;
 }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextAutoResizeTextPainter.java

@@ -16,7 +16,6 @@ import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
 import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
 import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
 import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
-import org.eclipse.nebula.widgets.nattable.style.CellStyleProxy;
 import org.eclipse.nebula.widgets.nattable.style.IStyle;
 import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
 import org.eclipse.swt.graphics.GC;
@@ -44,8 +43,12 @@ public class ContextAutoResizeTextPainter extends TextPainter {
     @Override
     public void setupGCFromConfig(GC gc, IStyle cellStyle) {
         super.setupGCFromConfig(gc, cellStyle);
-        if (containsRowName) {
+        if (cellStyle.getAttributeValue(CellStyleAttributes.FOREGROUND_COLOR).equals(GUIHelper.COLOR_RED)) {
+            gc.setForeground(GUIHelper.COLOR_BLACK);
+        } else if (containsRowName) {
             gc.setForeground(GUIHelper.COLOR_RED);
+        } else if (changeBackgroundColor) {
+            gc.setForeground(GUIHelper.COLOR_WIDGET_DARK_SHADOW);
         }
     }
 

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableBackGroudPainter.java

@@ -23,15 +23,12 @@ import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsData
 import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
 import org.eclipse.nebula.widgets.nattable.painter.cell.BackgroundPainter;
 import org.eclipse.nebula.widgets.nattable.painter.cell.ICellPainter;
-import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Rectangle;
 import org.talend.core.ui.context.ContextTreeTable.ContextTreeNode;
 import org.talend.core.ui.context.model.ContextTabChildModel;
 import org.talend.core.ui.context.model.ContextTabParentModel;
-import org.talend.core.ui.context.model.table.ContextTableConstants;
 import org.talend.core.ui.context.model.table.ContextTableTabParentModel;
 
 /**
@@ -52,9 +49,18 @@ public class ContextNatTableBackGroudPainter extends BackgroundPainter {
     @Override
     public void paintCell(ILayerCell cell, GC gc, Rectangle bounds, IConfigRegistry configRegistry) {
         ContextTreeNode rowNode = ((GlazedListsDataProvider<ContextTreeNode>) dataProvider).getRowObject(cell.getRowIndex());
-        if (rowNode.getTreeData() instanceof ContextTabChildModel) {
+        if (rowNode.getTreeData() instanceof ContextTableTabParentModel) {
+            ContextTableTabParentModel rowModel = (ContextTableTabParentModel) rowNode.getTreeData();
+            Boolean isRepositoryContext = rowModel.hasChildren();
+            if (isRepositoryContext) {
+                ((ContextAutoResizeTextPainter) getWrappedPainter()).setChangeBackgroundColor(true);
+            } else {
+                ((ContextAutoResizeTextPainter) getWrappedPainter()).setChangeBackgroundColor(false);
+            }
+        } else {
             ContextTabChildModel rowChildModel = (ContextTabChildModel) rowNode.getTreeData();
             if (rowChildModel != null) {
+                ((ContextAutoResizeTextPainter) getWrappedPainter()).setChangeBackgroundColor(true);
                 checkContainsRowName(rowNode, rowChildModel);
             }
         }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableConfiguration.java

@@ -137,6 +137,7 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
 
         Style cellStyleSelect = new Style();
         cellStyleSelect.setAttributeValue(CellStyleAttributes.BACKGROUND_COLOR, GUIHelper.COLOR_TITLE_INACTIVE_BACKGROUND);
+        cellStyleSelect.setAttributeValue(CellStyleAttributes.FOREGROUND_COLOR, GUIHelper.COLOR_RED);
         cellStyleSelect.setAttributeValue(CellStyleAttributes.FONT, GUIHelper.DEFAULT_FONT);
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleSelect, DisplayMode.SELECT,
                 ContextTableConstants.COLUMN_TYPE_PROPERTY);
@@ -160,15 +161,11 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
     private void registerValidateRules(IConfigRegistry configRegistry) {
         configRegistry.registerConfigAttribute(EditConfigAttributes.DATA_VALIDATOR,
                 new EventDataValidator(dataProvider, manager), DisplayMode.EDIT, ContextTableConstants.COLUMN_NAME_PROPERTY);
-        configRegistry.registerConfigAttribute(EditConfigAttributes.DATA_VALIDATOR,
-                new EventDataValueValidator(dataProvider, manager, columnGroupModel), DisplayMode.EDIT, ContextTableConstants.COLUMN_CONTEXT_VALUE);
     }
 
     private void registerErrorHandlingStrategies(IConfigRegistry configRegistry) {
         configRegistry.registerConfigAttribute(EditConfigAttributes.VALIDATION_ERROR_HANDLER, new DialogErrorHandling(),
                 DisplayMode.EDIT, ContextTableConstants.COLUMN_NAME_PROPERTY);
-        configRegistry.registerConfigAttribute(EditConfigAttributes.VALIDATION_ERROR_HANDLER, new DialogErrorHandling(),
-                DisplayMode.EDIT, ContextTableConstants.COLUMN_CONTEXT_VALUE);
     }
 
     private IEditableRule getEditRule() {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableStyleConfiguration.java

@@ -21,7 +21,6 @@ import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
 import org.eclipse.nebula.widgets.nattable.painter.cell.decorator.LineBorderDecorator;
 import org.eclipse.nebula.widgets.nattable.style.BorderStyle;
 import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
 import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;
 import org.eclipse.nebula.widgets.nattable.style.Style;
 import org.eclipse.nebula.widgets.nattable.style.VerticalAlignmentEnum;
@@ -29,7 +28,6 @@ import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.talend.commons.ui.runtime.ColorConstants;
-import org.talend.core.ui.context.model.table.ContextTableConstants;
 
 /**
  * created by ldong on Aug 26, 2014 Detailled comment
@@ -72,17 +70,9 @@ public class ContextNatTableStyleConfiguration extends AbstractRegistryConfigura
         cellStyle.setAttributeValue(CellStyleAttributes.HORIZONTAL_ALIGNMENT, hAlign);
         cellStyle.setAttributeValue(CellStyleAttributes.VERTICAL_ALIGNMENT, vAlign);
         cellStyle.setAttributeValue(CellStyleAttributes.BORDER_STYLE, borderStyle);
+
         configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyle);
-        
-        Style cellStyleValueError = new Style();
-        cellStyleValueError.setAttributeValue(CellStyleAttributes.FOREGROUND_COLOR, ColorConstants.ERROR_FONT_COLOR);
-        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleValueError, DisplayMode.NORMAL, ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
-        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleValueError, DisplayMode.SELECT, ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
-        
-        Style cellStyleChangedForceGround = new Style();
-        cellStyleChangedForceGround.setAttributeValue(CellStyleAttributes.FOREGROUND_COLOR, GUIHelper.COLOR_WIDGET_DARK_SHADOW);
-        configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleChangedForceGround, DisplayMode.NORMAL, ContextTableConstants.LABEL_CHANGED_FORCEGROUND);        
-        
+
         configRegistry.registerConfigAttribute(CellConfigAttributes.DISPLAY_CONVERTER, new DefaultDisplayConverter());
 
     }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextValueLabelAccumulator.java

@@ -1,81 +0,0 @@
-// ============================================================================
-//
-// 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.ui.context.nattableTree;
-
-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
-import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsDataProvider;
-import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel;
-import org.eclipse.nebula.widgets.nattable.layer.ILayer;
-import org.eclipse.nebula.widgets.nattable.layer.LabelStack;
-import org.eclipse.nebula.widgets.nattable.layer.cell.ColumnOverrideLabelAccumulator;
-import org.talend.core.model.process.IContextManager;
-import org.talend.core.model.process.IContextParameter;
-import org.talend.core.ui.context.ContextTreeTable.ContextTreeNode;
-import org.talend.core.ui.context.model.ContextTabChildModel;
-import org.talend.core.ui.context.model.table.ContextTableConstants;
-import org.talend.core.ui.context.model.table.ContextTableTabParentModel;
-import org.talend.core.ui.utils.ContextTypeValidator;
-
-
-public class ContextValueLabelAccumulator extends ColumnOverrideLabelAccumulator {
-
-    private IDataProvider dataProvider;
-    private ColumnGroupModel columnGroupModel;
-    private IContextManager manager;
-
-    public ContextValueLabelAccumulator(ILayer layer, IDataProvider dataProvider, IContextManager manager, ColumnGroupModel columnGroupModel) {
-        super(layer);
-        this.dataProvider = dataProvider;
-        this.manager = manager;
-        this.columnGroupModel = columnGroupModel;
-    }
-
-   
-    @Override
-    public void accumulateConfigLabels(LabelStack configLabels, int columnPosition, int rowPosition) {
-        super.accumulateConfigLabels(configLabels, columnPosition, rowPosition);
-        boolean isAddedValueNotMatchStyle = false;        
-        ContextTreeNode rowNode = ((GlazedListsDataProvider<ContextTreeNode>) dataProvider).getList().get(rowPosition);
-        if (configLabels.contains(ContextTableConstants.COLUMN_CONTEXT_VALUE)) {
-            if (columnGroupModel != null && columnGroupModel.isPartOfAGroup(columnPosition)) {
-                String columnGroupName = columnGroupModel.getColumnGroupByIndex(columnPosition).getName();
-                IContextParameter realPara = ContextNatTableUtils.getRealParameter(manager, columnGroupName, rowNode.getTreeData());
-                if (realPara != null) {
-                    boolean isValid = ContextTypeValidator.isMatchType(realPara.getType(), realPara.getValue());
-                    if (isValid) {
-                        configLabels.remove(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
-                    } else {
-                        configLabels.addLabel(ContextTableConstants.LABEL_VALUE_NOT_MATCH_TYPE);
-                        isAddedValueNotMatchStyle = true;
-                    }
-                }
-            }
-        }
-        
-        if (!isAddedValueNotMatchStyle) {
-            if (rowNode.getTreeData() instanceof ContextTableTabParentModel) {
-                ContextTableTabParentModel rowModel = (ContextTableTabParentModel) rowNode.getTreeData();
-                Boolean isRepositoryContext = rowModel.hasChildren();
-                if (isRepositoryContext) {
-                    configLabels.addLabel(ContextTableConstants.LABEL_CHANGED_FORCEGROUND);
-                } else {
-                }
-            } else {
-                ContextTabChildModel rowChildModel = (ContextTabChildModel) rowNode.getTreeData();
-                if (rowChildModel != null) {
-                    configLabels.addLabel(ContextTableConstants.LABEL_CHANGED_FORCEGROUND);
-                }
-            }
-        }
-    }
-}

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextValuesNatText.java

@@ -26,8 +26,6 @@ import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -274,28 +272,4 @@ public class ContextValuesNatText extends Composite {
     public Button getButton() {
         return this.button;
     }
-
-    @Override
-    public void setBackground(Color color) {
-        super.setBackground(color);
-        if (text != null && !text.isDisposed()) {
-            text.setBackground(color);
-        }
-    }
-
-    @Override
-    public void setFont(Font font) {
-        super.setFont(font);
-        if (text != null && !text.isDisposed()) {
-            text.setFont(font);
-        }
-    }
-
-    @Override
-    public void setForeground(Color color) {
-        super.setForeground(color);
-        if (text != null && !text.isDisposed()) {
-            text.setForeground(color);
-        }
-    }
 }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/CustomTextCellEditor.java

@@ -12,17 +12,9 @@
 // ============================================================================
 package org.talend.core.ui.context.nattableTree;
 
-import org.eclipse.nebula.widgets.nattable.edit.EditConfigAttributes;
-import org.eclipse.nebula.widgets.nattable.edit.config.RenderErrorHandling;
 import org.eclipse.nebula.widgets.nattable.edit.editor.AbstractCellEditor;
-import org.eclipse.nebula.widgets.nattable.edit.editor.ControlDecorationProvider;
-import org.eclipse.nebula.widgets.nattable.edit.editor.IEditErrorHandler;
 import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum;
-import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
 import org.eclipse.nebula.widgets.nattable.style.IStyle;
-import org.eclipse.nebula.widgets.nattable.style.Style;
-import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
 import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
@@ -60,18 +52,6 @@ public class CustomTextCellEditor extends AbstractCellEditor {
      * if password, the value will be * always. should find out the real value.
      */
     private Object recordOriginalCanonicalValue;
-    
-    protected final ControlDecorationProvider decorationProvider = new ControlDecorationProvider();
-
-    /**
-     * The {@link IEditErrorHandler} that is used for showing conversion errors
-     * on typing into this editor. By default this is the
-     * {@link RenderErrorHandling} which will render the content in the editor
-     * red to indicate a conversion error.
-     */
-    private IEditErrorHandler inputConversionErrorHandler = new RenderErrorHandling(this.decorationProvider);
-    
-    private IEditErrorHandler inputValidationErrorHandler = new RenderErrorHandling(this.decorationProvider);
 
     public CustomTextCellEditor(IContextParameter realPara, IStyle cellStyle, boolean commitOnUpDown, boolean moveSelectionOnEnter) {
         this.realPara = realPara;
@@ -126,26 +106,9 @@ public class CustomTextCellEditor extends AbstractCellEditor {
                     }
                 }
             }
-            @Override
-            public void keyReleased(KeyEvent e) {
-                try {
-                    // always do the conversion
-                    Object canonicalValue = getCanonicalValue(CustomTextCellEditor.this.inputConversionErrorHandler);
-                    // and always do the validation, even if for committing the
-                    // validation should be skipped, on editing
-                    // a validation failure should be made visible
-                    // otherwise there would be no need for validation!
-                    validateCanonicalValue(canonicalValue, CustomTextCellEditor.this.inputValidationErrorHandler);
-                } catch (Exception ex) {
-                    // do nothing as exceptions caused by conversion or
-                    // validation are handled already we just need this catch
-                    // block for stopping the process if conversion failed with
-                    // an exception
-                }
-            }
+
         });
 
-        
         // text.addFocusListener(new FocusAdapter() {
         //
         // @Override
@@ -201,30 +164,6 @@ public class CustomTextCellEditor extends AbstractCellEditor {
         }
 
         this.buttonText = (ContextValuesNatText) createEditorControl(parentComp);
-        if (this.inputConversionErrorHandler instanceof RenderErrorHandling) {
-            IStyle conversionErrorStyle = this.configRegistry.getConfigAttribute(
-                    EditConfigAttributes.CONVERSION_ERROR_STYLE,
-                    DisplayMode.EDIT,
-                    this.labelStack);
-
-            ((RenderErrorHandling) this.inputConversionErrorHandler).setErrorStyle(conversionErrorStyle);
-        }
-
-        if (this.inputValidationErrorHandler instanceof RenderErrorHandling) {
-            IStyle validationErrorStyle = this.configRegistry.getConfigAttribute(
-                    EditConfigAttributes.VALIDATION_ERROR_STYLE,
-                    DisplayMode.EDIT,
-                    this.labelStack);
-
-            if (validationErrorStyle == null) {
-                validationErrorStyle = new Style();
-                validationErrorStyle.setAttributeValue(
-                        CellStyleAttributes.FOREGROUND_COLOR,
-                        GUIHelper.COLOR_RED);
-            }
-
-            ((RenderErrorHandling) this.inputValidationErrorHandler).setErrorStyle(validationErrorStyle);
-        }
         // use the real value.
         setCanonicalValue(this.recordOriginalCanonicalValue);
 
@@ -255,24 +194,4 @@ public class CustomTextCellEditor extends AbstractCellEditor {
         this.freeEdit = freeEdit;
     }
 
-    
-    public IEditErrorHandler getInputConversionErrorHandler() {
-        return inputConversionErrorHandler;
-    }
-
-    
-    public void setInputConversionErrorHandler(IEditErrorHandler inputConversionErrorHandler) {
-        this.inputConversionErrorHandler = inputConversionErrorHandler;
-    }
-
-    
-    public IEditErrorHandler getInputValidationErrorHandler() {
-        return inputValidationErrorHandler;
-    }
-
-    
-    public void setInputValidationErrorHandler(IEditErrorHandler inputValidationErrorHandler) {
-        this.inputValidationErrorHandler = inputValidationErrorHandler;
-    }
-    
 }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/EventDataValueValidator.java

@@ -1,55 +0,0 @@
-// ============================================================================
-//
-// 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.ui.context.nattableTree;
-
-import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
-import org.eclipse.nebula.widgets.nattable.data.validate.DataValidator;
-import org.eclipse.nebula.widgets.nattable.data.validate.ValidationFailedException;
-import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsDataProvider;
-import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel;
-import org.talend.core.model.process.IContextManager;
-import org.talend.core.model.process.IContextParameter;
-import org.talend.core.ui.context.ContextTreeTable.ContextTreeNode;
-import org.talend.core.ui.i18n.Messages;
-import org.talend.core.ui.utils.ContextTypeValidator;
-
-public class EventDataValueValidator extends DataValidator {
-
-    private ColumnGroupModel columnGroupModel;
-    private IDataProvider dataProvider;
-
-    private IContextManager manager;
-
-    EventDataValueValidator(IDataProvider bodyDataProvider, IContextManager manager, ColumnGroupModel columnGroupModel) {
-        this.dataProvider = bodyDataProvider;
-        this.manager = manager;
-        this.columnGroupModel = columnGroupModel;
-    }
-
-    @Override
-    public boolean validate(int columnIndex, int rowIndex, Object newValue) {
-        boolean isValid = true;
-        ContextTreeNode rowNode = ((GlazedListsDataProvider<ContextTreeNode>) dataProvider).getList().get(rowIndex);
-        if (columnGroupModel != null && columnGroupModel.isPartOfAGroup(columnIndex)) {
-            String columnGroupName = columnGroupModel.getColumnGroupByIndex(columnIndex).getName();
-            IContextParameter realPara = ContextNatTableUtils.getRealParameter(manager, columnGroupName, rowNode.getTreeData());
-            if (realPara != null) {
-                isValid = ContextTypeValidator.isMatchType(realPara.getType(), newValue);
-                if (!isValid) {
-                    throw new ValidationFailedException(Messages.getString("ContextValidator.ParameterValueNotMatch")); //$NON-NLS-1$
-                }   
-            }
-        }
-        return isValid;
-    }
-}

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/proposal/RoutinesFunctionProposal.java

@@ -78,7 +78,6 @@ public class RoutinesFunctionProposal implements IContentProposal {
         message += Messages.getString("RoutinesFunctionProposal.CreatedBy.v1");
         message += Messages.getString("RoutinesFunctionProposal.ReturnType.v1");
         message += Messages.getString("RoutinesFunctionProposal.VariableName.v1");
-        message = message.replaceAll("\n", System.getProperty("line.separator", "\n")); // for display on Windows platform
 
         MessageFormat format = new MessageFormat(message);
         Object[] args = new Object[] { function.getDescription(),

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/utils/ContextTypeValidator.java

@@ -1,89 +0,0 @@
-// ============================================================================
-//
-// 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.ui.utils;
-
-import org.apache.commons.lang3.StringUtils;
-import org.talend.designer.core.model.utils.emf.talendfile.ContextParameterType;
-
-public class ContextTypeValidator {
-
-    public static boolean isMatchType(ContextParameterType contextParam) {
-        return isMatchType(contextParam.getType(), contextParam.getValue());
-    }
-
-    public static boolean isMatchType(String type, Object objValue) {
-        String strValue = null;
-        if (objValue == null) {
-            return true;
-        }
-        if (objValue instanceof String) {
-            strValue = (String) objValue;
-        }
-        if (StringUtils.isEmpty(strValue)) {
-            return true;
-        }
-        boolean isValid = true;
-        switch (type) {
-        case "id_Integer": {
-            try {
-                ParserUtils.parseTo_int(strValue);
-            } catch (NumberFormatException ex) {
-                isValid = false;
-            }
-            break;
-        }
-        case "id_Double": {
-            try {
-                ParserUtils.parseTo_double(strValue);
-            } catch (NumberFormatException ex) {
-                isValid = false;
-            }
-            break;
-        }
-        case "id_Float": {
-            try {
-                ParserUtils.parseTo_float(strValue);
-            } catch (NumberFormatException ex) {
-                isValid = false;
-            }
-            break;
-        }
-        case "id_BigDecimal": {
-            try {
-                ParserUtils.parseTo_BigDecimal(strValue);
-            } catch (NumberFormatException ex) {
-                isValid = false;
-            }
-            break;
-        }
-        case "id_Long": {
-            try {
-                ParserUtils.parseTo_long(strValue);
-            } catch (NumberFormatException ex) {
-                isValid = false;
-            }
-            break;
-        }
-
-        case "id_Short": {
-            try {
-                ParserUtils.parseTo_short(strValue);
-            } catch (NumberFormatException ex) {
-                isValid = false;
-            }
-            break;
-        }
-        }
-        return isValid;
-    }
-}

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/utils/ParserUtils.java

@@ -1,244 +0,0 @@
-// ============================================================================
-//
-// 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.ui.utils;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ParserUtils {
-
-    public static List<String> parseTo_List(String s) {
-        return parseTo_List(s, null);
-    }
-
-    /**
-     * the source should be a string wrapped in chars[ ] which stands for it is a collection
-     *
-     * @param stSrc
-     * @param fieldSep
-     * @return
-     */
-    public static List<String> parseTo_List(final String strSrc, String fieldSep) {
-        if (strSrc == null) {
-            return null;
-        }
-        List<String> list = new ArrayList<String>();
-
-        // the source string is wrap in [] which means it is a collection
-        if ((fieldSep == null || "".equals(fieldSep)) || !(strSrc.startsWith("[") && strSrc.endsWith("]"))) {
-            list.add(strSrc);
-            return list;
-        }
-        String strTemp = strSrc.substring(1, strSrc.length() - 1); // remove the [ ]
-        for (String str : strTemp.split(fieldSep, -1)) {
-            list.add(str);
-        }
-        return list;
-    }
-
-    public static Character parseTo_Character(String s) {
-        if (s == null) {
-            return null;
-        }
-        return s.charAt(0);
-    }
-
-    public static char parseTo_char(String s) {
-        return parseTo_Character(s);
-    }
-
-    public static Byte parseTo_Byte(String s) {
-        if (s == null) {
-            return null;
-        }
-        return Byte.decode(s).byteValue();
-    }
-
-    public static Byte parseTo_Byte(String s, boolean isDecode) {
-        if (s == null) {
-            return null;
-        }
-        if (isDecode) {
-            return Byte.decode(s).byteValue();
-        } else {
-            return Byte.parseByte(s);
-        }
-    }
-
-    public static byte parseTo_byte(String s) {
-        return parseTo_Byte(s);
-    }
-
-    public static byte parseTo_byte(String s, boolean isDecode) {
-        return parseTo_Byte(s, isDecode);
-    }
-
-    public static Double parseTo_Double(String s) {
-        if (s == null) {
-            return null;
-        }
-        return Double.parseDouble(s);
-    }
-
-    public static double parseTo_double(String s) {
-        return parseTo_Double(s);
-    }
-
-    public static float parseTo_float(String s) {
-        return Float.parseFloat(s);
-    }
-
-    public static Float parseTo_Float(String s) {
-        if (s == null) {
-            return null;
-        }
-        return parseTo_float(s);
-    }
-
-    public static int parseTo_int(String s) {
-        return Integer.parseInt(s);
-    }
-
-    public static int parseTo_int(String s, boolean isDecode) {
-        if (isDecode) {
-            return Integer.decode(s).intValue();
-        } else {
-            return Integer.parseInt(s);
-        }
-    }
-
-    public static Integer parseTo_Integer(String s) {
-        if (s == null) {
-            return null;
-        }
-        return parseTo_int(s);
-    }
-
-    public static Integer parseTo_Integer(String s, boolean isDecode) {
-        if (s == null) {
-            return null;
-        }
-        return parseTo_int(s, isDecode);
-    }
-
-    public static short parseTo_short(String s) {
-        return Short.parseShort(s);
-    }
-
-    public static short parseTo_short(String s, boolean isDecode) {
-        if (isDecode) {
-            return Short.decode(s).shortValue();
-        } else {
-            return Short.parseShort(s);
-        }
-    }
-
-    public static Short parseTo_Short(String s) {
-        if (s == null) {
-            return null;
-        }
-        return parseTo_short(s);
-    }
-
-    public static Short parseTo_Short(String s, boolean isDecode) {
-        if (s == null) {
-            return null;
-        }
-        return parseTo_short(s, isDecode);
-    }
-
-    public static long parseTo_long(String s) {
-        return Long.parseLong(s);
-    }
-
-    public static long parseTo_long(String s, boolean isDecode) {
-        if (isDecode) {
-            return Long.decode(s).longValue();
-        } else {
-            return Long.parseLong(s);
-        }
-    }
-
-    public static Long parseTo_Long(String s) {
-        if (s == null) {
-            return null;
-        }
-        return parseTo_long(s);
-    }
-
-    public static Long parseTo_Long(String s, boolean isDecode) {
-        if (s == null) {
-            return null;
-        }
-        return parseTo_long(s, isDecode);
-    }
-
-    public static Boolean parseTo_Boolean(String s) {
-        if (s == null) {
-            return null;
-        }
-        if (s.equals("1")) { //$NON-NLS-1$
-            return Boolean.parseBoolean("true"); //$NON-NLS-1$
-        }
-        return Boolean.parseBoolean(s);
-    }
-
-    public static boolean parseTo_boolean(String s) {
-        return parseTo_Boolean(s);
-    }
-
-    public static String parseTo_String(String s) {
-        return s;
-    }
-
-    public static String parseTo_String(final List<String> s, String fieldSep) {
-        if (s == null) {
-            return null;
-        }
-        StringBuffer result = new StringBuffer();
-        result.append("[");
-        for (int i = 0; i < s.size(); i++) {
-            if (i != 0) {
-                result.append(fieldSep);
-            }
-            result.append(s.get(i));
-        }
-        result.append("]");
-
-        return result.toString();
-    }
-
-    public static BigDecimal parseTo_BigDecimal(String s) {
-        if (s == null) {
-            return null;
-        }
-        try {
-            return new BigDecimal(s);
-
-        } catch (NumberFormatException nfe) {
-
-            if (nfe.getMessage() == null) {
-
-                throw new NumberFormatException("Incorrect input \"" + s + "\" for BigDecimal.");
-
-            } else {
-
-                throw nfe;
-            }
-        }
-    }
-
-  
-
-}

main/plugins/org.talend.designer.maven.repo.tcksdk/pom.xml

@@ -20,7 +20,7 @@
 		<microprofile.version>1.2.1</microprofile.version>
 		<owb.version>2.0.27</owb.version>
 		<slf4j.version>1.7.34</slf4j.version>
-		<tomcat.version>9.0.69</tomcat.version>
+		<tomcat.version>9.0.68</tomcat.version>
 		<xbean.version>4.20</xbean.version>
 		<reload4j.version>1.2.22</reload4j.version>
 		<log4j2.version>2.18.0</log4j2.version>

main/plugins/org.talend.designer.maven.tos/resources/tcompv1/pom.xml

@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <tcomp.version>1.54.0</tcomp.version>
+        <tcomp.version>1.53.0</tcomp.version>
         <slf4j.version>1.7.34</slf4j.version>
         <reload4j.version>1.2.22</reload4j.version>
     </properties>

main/plugins/org.talend.designer.maven.ui/src/main/java/messages_fr.properties

@@ -11,10 +11,6 @@ ProjectPomProjectSettingPage_FilterPomLabel=Filtrer pour utiliser la g\u00E9n\u0
 ProjectPomProjectSettingPage_FilterErrorMessage=Le filtre n'est pas valide.
 ProjectPomProjectSettingPage.syncAllPomsButtonText=Forcer la resynchronisation compl\u00E8te des POM
 ProjectPomProjectSettingPage.syncBuildTypesButtonText=Forcer la resynchronisation compl\u00E8te des types de build
-ProjectPomProjectSettingPage.validateTitle=R\u00E9sultat de la validation
-ProjectPomProjectSettingPage.warningTip=La configuration par d\u00E9faut sera \u00E9cras\u00E9e.\n
-ProjectPomProjectSettingPage.errorTip=Impossible d'\u00E9craser la configuration par d\u00E9faut.\n
-ProjectPomProjectSettingPage.preview=Aper\u00E7u
 AbstractPersistentProjectSettingPage.syncAllPoms=Mettre \u00E0 jour tous les POM ? \n Cette op\u00E9ration peut prendre un moment, selon la taille de votre projet.
 MavenProjectSettingPage.filterExampleMessage=Exemples de filtres\u00A0:\nlibell\u00E9=monJob       \t\t\t\t=> G\u00E9n\u00E9rer uniquement le Job nomm\u00E9 "monJob"\n!(libell\u00E9=monJob)    \t\t\t\t=> G\u00E9n\u00E9rer tous les Jobs sauf celui nomm\u00E9 "monJob"\n(path=folder1/folder2)  \t\t\t=> G\u00E9n\u00E9rer tous Jobs dans le dossier "dossier1/dossier2"\n(chemin=dossier1/dossier2)ou(libell\u00E9=monJob)\t=> G\u00E9n\u00E9rer tous Jobs dans le dossier "dossier1/dossier2" ou nomm\u00E9 "monJob"\n(libell\u00E9=monJob)et(version=0.2)\t\t=> G\u00E9n\u00E9rer uniquement le Job nomm\u00E9 "monJob" avec une version 0.2\n!((libell\u00E9=monJob)et(version=0.1))\t\t=> G\u00E9n\u00E9rer tous les Jobs sauf "monJob" version 0.1
 MavenProjectSettingPage.refModuleText=Configurer les modules du projet de r\u00E9f\u00E9rence dans le profil

main/plugins/org.talend.designer.maven.ui/src/main/java/messages_ja.properties

@@ -11,10 +11,6 @@ ProjectPomProjectSettingPage_FilterPomLabel=POM\u306E\u751F\u6210\u306B\u4F7F\u7
 ProjectPomProjectSettingPage_FilterErrorMessage=\u30D5\u30A3\u30EB\u30BF\u30FC\u304C\u7121\u52B9\u3067\u3059\u3002
 ProjectPomProjectSettingPage.syncAllPomsButtonText=\u5B8C\u5168\u306A\u518D\u540C\u671FPOM\u3092\u5F37\u5236
 ProjectPomProjectSettingPage.syncBuildTypesButtonText=\u5B8C\u5168\u306A\u518D\u540C\u671F\u30D3\u30EB\u30C9\u30BF\u30A4\u30D7\u3092\u5F37\u5236
-ProjectPomProjectSettingPage.validateTitle=\u691C\u8A3C\u7D50\u679C
-ProjectPomProjectSettingPage.warningTip=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u8A2D\u5B9A\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3002\n
-ProjectPomProjectSettingPage.errorTip=\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u8A2D\u5B9A\u3092\u4E0A\u66F8\u304D\u3067\u304D\u307E\u305B\u3093\u3002\n
-ProjectPomProjectSettingPage.preview=\u30D7\u30EC\u30D3\u30E5\u30FC
 AbstractPersistentProjectSettingPage.syncAllPoms=POM\u3092\u3059\u3079\u3066\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u307E\u3059\u304B? \n \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30B5\u30A4\u30BA\u306B\u3088\u3063\u3066\u306F\u3053\u306E\u64CD\u4F5C\u3067\u9577\u3044\u6642\u9593\u304C\u304B\u304B\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
 MavenProjectSettingPage.filterExampleMessage=\u30D5\u30A3\u30EB\u30BF\u30FC\u306E\u4F8B:\nlabel=myJob       \t\t\t\t=> "myJob"\u3068\u3044\u3046\u540D\u524D\u306E\u30B8\u30E7\u30D6\u3060\u3051\u3092\u751F\u6210\n!(label=myJob)    \t\t\t\t=> "myJob"\u3068\u3044\u3046\u540D\u524D\u4EE5\u5916\u306E\u30B8\u30E7\u30D6\u3092\u3059\u3079\u3066\u751F\u6210\n(path=folder1/folder2)  \t\t\t=> "folder1/folder2"\u3068\u3044\u3046\u30D5\u30A3\u30EB\u30C0\u30FC\u306B\u3042\u308B\u30B8\u30E7\u30D6\u3092\u3059\u3079\u3066\u751F\u6210\n(path=folder1/folder2)or(label=myJob)\t=> "folder1/folder2"\u3068\u3044\u3046\u30D5\u30A9\u30EB\u30C0\u30FC\u306B\u3042\u308B\u3059\u3079\u3066\u306E\u30B8\u30E7\u30D6\u3001\u307E\u305F\u306F"myJob"\u3068\u3044\u3046\u540D\u524D\u306E\u30B8\u30E7\u30D6\u3092\u751F\u6210\n(label=myJob)and(version=0.2)\t\t=> \u30D0\u30FC\u30B8\u30E7\u30F30.2\u3067"myJob"\u3068\u3044\u3046\u540D\u524D\u306E\u30B8\u30E7\u30D6\u306E\u307F\u751F\u6210\n!((label=myJob)and(version=0.1))\t\t=> \u30D0\u30FC\u30B8\u30E7\u30F30.1\u3067"myJob"\u3068\u3044\u3046\u540D\u524D\u4EE5\u5916\u306E\u30B8\u30E7\u30D6\u3092\u3059\u3079\u3066\u751F\u6210
 MavenProjectSettingPage.refModuleText=\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u3067\u53C2\u7167\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8A2D\u5B9A

main/plugins/org.talend.designer.maven.ui/src/main/java/messages_zh_CN.properties

@@ -11,10 +11,6 @@ ProjectPomProjectSettingPage_FilterPomLabel=\u7528\u4E8E\u751F\u6210 pom \u7684\
 ProjectPomProjectSettingPage_FilterErrorMessage=\u7B5B\u9009\u5668\u65E0\u6548\u3002
 ProjectPomProjectSettingPage.syncAllPomsButtonText=\u5F3A\u5236\u5B8C\u5168\u91CD\u65B0\u540C\u6B65 POM
 ProjectPomProjectSettingPage.syncBuildTypesButtonText=\u5F3A\u5236\u91CD\u65B0\u540C\u6B65\u6784\u5EFA\u7C7B\u578B
-ProjectPomProjectSettingPage.validateTitle=\u9A8C\u8BC1\u7ED3\u679C
-ProjectPomProjectSettingPage.warningTip=\u9ED8\u8BA4\u8BBE\u7F6E\u5C06\u88AB\u8986\u76D6\u3002\n
-ProjectPomProjectSettingPage.errorTip=\u65E0\u6CD5\u8986\u76D6\u9ED8\u8BA4\u8BBE\u7F6E\u3002\n
-ProjectPomProjectSettingPage.preview=\u9884\u89C8
 AbstractPersistentProjectSettingPage.syncAllPoms=\u662F\u5426\u66F4\u65B0\u6240\u6709 POM \u6587\u4EF6? \n \u6B64\u64CD\u4F5C\u53EF\u80FD\u9700\u8981\u5F88\u957F\u65F6\u95F4\uFF0C\u5177\u4F53\u53D6\u51B3\u4E8E\u60A8\u7684\u5DE5\u7A0B\u5927\u5C0F\u3002
 MavenProjectSettingPage.filterExampleMessage=\u7B5B\u9009\u5668\u793A\u4F8B\uFF1A\nlabel=myJob       \t\t\t\t=> \u4EC5\u751F\u6210\u540D\u4E3A "myJob" \u7684\u4F5C\u4E1A\n!(label=myJob)    \t\t\t\t=> \u751F\u6210\u540D\u4E3A "myJob" \u9664\u5916\u7684\u4EFB\u610F\u4F5C\u4E1A\n(path=folder1/folder2)  \t\t\t=> \u751F\u6210\u6587\u4EF6\u5939 "folder1/folder2" \u4E2D\u4EFB\u610F\u4F5C\u4E1A\n(path=folder1/folder2)or(label=myJob)\t=> \u751F\u6210\u6587\u4EF6\u5939 "folder1/folder2" \u4E2D\u7684\u4EFB\u610F\u4F5C\u4E1A\u6216\u4EFB\u610F\u540D\u4E3A "myJob" \u7684\u4F5C\u4E1A\n(label=myJob)and(version=0.2)\t\t=> \u4EC5\u751F\u6210\u7248\u672C 0.2 \u4E14\u540D\u4E3A "myJob" \u7684\u4F5C\u4E1A\n!((label=myJob)and(version=0.1))\t\t=> \u751F\u6210\u4EFB\u610F\u540D\u79F0\u4E0D\u4E3A "myJob" \u4E14\u7248\u672C\u4E0D\u4E3A 0.1 \u7684\u4F5C\u4E1A
 MavenProjectSettingPage.refModuleText=\u5728\u914D\u7F6E\u6587\u4EF6\u4E2D\u8BBE\u7F6E\u5F15\u7528\u5DE5\u7A0B\u6A21\u5757

main/plugins/org.talend.librariesmanager/resources/java/routines/TalendDate.java

@@ -467,13 +467,13 @@ public class TalendDate {
      *
      * {Category} TalendDate
      *
-     * {param} String("2008/11/24 12:15:25") string : date represent in string
+     * {param} String("") string : date represent in string
      *
-     * {param} String("yyyy/MM/dd HH:mm:ss") pattern : date pattern
+     * {param} String("yyyy-MM-dd") pattern : date pattern
      *
-     * {param} int(5) nb : the added value
+     * {param} int(addValue) nb : the added value
      *
-     * {param} String("dd") dateType : the part to add
+     * {param} date("MM") dateType : the part to add
      *
      * {examples}
      *
@@ -1153,8 +1153,8 @@ public class TalendDate {
             maxDate = "2099-12-31";
         }
 
-        if (!minDate.matches("\\d{4}-\\d{2}-\\d{2}") || !maxDate.matches("\\d{4}-\\d{2}-\\d{2}")) {
-            throw new IllegalArgumentException("The parameter should be \"yyyy-MM-dd\"");
+        if (!minDate.matches("\\d{4}-\\d{2}-\\d{2}") || !minDate.matches("\\d{4}-\\d{2}-\\d{2}")) {
+            throw new IllegalArgumentException("The parameter should be \"yyy-MM-dd\"");
         }
 
         int minYear = Integer.parseInt(minDate.substring(0, 4));
@@ -1216,19 +1216,8 @@ public class TalendDate {
     }
 
     /**
-     * Format date to mssql 2008 type datetimeoffset ISO 8601 string with local time zone format string : yyyy-MM-dd
-     * HH:mm:ss.SSSXXX (JDK7 support it)
-     *
-     * @param date the time value to be formatted into a time string.
-     * @return the formatted time string.
-     *
-     * {talendTypes} String
-     *
-     * {Category} TalendDate
-     *
-     * {param} date(new Date()) date : the time value to be formatted into a time string
-     *
-     * {example} formatDatetimeoffset(new Date()) #
+     * format date to mssql 2008 type datetimeoffset ISO 8601 string with local time zone format string : yyyy-MM-dd
+     * HH:mm:ss.SSSXXX(JDK7 support it)
      */
     public static String formatDatetimeoffset(Date date) {
         String dateString = formatDate("yyyy-MM-dd HH:mm:ss.SSSZ", date);// keep the max precision in java
@@ -1357,28 +1346,14 @@ public class TalendDate {
     }
 
     /**
-     * Convert a formatted string to date
-     * 
+     *
      * @param string Must be a string datatype. Passes the values that you want to convert.
      * @param format Enter a valid TO_DATE format string. The format string must match the parts of the string argument
-     * default format is "MM/DD/yyyy HH:mm:ss.sss" if not specified.
-     * 
+     * 		  default formate is "MM/DD/yyyy HH:mm:ss.sss" if not specified.
      * @return Date
      * @throws ParseException
-     * 
-     * {talendTypes} Date
-     *
-     * {Category} TalendDate
-     * 
-     * {param} String("2015-11-21 13:23:45") string : string Must be a string datatype. Passes the values that you want
-     * to convert.
-     *
-     * {param} String("yyyy-MM-dd HH:mm:ss") format : Enter a valid TO_DATE format string. The format string must match
-     * the parts of the string argument default format is "MM/DD/yyyy HH:mm:ss.sss" if not specified.
-     *
-     *
-     * {example} TO_DATE("1464576463231", "J") #Mon May 30 10:47:43 CST 2016 {example} TO_DATE("2015-11-21
-     * 13:23:45","yyyy-MM-dd HH:mm:ss") #Sat Nov 21 13:23:45 CST 2015
+     * {example} TO_DATE("1464576463231", "J") #Mon May 30 10:47:43 CST 2016
+     * {example} TO_DATE("2015-11-21 13:23:45","yyyy-MM-dd HH:mm:ss") #Sat Nov 21 13:23:45 CST 2015
      *
      */
     public static Date TO_DATE(String string, String format) throws ParseException {
@@ -1399,24 +1374,6 @@ public class TalendDate {
 
     }
 
-    /**
-     * Convert a formatted string to date with default format as ""MM/DD/yyyy HH:mm:ss.sss"
-     * 
-     * @param string Must be a string datatype. Passes the values that you want to convert.
-     * @return Date
-     * @throws ParseException
-     * 
-     * {talendTypes} Date
-     *
-     * {Category} TalendDate
-     * 
-     * {param} String("11/21/2015 13:23:45.111") string : string Must be a string datatype. Passes the values that you
-     * want to convert.
-     *
-     * {example} TO_DATE("11/21/2015 13:23:45.111") #Sat Nov 21 13:23:45.111 CST 2015
-     *
-     */
-
     public static Date TO_DATE(String string) throws ParseException {
         return TO_DATE(string, null);
     }
@@ -1453,25 +1410,13 @@ public class TalendDate {
     }
 
     /**
-     * Add values to the specified portion of the date
-     * 
-     * @param date Passes the values you want to change
-     * @param format A format string specifying the portion of the date value you want to change.For example, 'mm'.
-     * @param amount An integer value specifying the amount of years, months, days, hours, and so on by which you want
-     * to change the date value.
-     * @return Date NULL if a null value is passed as an argument to the function.
-     * @throws ParseException
-     * 
-     * {talendTypes} Date
      *
-     * {Category} TalendDate
-     * 
-     * {param} Date(new Date()) date :
-     * 
-     * {param} String("HH") format :
-     * 
-     * {param} int(2) amount :
-     * 
+     * @param date  Passes the values you want to change
+     * @param format A format string specifying the portion of the date value you want to change.For example, 'mm'.
+     * @param amount An integer value specifying the amount of years, months, days, hours,
+     * 				and so on by which you want to change the date value.
+     * @return Date  NULL if a null value is passed as an argument to the function.
+     * @throws ParseException
      * {example} ADD_TO_DATE(new Date(1464576463231l), "HH",2) #Mon May 30 12:47:43 CST 2016
      */
     public static Date ADD_TO_DATE(Date date, String format, int amount) throws ParseException{
@@ -1540,21 +1485,10 @@ public class TalendDate {
     }
 
     /**
-     * Convert a Date to a formatted character string.
      *
-     * @param date the date value you want to convert to character strings.
-     * @param format the format of the return value,
-     * @return String. NULL if a value passed to the function is NULL.
-     *
-     * {talendTypes} String
-     *
-     * {Category} TalendDate
-     *
-     * {param} Date(new Date()) date : the date value you want to convert to character strings.
-     * 
-     * {param} String("MM/DD/YYYY HH24:MI:SS") format : the format of the return value,
-     *
-     * {example} TO_CHAR(new Date(),"MM/DD/YYYY HH24:MI:SS") #
+     * @param date  Date/Time datatype. Passes the date values you want to convert to character strings.
+     * @param format   Enter a valid TO_CHAR format string. The format string defines the format of the return value,
+     * @return  String.   NULL if a value passed to the function is NULL.
      */
 
     public static String TO_CHAR(Date date, String format) {

main/plugins/org.talend.metadata.managment.ui/src/main/java/messages_ja.properties

@@ -321,10 +321,10 @@ FileWizardPage.of=of
 FileWizardPage.titleCreate=\u30D5\u30A1\u30A4\u30EB - \u30B9\u30C6\u30C3\u30D7
 FileWizardPage.titleUpdate=\u30D5\u30A1\u30A4\u30EB - \u30B9\u30C6\u30C3\u30D7
 GenericSchemaStep2Form.SelectDatabaseType=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30DE\u30C3\u30D4\u30F3\u30B0\u30BF\u30A4\u30D7\u3092\u9078\u629E
-GenericSchemaWizard.CreateNewGenericSchema=\u65B0\u3057\u3044\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
-GenericSchemaWizard.SaveAsGenericSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
-GenericSchemaWizard.UpdateGenericSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
-ImportSchemaFileWizard.WizardTitle=XML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
+GenericSchemaWizard.CreateNewGenericSchema=\u65B0\u3057\u3044\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
+GenericSchemaWizard.SaveAsGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
+GenericSchemaWizard.UpdateGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+ImportSchemaFileWizard.WizardTitle=XML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
 LDAPSchemaStep1Form.CheckConnection=                    \u63A5\u7D9A\u3092\u30C1\u30A7\u30C3\u30AF\u3059\u308B\u305F\u3081\u306B\u4E0B\u8A18\u306E\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 LDAPSchemaStep1Form.CheckNetWorkParameter=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u30C1\u30A7\u30C3\u30AF
 LDAPSchemaStep1Form.EncryptionMethod=\u6697\u53F7\u5316\u65B9\u5F0F\uFF1A

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/utils/ExtendedNodeConnectionContextUtils.java

@@ -167,32 +167,6 @@ public class ExtendedNodeConnectionContextUtils {
         DataBricksDriverNodeType,
         DataBricksNodeType,
         
-        // Kubernetes
-        k8sSubmitMode,
-        k8sMaster,
-        k8sInstances,
-        k8sUseRegistrySecret,
-        k8sRegistrySecret,
-        k8sImage,
-        k8sNamespace,
-        k8sServiceAccount,
-        k8sDistUpload,
-        k8sS3Bucket,
-        k8sS3Folder,
-        k8sS3Credentials,
-        k8sS3AccessKey,
-        k8sS3SecretKey,
-        k8sBlobAccount,
-        k8sBlobContainer,
-        k8sBlobSecretKey,
-        k8sAzureAccount,
-        k8sAzureCredentials,
-        k8sAzureContainer,
-        k8sAzureSecretKey,
-        k8sAzureAADKey,
-        k8sAzureAADClientID,
-        k8sAzureAADDirectoryID,
-        
         //Knox
         SparkMode,
         UseKnox,

main/plugins/org.talend.metadata.managment/plugin.xml

@@ -18,7 +18,7 @@
       </classloader>
       <classloader
             index="HIVE:AMAZON_EMR:MapR_EMR:STANDALONE"
-            libraries="hadoop-core-0.20.203.0.jar;reload4j-1.2.22.jar;libfb303.jar;slf4j-api-1.6.1.jar;slf4j-log4j12-1.6.1.jar;commons-logging-1.1.1.jar;commons-logging-api-1.0.4.jar">
+            libraries="hadoop-core-0.20.203.0.jar;reload4j-1.2.22.jar;hive-exec-0.7.1.jar;hive-jdbc-0.7.1.jar;hive-metastore-0.7.1.jar;hive-service-0.7.1.jar;libfb303.jar;slf4j-api-1.6.1.jar;slf4j-log4j12-1.6.1.jar;commons-logging-1.1.1.jar;commons-logging-api-1.0.4.jar">
       </classloader>
       <!-- -->
       <classloader
@@ -133,11 +133,84 @@
             required="true">
       </libraryNeeded>
       <libraryNeeded
+            context="plugin:org.talend.metadata.managment"
+            language="java"
+            message="Needed for plugin org.talend.metadata.managment"
+            mvn_uri="mvn:org.talend.libraries/wsdl4j-1.5.1/6.0.0"
+            name="wsdl4j-1.5.1.jar"
+            required="false"
+            uripath="platform:/plugin/org.talend.libraries.apache/lib/wsdl4j-1.5.1.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard for hive HDP 2.0 Embedded"
+            name="httpcore-4.1.2.jar" mvn_uri="mvn:org.talend.libraries/httpcore-4.1.2/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.apache.http/lib/httpcore-4.1.2.jar">
+      </libraryNeeded>
+            <libraryNeeded
             context="Hive wizard"
             language="java"
             message="Wizard for hive HDP 2.0"
             name="httpclient-4.5.13.jar" mvn_uri="mvn:org.apache.httpcomponents/httpclient/4.5.13" 
             required="true">
+      </libraryNeeded>
+       <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="hive-service-0.7.1.jar" mvn_uri="mvn:org.talend.libraries/hive-service-0.7.1/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.hadoop.apache.0.20.203/lib/hive-service-0.7.1.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="hadoop-core-0.20.203.0.jar" mvn_uri="mvn:org.talend.libraries/hadoop-core-0.20.203.0/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.hadoop.apache.0.20.203/lib/hadoop-core-0.20.203.0.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="hive-exec-0.7.1.jar" mvn_uri="mvn:org.talend.libraries/hive-exec-0.7.1/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.hadoop.apache.0.20.203/lib/hive-exec-0.7.1.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="hive-metastore-0.7.1.jar" mvn_uri="mvn:org.talend.libraries/hive-metastore-0.7.1/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.hadoop.apache.0.20.203/lib/hive-metastore-0.7.1.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="libfb303.jar" mvn_uri="mvn:org.talend.libraries/libfb303/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.hadoop.apache.0.20.203/lib/libfb303.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="hive-jdbc-0.7.1.jar" mvn_uri="mvn:org.talend.libraries/hive-jdbc-0.7.1/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.hadoop.apache.0.20.203/lib/hive-jdbc-0.7.1.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="commons-lang-2.4.jar" mvn_uri="mvn:org.talend.libraries/commons-lang-2.4/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.4.jar">
       </libraryNeeded>
       <libraryNeeded
             context="plugin:org.talend.metadata.managment"

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/AbstractTableBuilder.java

@@ -19,6 +19,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import metadata.managment.i18n.Messages;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.talend.cwm.helper.ColumnSetHelper;
@@ -27,7 +29,6 @@ import org.talend.metadata.managment.utils.MetadataConnectionUtils;
 import org.talend.utils.sql.metadata.constants.GetTable;
 import org.talend.utils.sql.metadata.constants.TableType;
 
-import metadata.managment.i18n.Messages;
 import orgomg.cwm.resource.relational.NamedColumnSet;
 
 /**
@@ -176,9 +177,9 @@ public abstract class AbstractTableBuilder<T extends NamedColumnSet> extends Cwm
         String tableComment = tablesSet.getString(GetTable.REMARKS.name());
         if (StringUtils.isBlank(tableComment)) {
             String dbProductName = getConnectionMetadata(connection).getDatabaseProductName();
-            String selectRemarkOnTable = MetadataConnectionUtils.getCommonQueryStr(dbProductName);
+            String selectRemarkOnTable = MetadataConnectionUtils.getCommonQueryStr(dbProductName, tableName);
             if (selectRemarkOnTable != null) {
-                tableComment = executeGetCommentStatement(selectRemarkOnTable, tableName);
+                tableComment = executeGetCommentStatement(selectRemarkOnTable);
             }
         }
         return tableComment;

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/core/model/metadata/builder/database/CwmBuilder.java

@@ -14,14 +14,14 @@ package org.talend.core.model.metadata.builder.database;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
-import org.apache.log4j.Logger;
+import java.sql.Statement;
 
 import metadata.managment.i18n.Messages;
 
+import org.apache.log4j.Logger;
+
 /**
  * @author scorreia
  *
@@ -73,11 +73,11 @@ abstract class CwmBuilder {
      */
     protected String executeGetCommentStatement(String queryStmt) {
         String comment = null;
-        PreparedStatement statement = null;
+        Statement statement = null;
         ResultSet resultSet = null;
         try {
-            statement = connection.prepareStatement(queryStmt);
-            resultSet = statement.executeQuery();
+            statement = connection.createStatement();
+            statement.execute(queryStmt);
 
             // get the results
             resultSet = statement.getResultSet();
@@ -108,40 +108,4 @@ abstract class CwmBuilder {
         return comment;
     }
 
-    protected String executeGetCommentStatement(String queryStmt, String tableName) {
-        String comment = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            statement = connection.prepareStatement(queryStmt);
-            statement.setString(1, tableName);
-            resultSet = statement.executeQuery();
-
-            if (resultSet != null) {
-                while (resultSet.next()) {
-                    comment = (String) resultSet.getObject(1);
-                }
-            }
-        } catch (SQLException e) {
-            // do nothing here
-        } finally {
-            // -- release resources
-            if (resultSet != null) {
-                try {
-                    resultSet.close();
-                } catch (SQLException e) {
-                    log.error(e, e);
-                }
-            }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException e) {
-                    log.error(e, e);
-                }
-            }
-        }
-        return comment;
-    }
-
 }

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/utils/MetadataConnectionUtils.java

@@ -819,33 +819,6 @@ public class MetadataConnectionUtils {
 
     }
 
-    public static String getCommonQueryStr(String productName) {
-        if (productName == null) {
-            return null;
-        }
-        productName = productName.replaceAll(" ", "_"); //$NON-NLS-1$ //$NON-NLS-2$
-        EDataBaseType eDataBaseType = null;
-        try {
-            eDataBaseType = EDataBaseType.valueOf(productName);
-        } catch (Exception e) {
-            eDataBaseType = EDataBaseType.Microsoft_SQL_Server;
-        }
-        String sqlStr = ""; //$NON-NLS-1$
-        switch (eDataBaseType) {
-        case Oracle:
-            sqlStr = "SELECT COMMENTS FROM USER_TAB_COMMENTS WHERE TABLE_NAME= ? "; //$NON-NLS-1$
-            break;
-        case MySQL:
-            sqlStr = "SELECT TABLE_COMMENT FROM information_schema.TABLES WHERE TABLE_NAME= ? "; //$NON-NLS-1$
-            break;
-        default:
-            sqlStr = null;
-
-        }
-        return sqlStr;
-
-    }
-
     /**
      * get Comment Query Str.
      *

main/plugins/org.talend.model.edit/plugin_ja.properties

@@ -95,7 +95,7 @@ _UI_BaseBusinessItemRelationship_target_feature=\u30BF\u30FC\u30B2\u30C3\u30C8
 _UI_DirectionalBusinessItemRelationship_type=\u7247\u65B9\u5411\u30D3\u30B8\u30CD\u30B9\u30A2\u30A4\u30C6\u30E0\u95A2\u4FC2
 _UI_BidirectionalBusinessItemRelationship_type=\u53CC\u65B9\u5411\u30D3\u30B8\u30CD\u30B9\u30A2\u30A4\u30C6\u30E0\u95A2\u4FC2
 _UI_Context_type=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8
-_UI_GenericSchemaMetadata_type=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u30E1\u30BF\u30C7\u30FC\u30BF
+_UI_GenericSchemaMetadata_type=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u30E1\u30BF\u30C7\u30FC\u30BF
 _UI_SapFunctionMetadata_type=SAP\u95A2\u6570\u30E1\u30BF\u30C7\u30FC\u30BF
 _UI_FileExcelMetadata_type=Excel\u30D5\u30A1\u30A4\u30EB\u30E1\u30BF\u30C7\u30FC\u30BF
 _UI_Query_type=\u30AF\u30A8\u30EA\u30FC
@@ -146,7 +146,7 @@ _UI_UserProjectAuthorization_type=\u30E6\u30FC\u30B6\u30FC\u30D7\u30ED\u30B8\u30
 _UI_ContextItem_type=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30A2\u30A4\u30C6\u30E0
 _UI_SpagoBiServer_type=Spago Bi\u30B5\u30FC\u30D0\u30FC
 _UI_License_type=\u30E9\u30A4\u30BB\u30F3\u30B9
-_UI_GenericSchemaConnectionItem_type=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u63A5\u7D9A\u30A2\u30A4\u30C6\u30E0
+_UI_GenericSchemaConnectionItem_type=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u63A5\u7D9A\u30A2\u30A4\u30C6\u30E0
 _UI_UserModuleAuthorization_type=\u30E6\u30FC\u30B6\u30FC\u30E2\u30B8\u30E5\u30FC\u30EB\u8A8D\u8A3C
 _UI_LDAPSchemaConnectionItem_type=LDAP\u30B9\u30AD\u30FC\u30DE\u63A5\u7D9A\u30A2\u30A4\u30C6\u30E0
 _UI_SalesforceSchemaConnectionItem_type=Salesforce\u30B9\u30AD\u30FC\u30DE\u63A5\u7D9A\u30A2\u30A4\u30C6\u30E0
@@ -598,7 +598,7 @@ _UI_QueriesConnection_type=\u30AF\u30A8\u30EA\u30FC\u63A5\u7D9A
 _UI_LdifFileConnection_type=LDIF\u30D5\u30A1\u30A4\u30EB\u63A5\u7D9A
 _UI_FileExcelConnection_type=Excel\u30D5\u30A1\u30A4\u30EB\u63A5\u7D9A
 _UI_XmlXPathLoopDescriptor_type=XML XPath\u30EB\u30FC\u30D7\u8A18\u8FF0\u5B50
-_UI_GenericSchemaConnection_type=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u63A5\u7D9A
+_UI_GenericSchemaConnection_type=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u63A5\u7D9A
 _UI_LDAPSchemaConnection_type=LDAP\u30B9\u30AD\u30FC\u30DE\u63A5\u7D9A
 _UI_WSDLSchemaConnection_type=Web\u30B5\u30FC\u30D3\u30B9\u30B9\u30AD\u30FC\u30DE\u63A5\u7D9A
 _UI_SalesforceSchemaConnection_type=Salesforce\u30B9\u30AD\u30FC\u30DE\u63A5\u7D9A

main/plugins/org.talend.rcp/src/main/java/messages.properties

@@ -45,7 +45,6 @@ LinksToolbarItem_exchange=Link to Talend Exchange
 LinksToolbarItem_Learn=Talend Help Center - Online Doc and Knowledge Base
 LinksToolbarItem_videos=Link to Talend Guided Tutorials
 RegisterWizard.windowTitle={0} Registration
-ResourceToolbarHandler.documentationLink=https://document-link.us.cloud.talend.com/thc_studio-support-doc?version=cloud&lang=en&env=prd
 tips.createJob=First, create a Job for your data flow using the <a>Job Designer</a>.
 tips.clickChoose=Right-click and choose the
 tips.optionMenu=option in the menu
@@ -59,7 +58,6 @@ tips.welcome=Welcome to
 tips.title=is a powerful and flexible tool that can help you take control of your data.
 tips.getStart=Before you get started, here are the basics:
 tips.runJob=Run Job
-TalendHelpDocAction.documentationLink=https://document-link.us.cloud.talend.com/thc_studio-help-menu?version=cloud&lang=en&env=prd
 starting.intro1=Welcome to
 starting.intro2=This powerful and flexible tool helps you take control of your data
 starting.intro3=Before you get started, here are the basics

main/plugins/org.talend.rcp/src/main/java/messages_ja.properties

@@ -45,7 +45,6 @@ LinksToolbarItem_exchange=Talend Exchange\u3078\u306E\u30EA\u30F3\u30AF
 LinksToolbarItem_Learn=Talend Help Center - \u30AA\u30F3\u30E9\u30A4\u30F3\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3001\u30CA\u30EC\u30C3\u30B8\u30D9\u30FC\u30B9
 LinksToolbarItem_videos=Talend\u30C1\u30E5\u30FC\u30C8\u30EA\u30A2\u30EB\u3078\u306E\u30EA\u30F3\u30AF
 RegisterWizard.windowTitle={0}\u767B\u9332
-ResourceToolbarHandler.documentationLink=https://document-link.us.cloud.talend.com/thc_studio-support-doc?version=cloud&lang=ja&env=prd
 tips.createJob=\u307E\u305A\u3001<a>Job Designer</a>\u4F7F\u3063\u3066\u30C7\u30FC\u30BF\u30D5\u30ED\u30FC\u306E\u30B8\u30E7\u30D6\u3092\u4F5C\u6210\u3057\u307E\u3059\u3002
 tips.clickChoose=\u53F3\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u9078\u629E:
 tips.optionMenu=\u30E1\u30CB\u30E5\u30FC\u306E\u30AA\u30D7\u30B7\u30E7\u30F3
@@ -59,7 +58,6 @@ tips.welcome=\u3088\u3046\u3053\u305D
 tips.title=\u306F\u3001\u30C7\u30FC\u30BF\u7BA1\u7406\u306B\u5F79\u7ACB\u3064\u5F37\u529B\u3067\u67D4\u8EDF\u306A\u30C4\u30FC\u30EB\u3067\u3059\u3002
 tips.getStart=\u4F5C\u696D\u3092\u59CB\u3081\u308B\u524D\u306B\u4EE5\u4E0B\u306E\u57FA\u672C\u4E8B\u9805\u3092\u3054\u78BA\u8A8D\u304F\u3060\u3055\u3044:
 tips.runJob=\u30B8\u30E7\u30D6\u3092\u5B9F\u884C
-TalendHelpDocAction.documentationLink=https://document-link.us.cloud.talend.com/thc_studio-help-menu?version=cloud&lang=ja&env=prd
 starting.intro1=\u3088\u3046\u3053\u305D
 starting.intro2=\u30D1\u30EF\u30D5\u30EB\u3067\u67D4\u8EDF\u306A\u3053\u306E\u30C4\u30FC\u30EB\u306F\u3001\u30C7\u30FC\u30BF\u306E\u7BA1\u7406\u306B\u5F79\u7ACB\u3061\u307E\u3059
 starting.intro3=\u958B\u59CB\u3059\u308B\u524D\u306B\u4EE5\u4E0B\u306E\u57FA\u672C\u4E8B\u9805\u3092\u3054\u78BA\u8A8D\u304F\u3060\u3055\u3044\u3002

main/plugins/org.talend.rcp/src/main/java/messages_zh_CN.properties

@@ -45,7 +45,6 @@ LinksToolbarItem_exchange=\u8FDE\u63A5\u5230 Talend Exchange
 LinksToolbarItem_Learn=Talend \u5E2E\u52A9\u4E2D\u5FC3 - \u5728\u7EBF\u6587\u6863\u548C\u77E5\u8BC6\u5E93
 LinksToolbarItem_videos=\u8FDE\u63A5\u5230 Talend \u6307\u5BFC\u6559\u7A0B
 RegisterWizard.windowTitle={0} \u6CE8\u518C
-ResourceToolbarHandler.documentationLink=https://document-link.us.cloud.talend.com/thc_studio-support-doc?version=cloud&lang=zh&env=prd
 tips.createJob=\u9996\u5148\uFF0C\u4F7F\u7528 <a>Job Designer</a> \u4E3A\u60A8\u7684\u6570\u636E\u6D41\u521B\u5EFA\u4F5C\u4E1A\u3002
 tips.clickChoose=\u53F3\u952E\u5355\u51FB\u5E76\u9009\u62E9
 tips.optionMenu=\u9009\u9879 (\u83DC\u5355\u4E2D)
@@ -59,7 +58,6 @@ tips.welcome=\u6B22\u8FCE\u4F7F\u7528
 tips.title=\u662F\u4E00\u79CD\u5F3A\u5927\u800C\u7075\u6D3B\u7684\u5DE5\u5177\uFF0C\u53EF\u4EE5\u5E2E\u52A9\u60A8\u638C\u63A7\u60A8\u7684\u6570\u636E\u3002
 tips.getStart=\u5728\u5F00\u59CB\u4E4B\u524D\uFF0C\u8BF7\u4E86\u89E3\u4EE5\u4E0B\u57FA\u7840\u77E5\u8BC6:
 tips.runJob=\u8FD0\u884C\u4F5C\u4E1A
-TalendHelpDocAction.documentationLink=https://document-link.us.cloud.talend.com/thc_studio-help-menu?version=cloud&lang=zh&env=prd
 starting.intro1=\u6B22\u8FCE\u4F7F\u7528
 starting.intro2=\u8FD9\u4E2A\u5F3A\u5927\u800C\u7075\u6D3B\u7684\u5DE5\u5177\u65E8\u5728\u5E2E\u52A9\u60A8\u7BA1\u63A7\u6570\u636E
 starting.intro3=\u5728\u5F00\u59CB\u4E4B\u524D\uFF0C\u8BF7\u4E86\u89E3\u4EE5\u4E0B\u57FA\u7840\u77E5\u8BC6

main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/action/toolbar/ResourceToolbarHandler.java

@@ -4,14 +4,18 @@ import org.apache.commons.codec.binary.StringUtils;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.program.Program;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.ui.IWorkbenchWindow;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.service.IExchangeService;
 import org.talend.core.service.ITutorialsService;
-import org.talend.rcp.i18n.Messages;
 
 public class ResourceToolbarHandler extends AbstractHandler {
 
@@ -21,7 +25,7 @@ public class ResourceToolbarHandler extends AbstractHandler {
     
     public static final String DOCUMENTATION = "Documentation";//$NON-NLS-1$
     
-    public static final String DOCUMENTATION_ORIG_URL = Messages.getString("ResourceToolbarHandler.documentationLink"); //$NON-NLS-1$
+    public static final String DOCUMENTATION_ORIG_URL = "https://help.talend.com";//$NON-NLS-1$
 
     public static final String ASK = "Ask"; //$NON-NLS-1$
 

main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/ActionBarBuildHelper.java

@@ -31,7 +31,9 @@ import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.preference.IPreferenceNode;
 import org.eclipse.swt.SWT;
 import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
 import org.eclipse.ui.application.IActionBarConfigurer;
@@ -50,6 +52,7 @@ import org.talend.core.ui.branding.IBrandingService;
 import org.talend.core.ui.perspective.PerspectiveMenuManager;
 import org.talend.core.ui.services.IOpenJobScriptActionService;
 import org.talend.rcp.i18n.Messages;
+import org.talend.rcp.intro.linksbar.LinksToolbarItem;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.ui.actions.toolbar.ProjectSettingsAction;
 
@@ -238,7 +241,7 @@ public class ActionBarBuildHelper implements IActionBarHelper {
         menuBar.add(helpMenu);
 
         // Help
-        helpMenu.add(new TalendHelpDocAction());
+        helpMenu.add(ActionFactory.HELP_CONTENTS.create(window));
         helpMenu.add(new Separator());
 
         menuBar.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));

main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/ApplicationWorkbenchAdvisor.java

@@ -285,6 +285,13 @@ public class ApplicationWorkbenchAdvisor extends IDEWorkbenchAdvisor {
     @Override
     public void postStartup() {
         super.postStartup();
+        try {
+            if (ICloudSignOnService.get() != null && ICloudSignOnService.get().isSignViaCloud()) {
+                ICloudSignOnService.get().startHeartBeat();
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
         if (!ArrayUtils.contains(Platform.getApplicationArgs(), EclipseCommandLine.TALEND_DISABLE_LOGINDIALOG_COMMAND)) {
             RegisterManagement.getInstance().validateRegistration();
         }
@@ -306,6 +313,9 @@ public class ApplicationWorkbenchAdvisor extends IDEWorkbenchAdvisor {
         if (commitChanges && IGitUIProviderService.get() != null && IGitUIProviderService.get().checkPendingChanges()) {
             preShutwond = false;
         }
+        if (preShutwond && ICloudSignOnService.get() != null) {
+            ICloudSignOnService.get().stopHeartBeat();
+        }
         return preShutwond;
     }
 

main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/TalendHelpDocAction.java

@@ -1,40 +0,0 @@
-// ============================================================================
-//
-// 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.rcp.intro;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.program.Program;
-import org.eclipse.ui.internal.IWorkbenchGraphicConstants;
-import org.eclipse.ui.internal.WorkbenchImages;
-import org.eclipse.ui.internal.WorkbenchMessages;
-import org.talend.rcp.i18n.Messages;
-
-/**
- * DOC jding  class global comment. Detailled comment
- */
-public class TalendHelpDocAction extends Action {
-
-    private static final String TALEND_DOC_LINK = Messages.getString("TalendHelpDocAction.documentationLink"); //$NON-NLS-1$
-
-    public TalendHelpDocAction() {
-        setText(WorkbenchMessages.HelpContentsAction_text);
-        setToolTipText(WorkbenchMessages.HelpContentsAction_toolTip);
-        setImageDescriptor(WorkbenchImages.getImageDescriptor(IWorkbenchGraphicConstants.IMG_ETOOL_HELP_CONTENTS));
-    }
-
-    @Override
-    public void run() {
-        Program.launch(TALEND_DOC_LINK);
-    }
-
-}

main/plugins/org.talend.repository.items.importexport.ui/src/main/java/org/talend/repository/items/importexport/ui/wizard/imports/ImportItemsWizardPage.java

@@ -48,7 +48,6 @@ import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.events.FocusAdapter;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -64,6 +63,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.DirectoryDialog;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.TreeItem;
@@ -151,7 +151,7 @@ public class ImportItemsWizardPage extends WizardPage {
     private final List<String> errors = new ArrayList<String>();
 
     protected Button overwriteButton;
-                                                                                                       
+
     /*
      *
      */
@@ -191,26 +191,16 @@ public class ImportItemsWizardPage extends WizardPage {
 
     @Override
     public void createControl(Composite parent) {
-        ScrolledComposite scrolledComposite = new ScrolledComposite(parent, SWT.V_SCROLL);
-        setControl(scrolledComposite);
-        scrolledComposite.setLayout(new GridLayout());
-        scrolledComposite.setLayoutData( new GridData(GridData.FILL_BOTH));
-        
-        Composite composite = new Composite(scrolledComposite, SWT.NONE);
+        Composite composite = new Composite(parent, SWT.NONE);
+        setControl(composite);
         composite.setLayout(new GridLayout());
         composite.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-        scrolledComposite.setContent(composite);
-        
+
         createSelectionArea(composite);
         createImportDependenciesArea(composite);
         createItemListArea(composite);
         createErrorsListArea(composite);
         createAdditionArea(composite);
-        
-        scrolledComposite.setContent(composite);
-        scrolledComposite.setExpandHorizontal(true);
-        scrolledComposite.setExpandVertical(true);
-        scrolledComposite.setMinSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
 
         Dialog.applyDialogFont(composite);
     }
@@ -668,41 +658,21 @@ public class ImportItemsWizardPage extends WizardPage {
         GridData gridData = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.FILL_BOTH);
         optionsArea.setLayoutData(gridData);
 
-//        Group internalIdGroup = new Group(optionsArea, SWT.NONE);
-//        internalIdGroup.setText(Messages.getString("ImportItemsWizardPage_internalIdGroup"));
-//        internalIdGroup.setLayout(new GridLayout(1, true));
-//        FormData internalIdGroupLayoutData = new FormData();
-//        internalIdGroupLayoutData.top = new FormAttachment(0);
-//        internalIdGroupLayoutData.left = new FormAttachment(0);
-//        internalIdGroup.setLayoutData(internalIdGroupLayoutData);
-//
-//        regenIdBtn = new Button(internalIdGroup, SWT.RADIO);
-//        regenIdBtn.setText(Messages.getString("ImportItemsWizardPage_internalIdGroup_alwaysRegenId"));
-//
-//        Button keepOrigIdBtn = new Button(internalIdGroup, SWT.RADIO);
-//        keepOrigIdBtn.setText(Messages.getString("ImportItemsWizardPage_internalIdGroup_keepOrigId"));
-//        keepOrigIdBtn.setSelection(true);
-//
-//        // see feature 3949
-//        this.overwriteButton = new Button(optionsArea, SWT.CHECK);
-//        this.overwriteButton.setText(Messages.getString("ImportItemsWizardPage_overwriteItemsTxt")); //$NON-NLS-1$
-//        this.overwriteButton.addSelectionListener(new SelectionAdapter() {
-//
-//            @Override
-//            public void widgetSelected(SelectionEvent e) {
-//                if (StringUtils.isNotEmpty(directoryPathField.getText()) || StringUtils.isNotEmpty(archivePathField.getText())) {
-//                    populateItems(overwriteButton.getSelection(), true);
-//                }
-//            }
-//
-//        });
-//        FormData overwriteLayoutData = new FormData();
-//        overwriteLayoutData.top = new FormAttachment(internalIdGroup, 5, SWT.BOTTOM);
-//        overwriteLayoutData.left = new FormAttachment(internalIdGroup, 0, SWT.LEFT);
-//        this.overwriteButton.setLayoutData(overwriteLayoutData);
-//
-//        internalIdGroup.setVisible(false);
-        
+        Group internalIdGroup = new Group(optionsArea, SWT.NONE);
+        internalIdGroup.setText(Messages.getString("ImportItemsWizardPage_internalIdGroup"));
+        internalIdGroup.setLayout(new GridLayout(1, true));
+        FormData internalIdGroupLayoutData = new FormData();
+        internalIdGroupLayoutData.top = new FormAttachment(0);
+        internalIdGroupLayoutData.left = new FormAttachment(0);
+        internalIdGroup.setLayoutData(internalIdGroupLayoutData);
+
+        regenIdBtn = new Button(internalIdGroup, SWT.RADIO);
+        regenIdBtn.setText(Messages.getString("ImportItemsWizardPage_internalIdGroup_alwaysRegenId"));
+
+        Button keepOrigIdBtn = new Button(internalIdGroup, SWT.RADIO);
+        keepOrigIdBtn.setText(Messages.getString("ImportItemsWizardPage_internalIdGroup_keepOrigId"));
+        keepOrigIdBtn.setSelection(true);
+
         // see feature 3949
         this.overwriteButton = new Button(optionsArea, SWT.CHECK);
         this.overwriteButton.setText(Messages.getString("ImportItemsWizardPage_overwriteItemsTxt")); //$NON-NLS-1$
@@ -717,9 +687,11 @@ public class ImportItemsWizardPage extends WizardPage {
 
         });
         FormData overwriteLayoutData = new FormData();
-        overwriteLayoutData.top = new FormAttachment(optionsArea, 5, SWT.BOTTOM);
-        overwriteLayoutData.left = new FormAttachment(optionsArea, 0, SWT.LEFT);
+        overwriteLayoutData.top = new FormAttachment(internalIdGroup, 5, SWT.BOTTOM);
+        overwriteLayoutData.left = new FormAttachment(internalIdGroup, 0, SWT.LEFT);
         this.overwriteButton.setLayoutData(overwriteLayoutData);
+
+        internalIdGroup.setVisible(false);
     }
 
     protected boolean isEnableForExchange() {

main/plugins/org.talend.repository.metadata/plugin_ja.properties

@@ -13,7 +13,7 @@ repository.metadataLDAPSchema=LDAP
 repository.metadataLDAPSchema.alias=LDAP
 repository.metadataWSDLSchema=Web\u30B5\u30FC\u30D3\u30B9
 repository.metadataWSDLSchema.alias=WSDL
-repository.metadataGenericSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE
+repository.metadataGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE
 repository.metadataGenericSchema.alias=GENERIC
 repository.metadataDbConnection=DB\u63A5\u7D9A
 repository.metadataConnections.alias=DB

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

@@ -65,9 +65,9 @@ CreateFileXmlAction.action.editTitle=XML\u30D5\u30A1\u30A4\u30EB\u3092\u7DE8\u96
 CreateFileXmlAction.action.openTitle=XML\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F
 CreateFolderAction.action.title=\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u4F5C\u6210
 CreateFolderAction.action.toolTipText=\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u4F5C\u6210
-CreateGenericSchemaAction.createGeneric=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
-CreateGenericSchemaAction.editGeneric=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3092\u7DE8\u96C6
-CreateGenericSchemaAction.openGeneric=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3092\u958B\u304F
+CreateGenericSchemaAction.createGeneric=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
+CreateGenericSchemaAction.editGeneric=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u7DE8\u96C6
+CreateGenericSchemaAction.openGeneric=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u958B\u304F
 CreateLDAPSchemaAction.createLDAP=LDAP\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
 CreateLDAPSchemaAction.editLDAP=LDAP\u30B9\u30AD\u30FC\u30DE\u3092\u7DE8\u96C6
 CreateLDAPSchemaAction.openLDAP=LDAP\u30B9\u30AD\u30FC\u30DE\u3092\u958B\u304F
@@ -337,8 +337,8 @@ ImportProjectsAction.actionTooltip=\u65E2\u5B58\u306E{0}\u4EF6\u306E\u30D7\u30ED
 ImportProjectsUtilities.fileFormatError=\u30D5\u30A1\u30A4\u30EB{0}\u306Fzip\u3067\u3082tar\u30D5\u30A1\u30A4\u30EB\u3067\u3082\u3042\u308A\u307E\u305B\u3093
 ImportProjectsUtilities.task.checkingFolder=\u30C1\u30A7\u30C3\u30AF\u4E2D: {0}
 ImportProjectsUtilities.task.importingProject=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u4E2D...
-ImportSchemaFileAction.Label=XML\u304B\u3089\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
-ImportSchemaFileWizard.WizardTitle=XML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
+ImportSchemaFileAction.Label=XML\u304B\u3089\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
+ImportSchemaFileWizard.WizardTitle=XML\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
 ItemsVersionChangedDialog.OriginalVersion=\u30AA\u30EA\u30B8\u30CA\u30EB\u30D0\u30FC\u30B8\u30E7\u30F3
 ItemsVersionChangedDialog.Title=\u9805\u76EE\u306E\u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u78BA\u8A8D
 JavaJobScriptsExportWSWizardPage.actionRequest={0}_action_Request
@@ -1077,9 +1077,9 @@ FileWizardPage.of=of
 FileWizardPage.titleCreate=\u30D5\u30A1\u30A4\u30EB - \u30B9\u30C6\u30C3\u30D7
 FileWizardPage.titleUpdate=\u30D5\u30A1\u30A4\u30EB - \u30B9\u30C6\u30C3\u30D7
 GenericSchemaStep2Form.SelectDatabaseType=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30DE\u30C3\u30D4\u30F3\u30B0\u30BF\u30A4\u30D7\u3092\u9078\u629E
-GenericSchemaWizard.CreateNewGenericSchema=\u65B0\u3057\u3044\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
-GenericSchemaWizard.SaveAsGenericSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
-GenericSchemaWizard.UpdateGenericSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+GenericSchemaWizard.CreateNewGenericSchema=\u65B0\u3057\u3044\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u4F5C\u6210
+GenericSchemaWizard.SaveAsGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3068\u3057\u3066\u4FDD\u5B58
+GenericSchemaWizard.UpdateGenericSchema=\u6C4E\u7528\u30B9\u30AD\u30FC\u30DE\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
 LDAPSchemaStep1Form.CheckConnection=                    \u63A5\u7D9A\u3092\u30C1\u30A7\u30C3\u30AF\u3059\u308B\u305F\u3081\u306B\u4E0B\u8A18\u306E\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 LDAPSchemaStep1Form.CheckNetWorkParameter=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u30C1\u30A7\u30C3\u30AF
 LDAPSchemaStep1Form.EncryptionMethod=\u6697\u53F7\u5316\u65B9\u5F0F\uFF1A

main/plugins/org.talend.repository.view.example/components/tExampleComponent/tExampleComponent_java.xml

@@ -201,8 +201,8 @@ SHOW_IF="USE_FILE_AMBIGUOUS=='true'">
 	<CODEGENERATION>
 		<IMPORTS>
 			<IMPORT NAME="Talen File Enhanced"
-				MODULE="talend_file_enhanced-1.2.jar"
-				MVN="mvn:org.talend.components.lib/talend_file_enhanced/1.2" REQUIRED="true" />
+				MODULE="talend_file_enhanced-1.1.jar"
+				MVN="mvn:org.talend.components.lib/talend_file_enhanced/1.1" REQUIRED="true" />
 			<IMPORT NAME="Talend_CSV" MODULE="talendcsv.jar"
 				MVN="mvn:org.talend.libraries/talendcsv/6.0.0"
 				REQUIRED="true" />

main/plugins/org.talend.repository.view/src/messages_ja.properties

@@ -14,7 +14,7 @@ RepositoryFilterSettingDialog.Item=\u672A\u8A2D\u5B9A\u306E\u30B9\u30C6\u30FC\u3
 RepositoryFilterSettingDialog.Label=\u30E9\u30D9\u30EB
 RepositoryFilterSettingDialog.LastName=LastName
 RepositoryFilterSettingDialog.Login=\u30ED\u30B0\u30A4\u30F3
-RepositoryFilterSettingDialog.PatternInfo=\u30D1\u30BF\u30FC\u30F3\u306F\u30B3\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u3066\u304A\u308A\u3001\n* \u306F\u3042\u3089\u3086\u308B\u6587\u5B57\u5217\u3092\u3001? \u306F\u3042\u3089\u3086\u308B\u6587\u5B57(,, = ,)\u3092\u305D\u308C\u305E\u308C\u8868\u3057\u307E\u3059
+RepositoryFilterSettingDialog.PatternInfo=\u30D1\u30BF\u30FC\u30F3\u306F\u30AB\u30F3\u30DE\u3067\u533A\u5207\u3089\u308C\u3066\u304A\u308A\u3001\n* \u306F\u3042\u3089\u3086\u308B\u6587\u5B57\u5217\u3092\u3001? \u306F\u3042\u3089\u3086\u308B\u6587\u5B57(,, = ,)\u3092\u305D\u308C\u305E\u308C\u8868\u3057\u307E\u3059
 RepoViewCommonNavigator.Content={1}\u3067{0}\u306B\u3088\u3063\u3066\u30ED\u30C3\u30AF\u3055\u308C\u3066\u3044\u307E\u3059
 RepoViewCommonNavigator.Desc=  \u8AAC\u660E:
 RepoViewCommonNavigator.refresh=\u66F4\u65B0\u4E2D...

test/plugins/org.talend.core.runtime.test/src/org/talend/core/database/conn/DatabaseVersion4DriversTest.java

@@ -40,18 +40,17 @@ public class DatabaseVersion4DriversTest {
         assertTrue(drivers.containsAll(Arrays.asList(redshiftDrivers)));
 
         String[] redshiftSSODrivers = new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar",
-                "jackson-core-2.13.4.jar", "jackson-databind-2.13.4.2.jar",
+                "aws-java-sdk-1.11.848.jar", "jackson-core-2.13.4.jar", "jackson-databind-2.13.4.2.jar",
                 "jackson-annotations-2.13.4.jar", "httpcore-4.4.13.jar", "httpclient-4.5.13.jar", "joda-time-2.8.1.jar",
                 "commons-logging-1.2.jar", "commons-codec-1.14.jar", "aws-java-sdk-redshift-internal-1.12.x.jar" };
         drivers = EDatabaseVersion4Drivers.getDrivers(EDatabaseTypeName.REDSHIFT_SSO.getDisplayName(),
                 ERedshiftDriver.DRIVER_V1.name());
         assertTrue(drivers.containsAll(Arrays.asList(redshiftSSODrivers)));
 
-        redshiftSSODrivers = new String[] { "redshift-jdbc42-2.1.0.10.jar", "antlr4-runtime-4.8-1.jar", "jackson-core-2.13.4.jar",
-                "jackson-databind-2.13.4.2.jar", "jackson-annotations-2.13.4.jar", "httpcore-4.4.13.jar", "httpclient-4.5.13.jar",
-                "joda-time-2.8.1.jar", "commons-logging-1.2.jar", "commons-codec-1.14.jar",
-                "aws-java-sdk-redshift-internal-1.12.x.jar", "aws-java-sdk-core-1.12.315.jar", "aws-java-sdk-sts-1.12.315.jar",
-                "aws-java-sdk-redshift-1.12.315.jar", "jmespath-java-1.12.315.jar" };
+        redshiftSSODrivers = new String[] { "redshift-jdbc42-2.1.0.10.jar", "antlr4-runtime-4.8-1.jar",
+                "aws-java-sdk-1.11.848.jar", "jackson-core-2.13.4.jar", "jackson-databind-2.13.4.2.jar",
+                "jackson-annotations-2.13.4.jar", "httpcore-4.4.13.jar", "httpclient-4.5.13.jar", "joda-time-2.8.1.jar",
+                "commons-logging-1.2.jar", "commons-codec-1.14.jar", "aws-java-sdk-redshift-internal-1.12.x.jar" };
         drivers = EDatabaseVersion4Drivers.getDrivers(EDatabaseTypeName.REDSHIFT_SSO.getDisplayName(),
                 ERedshiftDriver.DRIVER_V2.name());
         assertTrue(drivers.containsAll(Arrays.asList(redshiftSSODrivers)));