Fix TUP-38743 Dark Mode: Job editor color is still using light theme in (#6130)

Fix TUP-38743 Dark Mode: Job editor color is still using light theme in Remote Project
https://jira.talendforge.org/browse/TUP-38743

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

@@ -115,8 +115,6 @@ public enum ECoreImage implements IImage {
 
     METADATA_SAPCONNECTION_ICON("/icons1/sapconnection.png"), //$NON-NLS-1$
     METADATA_SAPCONNECTION_WIZ("/icons1/connection_wiz.gif"), //$NON-NLS-1$
-    
-    METADATA_BIGQUERYCONNECTION_ICON("/icons1/bigqueryconnection.png"), //$NON-NLS-1$
 
     METADATA_HEADERFOOTER_ICON("/icons1/headerfooter_icon32.png"), //$NON-NLS-1$
 

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

@@ -40,8 +40,8 @@ public enum EImage implements IImage {
     READ_ICON("/icons/read_obj.gif"), //$NON-NLS-1$
 
     QUESTION_ICON("/icons/question.gif"), //$NON-NLS-1$
+
     HELP_ICON("/icons/help.png"), //$NON-NLS-1$
-    MOREINFO_ICON("/icons/moreInfo.png"), //$NON-NLS-1$
 
     CREATE_CONNECTION_ICON("/icons/connection.gif"), //$NON-NLS-1$
 

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

@@ -92,7 +92,7 @@
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.12.2</version>
+            <version>2.12.0</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.reload4j</groupId>
@@ -125,7 +125,7 @@
                  <dependency>
                   <groupId>com.google.guava</groupId>
                   <artifactId>guava</artifactId>
-                  <version>32.0.1-jre</version>
+                  <version>30.0-jre</version>
                  </dependency>
                 </dependencies>
                 <configuration>

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/DB2ForZosDataBaseMetadata.java

@@ -145,30 +145,7 @@ public class DB2ForZosDataBaseMetadata extends PackageFakeDatabaseMetadata {
      */
     @Override
     public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException {
-        ResultSet rs = super.getPrimaryKeys(catalog, schema, table);
-        if (rs == null) {
-            rs = new DB2ForZosResultSet();
-        }
-        return rs;
-    }
-    
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#getExportedKeys(java.lang.String, java.lang.String,
-     * java.lang.String)
-     */
-    @Override
-    public ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException {
-        ResultSet rs = super.getExportedKeys(catalog, schema, table);
-        if (rs == null) {
-            if (this.metaData != null) {
-                rs = this.metaData.getExportedKeys(catalog, schema, table);
-            } else {
-                rs = new DB2ForZosResultSet();
-            }
-        }
-        return rs;
+        return new DB2ForZosResultSet();
     }
 
     /*
@@ -197,6 +174,17 @@ public class DB2ForZosDataBaseMetadata extends PackageFakeDatabaseMetadata {
         return tableResultSet;
     }
 
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.talend.commons.utils.database.FakeDatabaseMetaData#getExportedKeys(java.lang.String, java.lang.String,
+     * java.lang.String)
+     */
+    @Override
+    public ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException {
+        return new DB2ForZosResultSet();
+    }
+
     /*
      * (non-Javadoc)
      *

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/button/ExportPushButtonForExtendedTable.java

@@ -130,10 +130,11 @@ public abstract class ExportPushButtonForExtendedTable extends ExportPushButton
         AbstractExtendedTableViewer extendedTableViewer = (AbstractExtendedTableViewer) extendedControlViewer;
         ExtendedTableModel extendedTableModel = extendedTableViewer.getExtendedTableModel();
         boolean enabled = false;
-        if (extendedTableModel != null && extendedTableModel.isDataRegistered() && extendedTableModel.getBeansList().size() > 0) {
+        if (extendedTableModel != null && extendedTableModel.isDataRegistered()
+                && extendedTableModel.getBeansList().size() > 0) {
             enabled = true;
         }
-        return extendedTableModel != null || enabled;
+        return super.getEnabledState() && enabled;
     }
 
 }

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/button/SaveAsGenericSchemaPushButton.java

@@ -19,7 +19,6 @@ import org.talend.commons.ui.runtime.image.EImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
 import org.talend.commons.ui.swt.advanced.dataeditor.control.ExtendedPushButton;
 import org.talend.commons.ui.swt.extended.table.AbstractExtendedTableViewer;
-import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
 
 /**
  * DOC Administrator class global comment. Detailled comment <br/>
@@ -34,11 +33,4 @@ public abstract class SaveAsGenericSchemaPushButton extends ExtendedPushButton {
 
     @Override
     protected abstract Command getCommandToExecute();
-
-    @Override
-    public boolean getEnabledState() {
-        AbstractExtendedTableViewer extendedTableViewer = (AbstractExtendedTableViewer) extendedControlViewer;
-        ExtendedTableModel extendedTableModel = extendedTableViewer.getExtendedTableModel();
-        return extendedTableModel != null;
-    }
 }

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

@@ -156,7 +156,6 @@ ProjectRepositoryNode.invalidItem=Invalid item
 ProjectRepositoryNode.columns=Columns
 ProjectRepositoryNode.validationRules=Validation Rules
 ProjectRepositoryNode.cdcFoundation=CDC Foundation
-ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (deprecated)
 ProjectRepositoryNode.genericSchema=Generic schemas
 ProjectRepositoryNode.queries=Queries
 ProjectRepositoryNode.synonymSchemas=Synonym schemas
@@ -176,7 +175,6 @@ ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
 ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
 ProjectRepositoryNode.sapContentExtractor=SAP BI Content Extractor
-ProjectRepositoryNode.sapCDSView=SAP CDS View
 RepositoryDropAdapter_copyingItems=Copying items...
 RepositoryDropAdapter_errorMsg=This directory contains the locked item,it can not be moved now
 RepositoryDropAdapter_lockedByOthers=This item is locked by other users, it can not be moved now.

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

@@ -156,7 +156,6 @@ ProjectRepositoryNode.invalidItem=\u00C9l\u00E9ment invalide
 ProjectRepositoryNode.columns=Colonnes
 ProjectRepositoryNode.validationRules=R\u00E8gles de validation
 ProjectRepositoryNode.cdcFoundation=Fondation CDC
-ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (d\u00E9pr\u00E9ci\u00E9)
 ProjectRepositoryNode.genericSchema=Sch\u00E9mas g\u00E9n\u00E9riques
 ProjectRepositoryNode.queries=Requ\u00EAtes
 ProjectRepositoryNode.synonymSchemas=Sch\u00E9mas synonymes
@@ -176,7 +175,6 @@ ProjectRepositoryNode.sapBWDataStoreObject=Objet Data Store SAP
 ProjectRepositoryNode.sapBWInfoCube=InfoCube SAP
 ProjectRepositoryNode.sapBWInfoObject=InfoObject SAP
 ProjectRepositoryNode.sapContentExtractor=Extracteur SAP BI Content
-ProjectRepositoryNode.sapCDSView=Vue SAP CDS
 RepositoryDropAdapter_copyingItems=Copie des \u00E9l\u00E9ments...
 RepositoryDropAdapter_errorMsg=Ce r\u00E9pertoire contient l'\u00E9l\u00E9ment verrouill\u00E9, il ne peut \u00EAtre d\u00E9plac\u00E9
 RepositoryDropAdapter_lockedByOthers=Cet \u00E9l\u00E9ment est verrouill\u00E9 par d'autres utilisateurs, impossible de le d\u00E9placer.

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

@@ -156,7 +156,6 @@ 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.cdcFoundation.deprecated=CDC Foundation (\u975E\u63A8\u5968)
 ProjectRepositoryNode.genericSchema=\u30B8\u30A7\u30CD\u30EA\u30C3\u30AF\u30B9\u30AD\u30FC\u30DE
 ProjectRepositoryNode.queries=\u30AF\u30A8\u30EA\u30FC
 ProjectRepositoryNode.synonymSchemas=\u30B7\u30CE\u30CB\u30E0\u30B9\u30AD\u30FC\u30DE
@@ -176,7 +175,6 @@ ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
 ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
 ProjectRepositoryNode.sapContentExtractor=SAP BI\u30B3\u30F3\u30C6\u30F3\u30C4\u30A8\u30AF\u30B9\u30C8\u30E9\u30AF\u30BF\u30FC
-ProjectRepositoryNode.sapCDSView=SAP CDS\u30D3\u30E5\u30FC
 RepositoryDropAdapter_copyingItems=\u30A2\u30A4\u30C6\u30E0\u3092\u30B3\u30D4\u30FC\u4E2D...
 RepositoryDropAdapter_errorMsg=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u30ED\u30C3\u30AF\u3055\u308C\u305F\u30A2\u30A4\u30C6\u30E0\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u73FE\u5728\u3001\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093,
 RepositoryDropAdapter_lockedByOthers=\u3053\u306E\u30A2\u30A4\u30C6\u30E0\u304C\u4ED6\u306E\u30E6\u30FC\u30B6\u30FC\u306B\u3088\u3063\u3066\u30ED\u30C3\u30AF\u3055\u308C\u307E\u3057\u305F\u3002\u73FE\u5728\u3001\u79FB\u52D5\u3067\u304D\u307E\u305B\u3093\u3002

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

@@ -156,7 +156,6 @@ ProjectRepositoryNode.invalidItem=\u65E0\u6548\u9879\u76EE
 ProjectRepositoryNode.columns=\u5217
 ProjectRepositoryNode.validationRules=\u9A8C\u8BC1\u89C4\u5219
 ProjectRepositoryNode.cdcFoundation=CDC Foundation
-ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (\u5DF2\u5F03\u7528)
 ProjectRepositoryNode.genericSchema=\u901A\u7528 schema
 ProjectRepositoryNode.queries=\u67E5\u8BE2
 ProjectRepositoryNode.synonymSchemas=\u540C\u4E49\u5B57 schema
@@ -176,7 +175,6 @@ ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
 ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
 ProjectRepositoryNode.sapBWInfoObject=SAP InfoObject
 ProjectRepositoryNode.sapContentExtractor=SAP BI \u5185\u5BB9\u63D0\u53D6\u5668
-ProjectRepositoryNode.sapCDSView=SAP CDS \u89C6\u56FE
 RepositoryDropAdapter_copyingItems=\u6B63\u5728\u590D\u5236\u9879\u76EE...
 RepositoryDropAdapter_errorMsg=\u6B64\u76EE\u5F55\u5305\u542B\u9501\u5B9A\u7684\u9879\u76EE\uFF0C\u73B0\u5728\u65E0\u6CD5\u79FB\u52A8
 RepositoryDropAdapter_lockedByOthers=\u6B64\u9879\u76EE\u88AB\u5176\u4ED6\u7528\u6237\u9501\u5B9A\uFF0C\u73B0\u5728\u65E0\u6CD5\u79FB\u52A8\u3002

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

@@ -67,6 +67,7 @@ import org.talend.core.model.repository.Folder;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.LockInfo;
 import org.talend.core.model.repository.RepositoryViewObject;
+import org.talend.core.model.routines.RoutinesUtil;
 import org.talend.core.repository.i18n.Messages;
 import org.talend.core.repository.utils.XmiResourceManager;
 import org.talend.core.runtime.CoreRuntimePlugin;
@@ -130,7 +131,7 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
                 ERepositoryObjectType.METADATA_FILE_RULES, ERepositoryObjectType.METADATA_FILE_HL7,
                 ERepositoryObjectType.METADATA_FILE_FTP, ERepositoryObjectType.METADATA_FILE_BRMS,
                 ERepositoryObjectType.METADATA_MDMCONNECTION, ERepositoryObjectType.METADATA_HEADER_FOOTER,
-                ERepositoryObjectType.JOB_SCRIPT, ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS };
+                ERepositoryObjectType.JOB_SCRIPT };
 
         List<IRepositoryViewObject> deletedItems = new ArrayList<IRepositoryViewObject>();
         for (ERepositoryObjectType type : types) {
@@ -873,38 +874,25 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
     @Override
     public IRepositoryViewObject getLastVersion(Project project, String id, String relativeFolder, ERepositoryObjectType type)
             throws PersistenceException {
-        List<IRepositoryViewObject> serializableAllVersion = new ArrayList<>();
-        if (lastFolderForItemMap.containsKey(id)) {
-            ERepositoryObjectType itemType = lastRepositoryTypeForItemMap.get(id);
-            String currentPath = lastFolderForItemMap.get(id);
-            Object fullFolder = getFullFolder(project, itemType, currentPath);
-            try {
-                if (fullFolder != null && (fullFolder instanceof FolderItem || ((IFolder) fullFolder).exists())) {
-                    serializableAllVersion.addAll(getSerializableFromFolder(project, fullFolder, id, itemType, false, false, true, true));
-                }
-            } catch (PersistenceException e) {
-                // do nothing.
-                // if any exception happen or can't find the item, just try to look for it everywhere.
-            }
-        }
+        List<IRepositoryViewObject> serializableAllVersion = null;
+        Object fullFolder = getFullFolder(project, type, relativeFolder);
+        serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, false, true, true);
         if (serializableAllVersion.isEmpty()) {
-            Object fullFolder = getFullFolder(project, type, relativeFolder);
-            serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, false, true, true);
-            if (serializableAllVersion.isEmpty()) {
-                // look in all folders for this item type
-                serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, true, true, true, true);
-            }
+            // look in all folders for this item type
+            serializableAllVersion = getSerializableFromFolder(project, fullFolder, id, type, false, true, true, true, true);
         }
         int size = serializableAllVersion.size();
+
         if (size > 1) {
             String message = getItemsMessages(serializableAllVersion, size);
+
             throw new PersistenceException(Messages.getString(
                     "AbstractEMFRepositoryFactory.presistenceException.OnlyOneOccurenceMustbeFound", message)); //$NON-NLS-1$
-        }
-        if (size == 1) {
+        } else if (size == 1) {
             return serializableAllVersion.get(0);
+        } else {
+            return null;
         }
-        return null;
     }
 
     protected void computePropertyMaxInformationLevel(Property property) {

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

@@ -184,7 +184,6 @@ public abstract class AbstractRepositoryFactory implements IRepositoryFactory {
         collect(getMetadata(project, ERepositoryObjectType.METADATA_FILE_LDIF), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_CONNECTIONS), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_SAPCONNECTIONS), result);
-        collect(getMetadata(project, ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_HEADER_FOOTER), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_LDAP_SCHEMA), result);
         collect(getMetadata(project, ERepositoryObjectType.METADATA_GENERIC_SCHEMA), result);

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

@@ -102,7 +102,6 @@ import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.helper.SAPBWTableHelper;
 import org.talend.cwm.helper.SubItemHelper;
 import org.talend.cwm.helper.TableHelper;
-import org.talend.cwm.helper.TaggedValueHelper;
 import org.talend.designer.core.IDesignerCoreService;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.model.BinRepositoryNode;
@@ -1350,8 +1349,6 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             connection = dbMetadataConnection;
         } else if (type == ERepositoryObjectType.METADATA_SAPCONNECTIONS) {
             connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
-        } else if (type == ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS) {
-            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_DELIMITED) {
             connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_POSITIONAL) {
@@ -1703,11 +1700,11 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                 DatabaseConnectionItem connectionItem = (DatabaseConnectionItem) item;
                 DatabaseConnection connection = (DatabaseConnection) connectionItem.getConnection();
                 if (PluginChecker.isCDCPluginLoaded()) {
-                    ICDCProviderService service = GlobalServiceRegister.getDefault().getService(ICDCProviderService.class);
-
+                    ICDCProviderService service = GlobalServiceRegister.getDefault()
+                            .getService(ICDCProviderService.class);
                     if (service != null && service.canCreateCDCConnection(connection)) {
                         RepositoryNode cdcNode = new StableRepositoryNode(node,
-                                Messages.getString("ProjectRepositoryNode.cdcFoundation.deprecated"), //$NON-NLS-1$
+                                Messages.getString("ProjectRepositoryNode.cdcFoundation"), //$NON-NLS-1$
                                 ECoreImage.FOLDER_CLOSE_ICON);
                         node.getChildren().add(cdcNode);
                         service.createCDCTypes(recBinNode, cdcNode, connection.getCdcConns());
@@ -1754,9 +1751,6 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
             // 10. BW Business Content Extractor:
             createSAPContentExtractorNodes(repObj, metadataConnection, node, validationRules);
-
-            // 11. CDS views:
-            createSAPCDSViewNodes(repObj, metadataConnection, node, validationRules);
         } else if (metadataConnection instanceof SalesforceSchemaConnection) {
             createSalesforceModuleNodes(repObj, metadataConnection, node, validationRules);
         } else {
@@ -1790,9 +1784,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         for (MetadataTable tablesWithOrder : tablesWithOrders) {
             EMap<String, String> properties = tablesWithOrder.getAdditionalProperties();
             String partitionKey = properties.get(EProperties.CONTENT_TYPE.name());
-            String cdsType = TaggedValueHelper.getValueString(EProperties.CONTENT_TYPE.name(), tablesWithOrder);
-            if (!ERepositoryObjectType.METADATA_SAP_CONTENT_EXTRACTOR.name().equals(partitionKey)
-                    && !ERepositoryObjectType.METADATA_SAP_CDS_VIEW.name().equals(cdsType)) {
+            if (!ERepositoryObjectType.METADATA_SAP_CONTENT_EXTRACTOR.name().equals(partitionKey)) {
                 tables.add(tablesWithOrder);
             }
         }
@@ -1975,32 +1967,6 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         createTables(tableContainer, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
     }
 
-    private void createSAPCDSViewNodes(IRepositoryViewObject repObj, Connection metadataConnection, RepositoryNode node,
-            List<IRepositoryViewObject> validationRules) {
-        StableRepositoryNode tableContainer = new StableRepositoryNode(node,
-                Messages.getString("ProjectRepositoryNode.sapCDSView"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
-        tableContainer.setChildrenObjectType(ERepositoryObjectType.METADATA_CON_TABLE);
-        tableContainer.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_CDS_VIEW);
-        IRepositoryNode cacheNode = nodeCache.getCache(tableContainer);
-        if (cacheNode != null && cacheNode instanceof StableRepositoryNode) {
-            tableContainer = (StableRepositoryNode) cacheNode;
-            tableContainer.getChildren().clear();
-        } else {
-            nodeCache.addCache(tableContainer, true);
-        }
-
-        node.getChildren().add(tableContainer);
-        List<MetadataTable> tablesWithOrders = ConnectionHelper.getTablesWithOrders(metadataConnection);
-        EList<MetadataTable> tables = new BasicEList<>();
-        for (MetadataTable tablesWithOrder : tablesWithOrders) {
-            String cdsType = TaggedValueHelper.getValueString(EProperties.CONTENT_TYPE.name(), tablesWithOrder);
-            if (ERepositoryObjectType.METADATA_SAP_CDS_VIEW.name().equals(cdsType)) {
-                tables.add(tablesWithOrder);
-            }
-        }
-        createTables(tableContainer, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
-    }
-
     private void createSalesforceModuleNodes(IRepositoryViewObject rebObj, Connection metadataConnection,
             RepositoryNode connectionNode, List<IRepositoryViewObject> validationRules) {
         EList modules = ((SalesforceSchemaConnection) metadataConnection).getModules();

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

@@ -54,7 +54,9 @@ import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.osgi.internal.serviceregistry.ServiceReferenceImpl;
 import org.eclipse.osgi.internal.serviceregistry.ServiceRegistrationImpl;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.navigator.CommonNavigator;
 import org.eclipse.ui.navigator.CommonViewer;
@@ -445,10 +447,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                             if (currentShell == null) {
                                 currentShell = DisplayUtils.getDefaultShell(false);
                             }
-                            if (MessageDialog.openQuestion(currentShell,
-                                    Messages.getString("ProxyRepositoryFactory.JobNameErroe"), //$NON-NLS-1$
-                                    Messages.getString("ProxyRepositoryFactory.Label") + " " + name + " " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                                            + Messages.getString("ProxyRepositoryFactory.ReplaceJob"))) { //$NON-NLS-1$
+                            MessageBox box = new MessageBox(currentShell, SWT.ICON_WARNING | SWT.OK | SWT.CANCEL);
+                            box.setText(Messages.getString("ProxyRepositoryFactory.JobNameErroe")); //$NON-NLS-1$
+                            box.setMessage(Messages.getString("ProxyRepositoryFactory.Label") + " " + name + " " + Messages.getString("ProxyRepositoryFactory.ReplaceJob")); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
+
+                            if (box.open() == SWT.OK) {
+
                                 ok[0] = true;
                             }
                         }
@@ -2207,13 +2211,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     ExceptionHandler.process(e);
                 }
                 
-                if (IHadoopDistributionService.get() != null) {
-                    try {
-                        IHadoopDistributionService.get().checkAndMigrateDistributionProxyCredential(project);
-                    } catch (Exception e) {
-                        ExceptionHandler.process(e);
-                    }
-                }
                 // init dynamic distirbution after `beforeLogon`, before loading libraries.
                 initDynamicDistribution(monitor);
                 

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

@@ -606,8 +606,6 @@ public class DuplicateAction extends AContextualAction {
                     item = PropertiesFactory.eINSTANCE.createSalesforceSchemaConnectionItem();
                 } else if (repositoryType == ERepositoryObjectType.METADATA_SAPCONNECTIONS) {
                     item = PropertiesFactory.eINSTANCE.createSAPConnectionItem();
-                } else if (repositoryType == ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS) {
-                    item = PropertiesFactory.eINSTANCE.createBigQueryConnectionItem();
                 } else if (repositoryType == ERepositoryObjectType.METADATA_WSDL_SCHEMA) {
                     item = PropertiesFactory.eINSTANCE.createWSDLSchemaConnectionItem();
                 } else if (repositoryType == ERepositoryObjectType.PROCESS) {

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

@@ -40,7 +40,6 @@ import org.talend.core.model.utils.CloneConnectionUtils;
 import org.talend.core.model.utils.ContextParameterUtils;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.cwm.helper.ConnectionHelper;
-import org.talend.cwm.helper.StudioEncryptionHelper;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
 import org.talend.model.bridge.ReponsitoryContextBridge;
 
@@ -68,7 +67,6 @@ public class StandaloneConnectionContextUtils {
         String server = getOriginalValue(contextProperties, dbConn.getServerName());
         String username = getOriginalValue(contextProperties, dbConn.getUsername());
         String password = getOriginalValue(contextProperties, dbConn.getRawPassword());
-        String originEncryptedPassword = getOriginalValue(contextProperties, dbConn.getPassword());
         String port = getOriginalValue(contextProperties, dbConn.getPort());
         String sidOrDatabase = getOriginalValue(contextProperties, dbConn.getSID());
         String datasource = getOriginalValue(contextProperties, dbConn.getDatasourceName());
@@ -89,8 +87,6 @@ public class StandaloneConnectionContextUtils {
         cloneConn.setDatasourceName(datasource);
         cloneConn.setDBRootPath(dbRootPath);
         cloneConn.setFileFieldName(filePath);
-        //To avoid encrypt the same value
-        cloneConn.setPassword(originEncryptedPassword);
         cloneConn.setRawPassword(password); // the password is raw.
         cloneConn.setPort(port);
         cloneConn.setUiSchema(schemaOracle);

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

@@ -43,8 +43,6 @@ public class PluginChecker {
     private static final String CDC_PLUGIN_ID = "org.talend.designer.cdc"; //$NON-NLS-1$
 
     private static final String SAP_WZIARD_PLUGIN_ID = "org.talend.repository.sap"; //$NON-NLS-1$
-    
-    private static final String BIGQUERY_WZIARD_PLUGIN_ID = "org.talend.repository.bigquery"; //$NON-NLS-1$
 
     private static final String EBCDIC_PLUGIN_ID = "org.talend.repository.ebcdic"; //$NON-NLS-1$
 
@@ -248,10 +246,6 @@ public class PluginChecker {
     public static boolean isSAPWizardPluginLoaded() {
         return isPluginLoaded(SAP_WZIARD_PLUGIN_ID);
     }
-    
-    public static boolean isBigQueryWizardPluginLoaded() {
-        return isPluginLoaded(BIGQUERY_WZIARD_PLUGIN_ID);
-    }
 
     public static boolean isEBCDICPluginLoaded() {
         return isPluginLoaded(EBCDIC_PLUGIN_ID);
@@ -274,7 +268,7 @@ public class PluginChecker {
     }
 
     public static boolean isExchangeSystemLoaded() {
-        return false;
+        return isPluginLoaded(EXCHANGE_SYSTEM_PLUGIN_ID);
     }
 
     public static boolean isRulesPluginLoaded() { // added by hyWang

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

@@ -52,7 +52,6 @@ public enum EDatabase4DriverClassName {
     MYSQL8(EDatabaseTypeName.MYSQL, "com.mysql.cj.jdbc.Driver"), //$NON-NLS-1$
     MARIADB(EDatabaseTypeName.MYSQL, "org.mariadb.jdbc.Driver"), //$NON-NLS-1$
     AMAZON_AURORA(EDatabaseTypeName.AMAZON_AURORA, "org.gjt.mm.mysql.Driver"), //$NON-NLS-1$
-    AMAZON_AURORA_3(EDatabaseTypeName.AMAZON_AURORA, "com.mysql.cj.jdbc.Driver"), //$NON-NLS-1$
     NETEZZA(EDatabaseTypeName.NETEZZA, "org.netezza.Driver"), //$NON-NLS-1$
 
     ORACLEFORSID(EDatabaseTypeName.ORACLEFORSID, "oracle.jdbc.OracleDriver", "oracle.jdbc.driver.OracleDriver"), //$NON-NLS-1$ //$NON-NLS-2$
@@ -88,8 +87,8 @@ public enum EDatabase4DriverClassName {
     // MOD klliu 2010-06-04 bug 12819: upgrade jdbc driver class used in sql explorer
     TERADATA(EDatabaseTypeName.TERADATA, "com.teradata.jdbc.TeraDriver"), //$NON-NLS-1$
 
-//    VERTICA(EDatabaseTypeName.VERTICA, "com.vertica.Driver"), //$NON-NLS-1$
-    VERTICA(EDatabaseTypeName.VERTICA, "com.vertica.jdbc.Driver"), //$NON-NLS-1$
+    VERTICA(EDatabaseTypeName.VERTICA, "com.vertica.Driver"), //$NON-NLS-1$
+    VERTICA2(EDatabaseTypeName.VERTICA, "com.vertica.jdbc.Driver"), //$NON-NLS-1$
 
     HIVE(EDatabaseTypeName.HIVE, "org.apache.hadoop.hive.jdbc.HiveDriver"), //$NON-NLS-1$
 

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

@@ -252,8 +252,6 @@ public class ConnParameterKeys {
     
     public static final String CONN_PARA_KEY_EXECUTOR_MEMORY = "CONN_PARA_KEY_EXECUTOR_MEMORY"; //$NON-NLS-1$
     
-    public static final String CONN_PARA_KEY_EXECUTOR_CORES = "CONN_PARA_KEY_EXECUTOR_CORES";
-    
     public static final String CONN_PARA_KEY_TUNING_PROPERTIES = "CONN_PARA_KEY_TUNING_PROPERTIES"; //$NON-NLS-1$
 
     /******************************************/
@@ -455,9 +453,6 @@ public class ConnParameterKeys {
     public static final String CONN_PARA_KEY_UNIV_STANDALONE_EXEC_MEMORY="CONN_PARA_KEY_UNIV_STANDALONE_EXEC_MEMORY";
     public static final String CONN_PARA_KEY_UNIV_STANDALONE_EXEC_CORE="CONN_PARA_KEY_UNIV_STANDALONE_EXEC_CORE";
     
-    
-    // Spark Submit Scripts
-    public static final String CONN_PARA_KEY_UNIV_SPARK_SUBMIT_SCRIPT_HOME="CONN_PARA_KEY_UNIV_SPARK_SUBMIT_SCRIPT_HOME";
     /**
      * Redshift
      */

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

@@ -33,7 +33,7 @@ public enum EDatabaseVersion4Drivers {
     ACCESS_2007(new DbVersion4Drivers(EDatabaseTypeName.ACCESS, "Access 2007", "Access_2007")), //$NON-NLS-1$ //$NON-NLS-2$
     // oracle
     ORACLE_18(new DbVersion4Drivers(new EDatabaseTypeName[] { EDatabaseTypeName.ORACLEFORSID, EDatabaseTypeName.ORACLESN,
-            EDatabaseTypeName.ORACLE_OCI, EDatabaseTypeName.ORACLE_CUSTOM }, "Oracle 18 and above", "ORACLE_18", "ojdbc8-19.19.0.0.jar")),
+            EDatabaseTypeName.ORACLE_OCI, EDatabaseTypeName.ORACLE_CUSTOM }, "Oracle 18 and above", "ORACLE_18", "ojdbc8-19.3.0.0.jar")),
     ORACLE_12(new DbVersion4Drivers(new EDatabaseTypeName[] { EDatabaseTypeName.ORACLEFORSID, EDatabaseTypeName.ORACLESN,
             EDatabaseTypeName.ORACLE_OCI, EDatabaseTypeName.ORACLE_CUSTOM }, "Oracle 12 (Deprecated)", "ORACLE_12",
             "ojdbc7.jar")),
@@ -69,9 +69,9 @@ public enum EDatabaseVersion4Drivers {
             "SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "reload4j-1.2.22.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     SAPHana(new DbVersion4Drivers(EDatabaseTypeName.SAPHana, "HDB 1.0", "HDB_1_0", "ngdbc.jar")), //$NON-NLS-1$
     // MYSQL, add for 9594
-    MYSQL_8(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 8", "MYSQL_8", "mysql-connector-j-8.0.33.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    MYSQL_8(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 8", "MYSQL_8", "mysql-connector-java-8.0.18.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MYSQL_5(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 5", "MYSQL_5", "mysql-connector-java-5.1.49.jar")), //$NON-NLS-1$  //$NON-NLS-2$ //$NON-NLS-3$
-    MARIADB(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MariaDB", "MARIADB", "mariadb-java-client-3.1.4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    MARIADB(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MariaDB", "MARIADB", "mariadb-java-client-2.5.3.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     // add for 9594
     MSSQL(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,"Open source JTDS", "JTDS", "jtds-1.3.1-patch-20190523.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MSSQL_2012(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
@@ -81,13 +81,10 @@ public enum EDatabaseVersion4Drivers {
             new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.34.jar", "slf4j-reload4j-1.7.34.jar", "msal4j-1.11.0.jar", //$NON-NLS-1$
                     "oauth2-oidc-sdk-9.7.jar", "reload4j-1.2.22.jar", "jackson-core-2.13.4.jar",
                     "jackson-databind-2.13.4.2.jar", "jackson-annotations-2.13.4.jar", "jcip-annotations-1.0-1.jar",
-                    "json-smart-2.4.11.jar", "nimbus-jose-jwt-9.22.jar", "accessors-smart-2.4.11.jar", "asm-9.5.jar",
+                    "json-smart-2.4.7.jar", "nimbus-jose-jwt-9.22.jar", "accessors-smart-2.4.7.jar", "asm-9.1.jar",
                     "content-type-2.1.jar", "lang-tag-1.5.jar" })),
 
-//    VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X  (Deprecated)", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    
-    //https://mvnrepository.com/artifact/com.vertica.jdbc/vertica-jdbc/12.0.4-0
-    VERTICA_12(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 12.X", "VERTICA_12_0", "vertica-jdbc-12.0.4-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     // for bug 0017930
     GREENPLUM_PSQL(new DbVersion4Drivers(EDatabaseTypeName.GREENPLUM,"PostgreSQL", "POSTGRESQL", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$
@@ -159,10 +156,7 @@ public enum EDatabaseVersion4Drivers {
                     "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$
 
-    AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "MySQL 5", "MYSQL_5", //$NON-NLS-1$
-            "mysql-connector-java-5.1.49.jar")),
-    AMAZON_AURORA_3(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "MySQL 8", "MYSQL_8", //$NON-NLS-1$
-            "mysql-connector-j-8.0.33.jar"));
+    AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.49.jar")); //$NON-NLS-1$
 
     private DbVersion4Drivers dbVersionBean;
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/BigDataBasicUtil.java

@@ -15,10 +15,8 @@ package org.talend.core.hadoop;
 import java.util.Collection;
 import java.util.HashSet;
 
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.EMap;
 import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
@@ -27,9 +25,6 @@ import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.Property;
 import org.talend.core.runtime.hd.IDynamicDistributionManager;
 import org.talend.core.runtime.i18n.Messages;
-import org.talend.designer.core.model.utils.emf.talendfile.ElementParameterType;
-import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
-import org.talend.designer.core.model.utils.emf.talendfile.TalendFileFactory;
 
 /**
  * created by cmeng on Jul 20, 2015 Detailled comment
@@ -150,58 +145,4 @@ public class BigDataBasicUtil {
         return null;
     }
 
-
-    public static String getDistributionByVersion(String version) {
-        if (StringUtils.isEmpty(version))
-            return null;
-        if (version.startsWith("EMR")) {
-            return "AMAZON_EMR";
-        } else if (version.equals("SYNAPSE")) {
-            return "AZURE_SYNAPSE";
-        } else if (version.contains("CDH") || version.contains("CDP")) {
-            return "CLOUDERA";
-        } else if (version.startsWith("Databricks")) {
-            return "DATABRICKS";
-        } else if (version.contains("HDP")) {
-            return "HORTONWORKS";
-        } else if (version.startsWith("MICROSOFT_HD_INSIGHT")) {
-            return "MICROSOFT_HD_INSIGHT";
-        } else if (version.startsWith("SPARK")) {
-            return "SPARK";
-        }
-        return null;
-    }
-
-    public static void setDistribution(NodeType node, String dbVersionName) {
-        if (node == null || dbVersionName == null) {
-            return;
-        }
-        EList<ElementParameterType> elementParameters = node.getElementParameter();
-        String distribution = null;
-        String dbVersion = null;
-        // Iterate over the item elementParameters in order to find the "DISTRIBUTION" and "SPARK_VERSION"
-        // parameters values.
-        for (int i = 0; i < elementParameters.size(); i++) {
-            ElementParameterType param = elementParameters.get(i);
-            if (dbVersionName.equals(param.getName())) {
-                dbVersion = param.getValue();
-                break;
-            }
-        }
-        try {
-            ElementParameterType property = TalendFileFactory.eINSTANCE.createElementParameterType();
-            distribution = BigDataBasicUtil.getDistributionByVersion(dbVersion);
-            if (distribution != null) {
-                property.setName("DISTRIBUTION"); //$NON-NLS-1$
-                property.setField("CLOSED_LIST"); //$NON-NLS-1$
-                property.setValue(distribution);
-                elementParameters.add(property);
-            } else {
-                ExceptionHandler.log("no matched distribution for version " + dbVersion);//$NON-NLS-1$
-            }
-
-        } catch (Exception e) {
-            ExceptionHandler.log(e.getMessage());
-        }
-    }
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/HadoopConstants.java

@@ -30,8 +30,6 @@ public class HadoopConstants {
     public static final String SPARK_MODE_DATAPROC = "DATAPROC";
     
     public static final String SPARK_MODE_SYNAPSE = "SYNAPSE";
-    
-    public static final String SPARK_MODE_HDI = "HDI";
 
     public static final String FRAMEWORK = "FRAMEWORK";
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/IHadoopDistributionService.java

@@ -16,7 +16,6 @@ import java.util.Map;
 
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
-import org.talend.core.model.general.Project;
 import org.talend.core.runtime.hd.IDistributionsManager;
 import org.talend.core.runtime.hd.IDynamicDistributionManager;
 import org.talend.core.runtime.hd.IHDistribution;
@@ -133,8 +132,6 @@ public interface IHadoopDistributionService extends IService {
 
     IDynamicDistributionManager getDynamicDistributionManager();
 
-    void checkAndMigrateDistributionProxyCredential(Project project) throws Exception;
-
     public static IHadoopDistributionService get() {
         GlobalServiceRegister gsr = GlobalServiceRegister.getDefault();
         if (gsr.isServiceRegistered(IHadoopDistributionService.class)) {

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

@@ -142,8 +142,6 @@ public enum EHadoopProperties {
     
     SPARK_EXECUTOR_MEMORY,
     
-    SPARK_EXECUTOR_CORES,
-    
     DATABRICKS_ENDPOINT,
     
     DATABRICKS_CLOUD_PROVIDER,
@@ -214,9 +212,7 @@ public enum EHadoopProperties {
     
     UNIV_STANDALONE_EXEC_MEMORY,
     
-    UNIV_STANDALONE_EXEC_CORE,
-    
-    UNIV_SPARK_SUBMIT_SCRIPT_HOME;
+    UNIV_STANDALONE_EXEC_CORE;
 
     public String getName() {
         return this.name();

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

@@ -522,16 +522,10 @@ public class ContextUtils {
         return itemMap;
     }
 
-
-    private static Set<String> missingContexts = new HashSet<>();
-
-    public static void clearMissingContextCache() {
-        missingContexts.clear();
-    }
-
     /**
-    * get the repository context item, now contextId can be either joblet node or context node.
-    */
+     *
+     * get the repository context item,now contextId can be either joblet node or context node.
+     */
     public static Item getRepositoryContextItemById(String contextId) {
         if (IContextParameter.BUILT_IN.equals(contextId)) {
             return null;
@@ -539,9 +533,6 @@ public class ContextUtils {
         if (checkObject(contextId)) {
             return null;
         }
-        if (missingContexts.contains(contextId)) {
-            return null;
-        }
 
         List<ERepositoryObjectType> possibleTypes = new ArrayList<ERepositoryObjectType>();
         possibleTypes.add(ERepositoryObjectType.CONTEXT);
@@ -556,8 +547,6 @@ public class ContextUtils {
                     return item;
                 }
             }
-            missingContexts.add(contextId);
-            ExceptionHandler.log("Can't find Context item[id=" + contextId + "].");
         } catch (PersistenceException e) {
             ExceptionHandler.process(e);
         }
@@ -868,7 +857,6 @@ public class ContextUtils {
             ItemContextLink itemContextLink) {
         Map<String, String> renamedMap = new HashMap<String, String>();
         Map<String, Item> tempItemMap = new HashMap<String, Item>();
-        clearMissingContextCache();
         for (ContextType contextType : contextTypeList) {
             for (Object obj : contextType.getContextParameter()) {
                 if (obj instanceof ContextParameterType) {
@@ -931,7 +919,6 @@ public class ContextUtils {
      */
     public static Map<String, String> calculateRenamedMapFromLinkFile(String projectLabel, String itemId,
             List<IContext> contextList) {
-        clearMissingContextCache();
         Map<String, String> renamedMap = new HashMap<String, String>();
         Map<String, Item> idToItemMap = new HashMap<String, Item>();
         try {

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

@@ -33,7 +33,6 @@ import org.talend.core.model.properties.ContextItem;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.utils.ContextParameterUtils;
 import org.talend.cwm.helper.ResourceHelper;
-import org.talend.cwm.helper.StudioEncryptionHelper;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextParameterType;
 import org.talend.designer.core.model.utils.emf.talendfile.ContextType;
 import org.talend.designer.core.model.utils.emf.talendfile.TalendFileFactory;
@@ -300,7 +299,6 @@ public class JobContextManager implements IContextManager {
         }
         List<ContextItem> contextItemList = ContextUtils.getAllContextItem();
         boolean setDefault = false;
-        ContextUtils.clearMissingContextCache();
         for (int i = 0; i < contextTypeList.size(); i++) {
             contextType = (ContextType) contextTypeList.get(i);
             String name = contextType.getName();
@@ -337,8 +335,6 @@ public class JobContextManager implements IContextManager {
                 } else {
                     contextParam.setType(MetadataTalendType.getDefaultTalendType());
                 }
-                //To avoid encrypt the same value}
-                contextParam.setOriginEncryptedValue(contextParamType.getValue());
                 contextParam.setValue(contextParamType.getRawValue());
 
                 contextParam.setPromptNeeded(contextParamType.isPromptNeeded());
@@ -530,7 +526,6 @@ public class JobContextManager implements IContextManager {
 
         EList newcontextTypeList = new BasicEList();
         Map<String, Item> idToItemMap = new HashMap<String, Item>();
-        ContextUtils.clearMissingContextCache();
         for (int i = 0; i < listContext.size(); i++) {
             IContext context = listContext.get(i);
             String contextGroupName = renameGroupContext.get(context);
@@ -565,10 +560,7 @@ public class JobContextManager implements IContextManager {
                     contextParamType.setName(contextParam.getName());
                     contextParamType.setPrompt(contextParam.getPrompt());
                     contextParamType.setType(contextParam.getType());
-                    //To avoid encrypt the same value
-                    contextParamType.setValue(contextParam.getOriginEncryptedValue()); 
                     contextParamType.setRawValue(contextParam.getValue());
-                    contextParam.setOriginEncryptedValue(contextParamType.getValue()); // For origin encrypted value is null or encryption key upgrade
                     contextParamType.setPromptNeeded(contextParam.isPromptNeeded());
                     contextParamType.setComment(contextParam.getComment());
                     if (!contextParam.isBuiltIn()) {

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

@@ -46,9 +46,6 @@ public class JobContextParameter implements IContextParameter, Cloneable {
     String[] valueList;
 
     String internalId;
-    
-    /*This value may dirty, only use to cache encrypted value*/
-    String originEncryptedValue;
 
     /**
      * change to save id always for bug 13184.
@@ -304,15 +301,6 @@ public class JobContextParameter implements IContextParameter, Cloneable {
         this.source = source;
     }
 
-    public String getOriginEncryptedValue() {
-        return originEncryptedValue;
-    }
-
-    
-    public void setOriginEncryptedValue(String originEncryptedValue) {
-        this.originEncryptedValue = originEncryptedValue;
-    }
-
     /*
      * (non-Javadoc)
      *

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

@@ -51,7 +51,6 @@ public abstract class AbstractItemContextLinkService implements IItemContextLink
         itemContextLink.setItemId(itemId);
         Map<String, Item> tempCache = new HashMap<String, Item>();
         if (contextTypeList != null && contextTypeList.size() > 0) {
-            ContextUtils.clearMissingContextCache();
             for (Object object : contextTypeList) {
                 if (object instanceof ContextType) {
                     ContextType jobContextType = (ContextType) object;

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

@@ -206,7 +206,6 @@ public class ContextLinkService {
             Map<String, Map<String, String>> changedContextParameterId) throws PersistenceException {
         List<Relation> relationList = RelationshipItemBuilder.getInstance()
                 .getItemsHaveRelationWith(sourceId, RelationshipItemBuilder.LATEST_VERSION, false);
-        ContextUtils.clearMissingContextCache();
         for (Relation relation : relationList) {
             String id = relation.getId();
             IFile linkFile = calContextLinkFile(ProjectManager.getInstance().getCurrentProject().getTechnicalLabel(), id);

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

@@ -463,31 +463,29 @@ public final class MetadataTalendType {
         return list;
     }
 
-    public static File getSystemFolderURLOfMappingsFile() throws SystemException {
+    public static URL getSystemFolderURLOfMappingsFile() throws SystemException {
         String dirPath = "/" + INTERNAL_MAPPINGS_FOLDER; //$NON-NLS-1$
+        URL url = null;
         Path filePath = new Path(dirPath);
         Bundle b = Platform.getBundle(CoreRuntimePlugin.PLUGIN_ID);
         if (b != null) {
             try {
                 // Enumeration<URL> entries = b.findEntries(dirPath, "mapping_*.xml", false);
-                return new File(FileLocator.toFileURL(FileLocator.find(b, filePath, null)).getFile());
+                url = FileLocator.toFileURL(FileLocator.find(b, filePath, null));
             } catch (IOException e) {
                 throw new SystemException(e);
             }
         }
-        return null;
+        return url;
     }
 
-    public static File getProjectFolderURLOfMappingsFile() throws SystemException {
+    public static URL getProjectFolderURLOfMappingsFile() throws SystemException {
         try {
             String dirPath = "/" + INTERNAL_MAPPINGS_FOLDER; //$NON-NLS-1$
             IProject project = ResourceUtils.getProject(ProjectManager.getInstance().getCurrentProject());
             IPath settingPath = new ProjectScope(project).getLocation();
             File mappingFolder = settingPath.append(dirPath).toFile();
-            if (!mappingFolder.exists()) {
-                mappingFolder.mkdirs();
-            }
-            return mappingFolder;
+            return mappingFolder.toURI().toURL();
         } catch (Exception e) {
             throw new SystemException(e);
         }
@@ -594,7 +592,8 @@ public final class MetadataTalendType {
 
     public static JSONObject getRevisionObject() {
         try {
-            File revisonFile = new File(getSystemFolderURLOfMappingsFile(), FILE_MAPPING_REVISION);
+            File revisonFile = new File(MetadataTalendType.getSystemFolderURLOfMappingsFile().getFile(),
+                    MetadataTalendType.FILE_MAPPING_REVISION);
             String jsonStr = new String(Files.readAllBytes(revisonFile.toPath()));
             return new JSONObject(jsonStr);
         } catch (Exception e) {
@@ -606,13 +605,13 @@ public final class MetadataTalendType {
     public static boolean restoreMappingFiles() throws Exception {
         List<File> toDelete = new ArrayList<>();
         JSONObject revision = getRevisionObject();
-        File projectMappingFolder = getProjectFolderURLOfMappingsFile();
+        File projectMappingFolder = new File(getProjectFolderURLOfMappingsFile().getFile());
         if (projectMappingFolder.exists()) {
             File[] projectMappingFiles = projectMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
             if (projectMappingFiles != null) {
                 for (File file : projectMappingFiles) {
                     if (revision.has(file.getName())) {
-                        String sha1 = getSha1OfFile(file);
+                        String sha1 = MetadataTalendType.getSha1OfFile(file);
                         if (revision.getJSONObject(file.getName()).has(sha1)) {
                             toDelete.add(file);
                         }
@@ -669,9 +668,9 @@ public final class MetadataTalendType {
     }
 
     public static List<File> getWorkingMappingFiles() throws SystemException {
-        File projectMappingFolder = getProjectFolderURLOfMappingsFile();
+        File projectMappingFolder = new File(getProjectFolderURLOfMappingsFile().getFile());
         File[] projectMappingFiles = projectMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
-        File systemMappingFolder = getSystemFolderURLOfMappingsFile();
+        File systemMappingFolder = new File(getSystemFolderURLOfMappingsFile().getFile());
         File[] systemMappingFiles = systemMappingFolder.listFiles(f -> f.getName().matches(MAPPING_FILE_PATTERN));
         if (projectMappingFiles == null || projectMappingFiles.length == 0) {
             return Arrays.asList(systemMappingFiles);
@@ -687,7 +686,7 @@ public final class MetadataTalendType {
 
     public static String getSha1OfSystemMappingFile(String fileName) {
         try {
-            return getSha1OfFile(new File(getSystemFolderURLOfMappingsFile(), fileName));
+            return getSha1OfFile(new File(getSystemFolderURLOfMappingsFile().getFile(), fileName));
         } catch (SystemException e) {
             ExceptionHandler.process(e);
             return null;

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

@@ -156,7 +156,6 @@ public final class MetadataToolAvroHelper {
         copyColumnProperties(fb, in);
 
         fb.prop(DiSchemaConstants.TALEND6_LABEL, label);
-        
 
         Object defaultValue = null;
         Expression initialValue = in.getInitialValue();
@@ -370,7 +369,6 @@ public final class MetadataToolAvroHelper {
      */
     private static <T extends PropBuilder<T>> PropBuilder<T> copyColumnProperties(PropBuilder<T> builder,
             org.talend.core.model.metadata.builder.connection.MetadataColumn in) {
-    	
         // Properties common to tables and columns.
         if (in.getId() != null) {
             builder.prop(DiSchemaConstants.TALEND6_ID, in.getId());
@@ -387,8 +385,6 @@ public final class MetadataToolAvroHelper {
                 builder.prop(DiSchemaConstants.TALEND6_IS_READ_ONLY, tv.getValue());
             }else if(DiSchemaConstants.AVRO_TECHNICAL_KEY.equals(additionalTag)){
                 builder.prop(DiSchemaConstants.AVRO_TECHNICAL_KEY, tv.getValue());
-            }else if(DiSchemaConstants.LOGICAL_TIME_TYPE_AS.equals(additionalTag)) {
-            	builder.prop(DiSchemaConstants.LOGICAL_TIME_TYPE_AS, tv.getValue());
             }else if (tv.getValue() != null) {
                 builder.prop(DiSchemaConstants.TALEND6_ADDITIONAL_PROPERTIES + additionalTag, tv.getValue());
             }
@@ -630,7 +626,6 @@ public final class MetadataToolAvroHelper {
         } else if (AvroUtils.isSameType(nonnullable, AvroUtils._float())) {
             col.setTalendType(JavaTypesManager.FLOAT.getId());
         } else if (AvroUtils.isSameType(nonnullable, AvroUtils._int())) {
-        	
             if (logicalType == LogicalTypes.date()) {
                	col.setTalendType(JavaTypesManager.DATE.getId());
                 TaggedValue tv = TaggedValueHelper.createTaggedValue(DiSchemaConstants.TALEND6_COLUMN_DATE_DATE, "true");
@@ -642,8 +637,6 @@ public final class MetadataToolAvroHelper {
           	    String logical_time_type_as = field.getProp(DiSchemaConstants.LOGICAL_TIME_TYPE_AS);
           	    if(DiSchemaConstants.AS_TALEND_DATE.equals(logical_time_type_as)) {
                 	  col.setTalendType(JavaTypesManager.DATE.getId());
-                      TaggedValue tv2 = TaggedValueHelper.createTaggedValue(DiSchemaConstants.LOGICAL_TIME_TYPE_AS, DiSchemaConstants.AS_TALEND_DATE);
-                      col.getTaggedValue().add(tv2);
           	    } else {
           	        col.setTalendType(JavaTypesManager.INTEGER.getId());
           	    }

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

@@ -33,7 +33,6 @@ import org.talend.core.database.EDatabaseTypeName;
 import org.talend.core.database.ERedshiftDriver;
 import org.talend.core.database.conn.ConnParameterKeys;
 import org.talend.core.database.conn.template.EDatabaseConnTemplate;
-import org.talend.core.database.conn.version.EDatabaseVersion4Drivers;
 import org.talend.core.model.metadata.Dbms;
 import org.talend.core.model.metadata.DiSchemaConstants;
 import org.talend.core.model.metadata.IConvertionConstants;
@@ -273,7 +272,7 @@ public final class ConvertionHelper {
 
     }
 
-    public static String getDriverVersionString(DatabaseConnection dbConn) {
+    private static String getDriverVersionString(DatabaseConnection dbConn) {
         String dbVersionString = dbConn.getDbVersionString();
         if (EDatabaseTypeName.REDSHIFT.getDisplayName().equals(dbConn.getDatabaseType())
                 || EDatabaseTypeName.REDSHIFT_SSO.getDisplayName().equals(dbConn.getDatabaseType())) {
@@ -287,9 +286,6 @@ public final class ConvertionHelper {
                 }
             }
         }
-        if (EDatabaseTypeName.VERTICA.getDisplayName().equals(dbConn.getDatabaseType())) {
-            dbVersionString = EDatabaseVersion4Drivers.VERTICA_12.getVersionValue();
-        }
         return dbVersionString;
     }
 

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

@@ -36,7 +36,6 @@ import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.MetadataTalendType;
 import org.talend.core.model.metadata.builder.ConvertionHelper;
 import org.talend.core.model.metadata.builder.connection.BRMSConnection;
-import org.talend.core.model.metadata.builder.connection.BigQueryConnection;
 import org.talend.core.model.metadata.builder.connection.Connection;
 import org.talend.core.model.metadata.builder.connection.ConnectionFactory;
 import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
@@ -214,8 +213,6 @@ public class ComponentToRepositoryProperty {
             setFileExcelValue((FileExcelConnection) connection, node, param);
         } else if (connection instanceof SAPConnection) {
             setSAPValue((SAPConnection) connection, node, param);
-        } else if (connection instanceof BigQueryConnection) {
-            setBigQueryValue((BigQueryConnection) connection, node, param);
         } else if (connection instanceof SalesforceSchemaConnection) {
             setSalesforceSchema((SalesforceSchemaConnection) connection, node, param);
         } else if (connection instanceof MDMConnection) {
@@ -1796,30 +1793,6 @@ public class ComponentToRepositoryProperty {
             }
         }
     }
-    
-    private static void setBigQueryValue(BigQueryConnection connection, INode node, IElementParameter param) {
-        if ("SERVICE_ACCOUNT_CREDENTIALS_FILE".equals(param.getRepositoryValue())) {
-            String value = getParameterValue(connection, node, param);
-            if (value != null) {
-                connection.setServiceAccountCredentialsFile(value);
-            }
-        } else if ("PROJECT_ID".equals(param.getRepositoryValue())) {
-            String value = getParameterValue(connection, node, param);
-            if (value != null) {
-                connection.setProjectId(value);
-            }
-        } else if ("USE_REGION_ENDPOINT".equals(param.getRepositoryValue())) {
-            String value = getParameterValue(connection, node, param);
-            if (value != null) {
-                connection.setUseRegionEndpoint(Boolean.valueOf(value));
-            }
-        } else if ("REGION_ENDPOINT_BQ".equals(param.getRepositoryValue())) {
-            String value = getParameterValue(connection, node, param);
-            if (value != null) {
-                connection.setRegionEndpoint(value);
-            }
-        }
-    }
 
     /**
      *

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

@@ -20,7 +20,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.runtime.Path;
@@ -48,7 +47,6 @@ import org.talend.core.model.metadata.MultiSchemasUtil;
 import org.talend.core.model.metadata.builder.ConvertionHelper;
 import org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty;
 import org.talend.core.model.metadata.builder.connection.BRMSConnection;
-import org.talend.core.model.metadata.builder.connection.BigQueryConnection;
 import org.talend.core.model.metadata.builder.connection.Concept;
 import org.talend.core.model.metadata.builder.connection.ConceptTarget;
 import org.talend.core.model.metadata.builder.connection.Connection;
@@ -150,10 +148,6 @@ public class RepositoryToComponentProperty {
         if (connection instanceof SAPConnection) {
             return getSAPValue((SAPConnection) connection, value);
         }
-        
-        if (connection instanceof BigQueryConnection) {
-            return getBigQueryValue((BigQueryConnection) connection, value, table);
-        }
 
         if (connection instanceof SalesforceSchemaConnection) {
             return getSalesforceSchemaValue((SalesforceSchemaConnection) connection, value, table);
@@ -462,62 +456,6 @@ public class RepositoryToComponentProperty {
         }
         return null;
     }
-    
-    public static Object getBigQueryValue(BigQueryConnection connection, String value, IMetadataTable table) {
-        if ("SERVICE_ACCOUNT_CREDENTIALS_FILE".equals(value)) {
-            if (isContextMode(connection, connection.getServiceAccountCredentialsFile())) {
-                return connection.getServiceAccountCredentialsFile();
-            } else {
-                return TalendQuoteUtils.addQuotes(connection.getServiceAccountCredentialsFile());
-            }
-        } else if ("PROJECT_ID".equals(value)) {
-            if (isContextMode(connection, connection.getProjectId())) {
-                return connection.getProjectId();
-            } else {
-                return TalendQuoteUtils.addQuotes(connection.getProjectId());
-            }
-        } else if ("USE_REGION_ENDPOINT".equals(value)) {
-            return connection.isUseRegionEndpoint();
-        } else if ("REGION_ENDPOINT_BQ".equals(value)) {
-            if (isContextMode(connection, connection.getRegionEndpoint())) {
-                return connection.getRegionEndpoint();
-            } else {
-                return TalendQuoteUtils.addQuotes(connection.getRegionEndpoint());
-            }
-        } else if ("DATASET".equals(value)) {
-            if(table!=null) {
-                Map<String, String> properties = table.getAdditionalProperties();
-                if(properties!=null) {
-                    String dataSet = properties.get("dataSet");
-                    if (isContextMode(connection, dataSet)) {
-                        return dataSet;
-                    } else {
-                        return TalendQuoteUtils.addQuotes(dataSet);
-                    }
-                }
-            }
-        } else if ("QUERY".equals(value)) {
-            if(table!=null) {
-                Map<String, String> properties = table.getAdditionalProperties();
-                if(properties!=null) {
-                    String dataSet = properties.get("dataSet");
-                    String tableName = table.getLabel();
-                    if(dataSet!=null && tableName!=null) {
-                        List<IMetadataColumn> columns = table.getListColumns();
-                        StringBuilder strBuilder = new StringBuilder();
-                        strBuilder.append("SELECT");
-                        if(columns!=null) {
-                            strBuilder.append(columns.stream().map(column -> column.getOriginalDbColumnName()).collect(Collectors.joining(",", " ", " ")));
-                        }
-                        strBuilder.append("FROM ").append(dataSet).append('.').append(tableName);
-                        return TalendQuoteUtils.addQuotes(strBuilder.toString());
-                    }
-                }
-            }
-        }
-        
-        return null;
-    }
 
     /**
      * DOC gcui Comment method "getHL7Value".
@@ -1153,10 +1091,6 @@ public class RepositoryToComponentProperty {
                 if (dbVersionString != null) {
                     return dbVersionString.toUpperCase();
                 }
-            } else if (EDatabaseConnTemplate.AMAZON_AURORA.getDBDisplayName().equals(databaseType)) {
-                if (dbVersionString != null) {
-                    return dbVersionString.toUpperCase();
-                }
             } else if (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)) {
                 return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_VERSION);
             } else if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {

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

@@ -75,9 +75,4 @@ public interface IContextParameter {
     public String getInternalId();
 
     public void setInternalId(String internalId);
-    
-    /*This value may dirty, only use to cache encrypted value*/
-    public String getOriginEncryptedValue();
-    
-    public void setOriginEncryptedValue(String originEncryptedValue);
 }

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

@@ -234,9 +234,4 @@ public interface IElementParameter {
     public void setSerialized(boolean isSerialized);
 
     public boolean isSelectedFromItemValue();
-    
-    /*This value may dirty, only use to cache encrypted value*/
-    public String getOrignEncryptedValue();
-    
-    public void setOrignEncryptedValue(String value);
 }

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

@@ -71,9 +71,6 @@ public interface IProcess2 extends IRepositoryObject, IProcess {
     @Override
     void setActivate(boolean b);
 
-    public boolean isRefactoringToJoblet();
-
-    public void refactoringToJoblet(boolean isRefactoring);
     /**
      * DOC qzhang Comment method "checkStartNodes".
      */

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

@@ -31,7 +31,6 @@ import org.talend.core.IESBService;
 import org.talend.core.PluginChecker;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.BRMSConnectionItem;
-import org.talend.core.model.properties.BigQueryConnectionItem;
 import org.talend.core.model.properties.CSVFileConnectionItem;
 import org.talend.core.model.properties.ConnectionItem;
 import org.talend.core.model.properties.ContextItem;
@@ -361,17 +360,14 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
 
     public final static ERepositoryObjectType METADATA_SAP_TABLE = new ERepositoryObjectType("repository.SAPTable", //$NON-NLS-1$
             "METADATA_SAP_TABLE", 104, true, true, new String[] { PROD_DI }, new String[] {}, false);
-    
+
     public final static ERepositoryObjectType METADATA_SAP_CONTENT_EXTRACTOR = new ERepositoryObjectType("repository.SAPTable", //$NON-NLS-1$
             "METADATA_SAP_CONTENT_EXTRACTOR", 105, true, true, new String[] { PROD_DI }, new String[] {}, false);
-    
+
     public final static ERepositoryObjectType METADATA_CON_CALCULATION_VIEW = new ERepositoryObjectType(
             "repository.metadataCalculationView", "METADATA_CON_CALCULATION_VIEW", 106, true, true, new String[] { PROD_DI },
             new String[] {}, false);
 
-    public final static ERepositoryObjectType METADATA_SAP_CDS_VIEW = new ERepositoryObjectType("repository.SAPTable", //$NON-NLS-1$
-            "METADATA_SAP_CDS_VIEW", 107, true, true, new String[] { PROD_DI }, new String[] {}, false);
-
     private String label;
 
     private String alias;
@@ -509,8 +505,6 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
     public final static ERepositoryObjectType METADATA_FILE_FTP = ERepositoryObjectType.valueOf("METADATA_FILE_FTP");
 
     public final static ERepositoryObjectType METADATA_SAPCONNECTIONS = ERepositoryObjectType.valueOf("METADATA_SAPCONNECTIONS");
-    
-    public final static ERepositoryObjectType METADATA_BIGQUERYCONNECTIONS = ERepositoryObjectType.valueOf("METADATA_BIGQUERYCONNECTIONS");
 
     public final static ERepositoryObjectType METADATA_FILE_EBCDIC = ERepositoryObjectType.valueOf("METADATA_FILE_EBCDIC");
 
@@ -871,8 +865,6 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
             return "DB connection"; //$NON-NLS-1$
         } else if (type == METADATA_SAPCONNECTIONS) {
             return "SAPconnection"; //$NON-NLS-1$
-        } else if (type == METADATA_BIGQUERYCONNECTIONS) {
-            return "BigQueryconnection"; //$NON-NLS-1$
         } else if (type == METADATA_FILE_EBCDIC) {
             return "fileEBCDIC"; //$NON-NLS-1$
         } else if (type == METADATA_FILE_HL7) {
@@ -1084,11 +1076,6 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
             public Object caseSAPConnectionItem(SAPConnectionItem object) {
                 return METADATA_SAPCONNECTIONS;
             }
-            
-            @Override
-            public Object caseBigQueryConnectionItem(BigQueryConnectionItem object) {
-                return METADATA_BIGQUERYCONNECTIONS;
-            }
 
             @Override
             public Object caseDelimitedFileConnectionItem(DelimitedFileConnectionItem object) {

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

@@ -770,15 +770,6 @@ public abstract class RepositoryUpdateManager {
                 updateConnectionContextParam((ConnectionItem) item, citem, valueMap);
             }
         }
-        
-        List<IRepositoryViewObject> bigqueryConnList = FACTORY.getAll(ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS, true);
-        for (IRepositoryViewObject obj : bigqueryConnList) {
-            Item item = obj.getProperty().getItem();
-            if (item instanceof ConnectionItem) {
-                updateConnectionContextParam((ConnectionItem) item, citem, valueMap);
-            }
-        }
-        
         for (String updateType : UpdateRepositoryHelper.getAllHadoopConnectionTypes()) {
             List<IRepositoryViewObject> hadoopConnList = FACTORY
                     .getAll(ERepositoryObjectType.valueOf(ERepositoryObjectType.class, updateType), true);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java

@@ -35,7 +35,7 @@ public final class TalendPropertiesUtil {
      * @return
      */
     public static boolean isHideExchange() {
-        return true; //$NON-NLS-1$ //$NON-NLS-2$
+        return isEnabled("talend.hide.exchange") || isEnabled("talend.disable.internet"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     /**

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

@@ -12,9 +12,7 @@
 // ============================================================================
 package org.talend.core.nexus;
 
-import java.net.URLEncoder;
 import java.util.Date;
-import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.talend.commons.exception.ExceptionHandler;
@@ -27,9 +25,9 @@ import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.core.runtime.projectsetting.ProjectPreferenceManager;
 import org.talend.core.service.IRemoteService;
-import org.talend.core.utils.SecurityStorageUtil;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.RepositoryConstants;
+import org.talend.utils.security.StudioEncryption;
 
 /**
  * created by wchen on 2015年6月16日 Detailled comment
@@ -83,8 +81,6 @@ public class TalendLibsServerManager {
 
     public static final String ENABLE_PROXY_SETTING = "nexus.proxy.enable";
 
-    public static final String NEXUS_PROXY_STORAGE_CATEGORY = "org.talend.artifact.proxy.setting";
-
     public static final String TALEND_LIB_USER = "";//$NON-NLS-1$
 
     public static final String TALEND_LIB_PASSWORD = "";//$NON-NLS-1$
@@ -259,14 +255,10 @@ public class TalendLibsServerManager {
             boolean enableProxyFlag = prefManager.getBoolean(TalendLibsServerManager.ENABLE_PROXY_SETTING);
             if (enableProxyFlag) {
                 serverBean.setServer(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_URL));
+                serverBean.setUserName(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_USERNAME));
+                serverBean.setPassword(StudioEncryption.getStudioEncryption(StudioEncryption.EncryptionKeyName.SYSTEM).decrypt(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_PASSWORD)));
                 serverBean.setRepositoryId(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_REPOSITORY_ID));
                 serverBean.setType(prefManager.getValue(TalendLibsServerManager.NEXUS_PROXY_TYPE));
-                String[] credentials = getProxyArtifactCredentials(serverBean.getServer(), serverBean.getRepositoryId(),
-                        NEXUS_PROXY_USERNAME, NEXUS_PROXY_PASSWORD);
-                if (credentials != null) {
-                    serverBean.setUserName(credentials[0]);
-                    serverBean.setPassword(credentials[1]);
-                }
             }
         }
         if (StringUtils.isNotEmpty(serverBean.getServer())) {
@@ -275,89 +267,6 @@ public class TalendLibsServerManager {
         return null;
     }
 
-    public String[] getProxyArtifactCredentials(String url, String repositoryId, String usernameKey, String passwordKey) {
-        if (StringUtils.isBlank(url)) {
-            return null;
-        }
-        try {
-            String path = getStoragePath(url, repositoryId);
-            Map<String, String> storageNodePairs = SecurityStorageUtil.getSecurityStorageNodePairs(path);
-            if (storageNodePairs != null) {
-                String username = storageNodePairs.get(usernameKey);
-                String password = storageNodePairs.get(passwordKey);
-                if (username == null && password == null) {
-                    return null;
-                }
-                return new String[] { username, password };
-            }
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-        return null;
-    }
-
-    public void saveProxyArtifactCredentials(String url, String repositoryId, String usernameKey, String username,
-            String passwordKey, String password) {
-        if (StringUtils.isBlank(url)) {
-            return;
-        }
-        try {
-            String path = getStoragePath(url, repositoryId);
-            SecurityStorageUtil.saveToSecurityStorage(path, usernameKey, username, false, false);
-            SecurityStorageUtil.saveToSecurityStorage(path, passwordKey, password, true, false);
-            SecurityStorageUtil.flushSecurityStorage();
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-    }
-
-    public void saveProxyArtifactCredentialsUserName(String url, String repositoryId, String usernameKey, String username,
-            boolean flush) {
-        if (StringUtils.isBlank(url)) {
-            return;
-        }
-        try {
-            String path = getStoragePath(url, repositoryId);
-            SecurityStorageUtil.saveToSecurityStorage(path, usernameKey, username, false, flush);
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-    }
-
-    public void saveProxyArtifactCredentialsPassword(String url, String repositoryId, String passwordKey, String password,
-            boolean flush) {
-        if (StringUtils.isBlank(url)) {
-            return;
-        }
-        try {
-            String path = getStoragePath(url, repositoryId);
-            SecurityStorageUtil.saveToSecurityStorage(path, passwordKey, password, true, flush);
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-    }
-
-    public void flushSecurityStorage() {
-        try {
-            SecurityStorageUtil.flushSecurityStorage();
-        } catch (Exception e) {
-            ExceptionHandler.process(e);
-        }
-    }
-
-    private String getStoragePath(String url, String repositoryId) throws Exception {
-        String node = url;
-        if (StringUtils.isNotBlank(repositoryId)) {
-            if (!url.endsWith("/")) {
-                node = node + "/";
-            }
-            node = node + repositoryId;
-        }
-        node = URLEncoder.encode(node, "UTF-8");
-        String path = NEXUS_PROXY_STORAGE_CATEGORY + "/" + node;
-        return path;
-    }
-
     public ArtifactRepositoryBean getTalentArtifactServer() {
         ArtifactRepositoryBean serverBean = getProxyArtifactServer();
         if (serverBean == null) {

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

@@ -1,31 +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 java.util.Map;
-
-import org.talend.core.IProviderService;
-import org.talend.core.model.process.INode;
-import org.talend.core.model.properties.BigQueryConnectionItem;
-import org.talend.repository.model.RepositoryNode;
-
-public interface IBigQueryProviderService extends IProviderService {
-
-    public BigQueryConnectionItem getRepositoryItem(final INode node);
-
-    public boolean isBigQueryNode(final INode node);
-
-    public boolean isBigQueryNode(final RepositoryNode node);
-
-    public boolean isRepositorySchemaLine(INode node, Map<String, Object> lineValue);
-}

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

@@ -39,8 +39,6 @@ import org.talend.core.model.update.IStudioUpdateConfig;
  */
 public interface IStudioLiteP2Service extends IService {
 
-    public static final String PROP_CLEARPERSISTEDSTATE = "talend.studio.switchProject.clearPersistedState";
-
     public static final String CONFIG_STORAGE_FOLDER = "talend/studioLite/";
 
     public static final String BUNDLES_INFOS_STORAGE_FOLDER = CONFIG_STORAGE_FOLDER + "bundlesInfo/";
@@ -139,10 +137,6 @@ public interface IStudioLiteP2Service extends IService {
 
     void setupTmcUpdate(IProgressMonitor monitor, IStudioUpdateConfig updateConfig) throws Exception;
 
-    void handleTmcUpdateObserve(boolean trunOn);
-
-    boolean isUpdateManagedByTmc(IProgressMonitor monitor);
-
     boolean removeM2() throws Exception;
     
     void saveRemoveM2(boolean remove) throws Exception;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/images/RepositoryImageProvider.java

@@ -53,8 +53,6 @@ public class RepositoryImageProvider {
             return ECoreImage.METADATA_CONNECTION_ICON;
         } else if (type == ERepositoryObjectType.METADATA_SAPCONNECTIONS || type == ERepositoryObjectType.METADATA_SAP_FUNCTION) {
             return ECoreImage.METADATA_SAPCONNECTION_ICON;
-        } else if (type == ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS) {
-            return ECoreImage.METADATA_BIGQUERYCONNECTION_ICON;
         } else if (type == ERepositoryObjectType.SQLPATTERNS) {
             return ECoreImage.METADATA_SQLPATTERN_ICON;
         } else if (type == ERepositoryObjectType.METADATA_CON_TABLE || type == ERepositoryObjectType.METADATA_SAP_IDOC) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/utils/SecurityStorageUtil.java

@@ -1,67 +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.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.equinox.security.storage.ISecurePreferences;
-import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
-
-/**
- * DOC jding  class global comment. Detailled comment
- */
-public class SecurityStorageUtil {
-
-    public static void saveToSecurityStorage(String pathName, String key, String value, boolean encrypt) throws Exception {
-        saveToSecurityStorage(pathName, key, value, encrypt, true);
-    }
-
-    public static void saveToSecurityStorage(String pathName, String key, String value, boolean encrypt, boolean flush)
-            throws Exception {
-        ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
-        ISecurePreferences node = securePreferences.node(pathName);
-        node.put(key, value, encrypt);
-        if (flush) {
-            securePreferences.flush();
-        }
-    }
-
-    public static void flushSecurityStorage() throws Exception {
-        ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
-        securePreferences.flush();
-    }
-
-    public static String getValueFromSecurityStorage(String pathName, String key) throws Exception {
-        ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
-        if (!securePreferences.nodeExists(pathName)) {
-            return null;
-        }
-        ISecurePreferences node = securePreferences.node(pathName);
-        return node.get(key, null);
-    }
-
-    public static Map<String, String> getSecurityStorageNodePairs(String pathName) throws Exception {
-        ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault();
-        if (!securePreferences.nodeExists(pathName)) {
-            return null;
-        }
-        Map<String, String> keyValuePair = new HashMap<String, String>();
-        ISecurePreferences node = securePreferences.node(pathName);
-        for (String key : node.keys()) {
-            keyValuePair.put(key, node.get(key, null));
-        }
-        return keyValuePair;
-    }
-
-}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/rowgenerator/data/FunctionManager.java

@@ -37,6 +37,8 @@ public class FunctionManager {
 
     public static final String PURE_PERL_DESC = Messages.getString("FunctionManager.PurePerl.Desc"); //$NON-NLS-1$
 
+    public static final String PURE_PERL_PARAM = Messages.getString("FunctionManager.PurePerl.ParaName"); //$NON-NLS-1$
+
     private List<TalendType> talendTypes = null;
 
     public static final String PERL_FUN_PREFIX = "sub{"; //$NON-NLS-1$
@@ -53,37 +55,6 @@ public class FunctionManager {
 
     public static final String EMPTY_STRING = " "; //$NON-NLS-1$
 
-    public static enum EFunctionParameter {
-
-        CUSTOMIZE_PARAM("customize parameter", Messages.getString("FunctionManager.PurePerl.ParaName")); //$NON-NLS-1$ //$NON-NLS-2$
-
-        private String paramName;
-
-        private String paramDisplayName;
-
-        EFunctionParameter(String paramName, String paramDisplayName) {
-            this.paramName = paramName;
-            this.paramDisplayName = paramDisplayName;
-        }
-
-        public String getParamName() {
-            return paramName;
-        }
-
-        public String getParamDisplayName() {
-            return paramDisplayName;
-        }
-
-        public static String getDisplayNameByName(String name) {
-            for (EFunctionParameter eParameter : values()) {
-                if (eParameter.getParamName().equals(name)) {
-                    return eParameter.getParamDisplayName();
-                }
-            }
-            return null;
-        }
-
-    }
     /**
      * qzhang Comment method "getFunctionByName".
      *
@@ -109,7 +80,7 @@ public class FunctionManager {
         function.setDescription(PURE_PERL_DESC);
         StringParameter param = new StringParameter();
         List<Parameter> params = new ArrayList<Parameter>();
-        param.setName(EFunctionParameter.CUSTOMIZE_PARAM.getParamName());
+        param.setName(PURE_PERL_PARAM);
         params.add(param);
         function.setParameters(params);
         return function;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/rowgenerator/data/RoutineJarsFunctionParser.java

@@ -86,47 +86,43 @@ public class RoutineJarsFunctionParser extends AbstractTalendFunctionParser {
             Set<RoutinesParameterType> rps = new HashSet<RoutinesParameterType>();
             if (processItem instanceof ProcessItem) {
                 ProcessType pt = ((ProcessItem) processItem).getProcess();
-                if (pt != null) {
-                    if (pt.getParameters() != null) {
-                        rps.addAll(pt.getParameters().getRoutinesParameter());
-                    }
-                    // if it is test process
-                    int pidFeature = TalendFilePackage.PROCESS_TYPE_FEATURE_COUNT + 2;
-                    int versionFeature = TalendFilePackage.PROCESS_TYPE_FEATURE_COUNT + 4;
-                    ProcessTypeImpl pi = (ProcessTypeImpl) pt;
-                    if (pi.eClass() != null && StringUtils.equals(pi.eClass().getName(), "TestContainer")) {
 
-                        try {
-                            Object pid = pi.eGet(pidFeature, true, false);
-                            Object version = pi.eGet(versionFeature, true, false);
-                            if (pid != null) {
-                                IProxyRepositoryService svc = IProxyRepositoryService.get();
-                                try {
-                                    List<IRepositoryViewObject> vos = svc.getProxyRepositoryFactory().getAllVersion(pid.toString());
-                                    for (IRepositoryViewObject vo : vos) {
-                                        if (StringUtils.equals(vo.getVersion(), String.valueOf(version))) {
-                                            Item parentProcessItem = vo.getProperty().getItem();
-                                            if (parentProcessItem instanceof ProcessItem) {
-                                                pt = ((ProcessItem) parentProcessItem).getProcess();
-                                                rps.addAll(pt.getParameters().getRoutinesParameter());
-                                            }
+                rps.addAll(pt.getParameters().getRoutinesParameter());
+
+                // if it is test process
+                int pidFeature = TalendFilePackage.PROCESS_TYPE_FEATURE_COUNT + 2;
+                int versionFeature = TalendFilePackage.PROCESS_TYPE_FEATURE_COUNT + 4;
+                ProcessTypeImpl pi = (ProcessTypeImpl) pt;
+                if (pi.eClass() != null && StringUtils.equals(pi.eClass().getName(), "TestContainer")) {
+
+                    try {
+                        Object pid = pi.eGet(pidFeature, true, false);
+                        Object version = pi.eGet(versionFeature, true, false);
+                        if (pid != null) {
+                            IProxyRepositoryService svc = IProxyRepositoryService.get();
+                            try {
+                                List<IRepositoryViewObject> vos = svc.getProxyRepositoryFactory().getAllVersion(pid.toString());
+                                for (IRepositoryViewObject vo : vos) {
+                                    if (StringUtils.equals(vo.getVersion(), String.valueOf(version))) {
+                                        Item parentProcessItem = vo.getProperty().getItem();
+                                        if (parentProcessItem instanceof ProcessItem) {
+                                            pt = ((ProcessItem) parentProcessItem).getProcess();
+                                            rps.addAll(pt.getParameters().getRoutinesParameter());
                                         }
                                     }
-                                } catch (PersistenceException e) {
-                                    // ignore
                                 }
+                            } catch (PersistenceException e) {
+                                // ignore
                             }
-                        } catch (Exception e) {
-                            // ignore
                         }
+                    } catch (Exception e) {
+                        // ignore
                     }
                 }
 
             } else if (processItem instanceof JobletProcessItem) {
                 ProcessType pt = ((JobletProcessItem) processItem).getJobletProcess();
-                if (pt != null && pt.getParameters() != null) {
-                    rps.addAll(pt.getParameters().getRoutinesParameter());
-                }
+                rps.addAll(pt.getParameters().getRoutinesParameter());
             }
 
             if (!rps.isEmpty()) {

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

@@ -512,7 +512,6 @@ public class RepositoryNodeUtilities {
                     || curType == ERepositoryObjectType.METADATA_FILE_RULES
                     || curType == ERepositoryObjectType.METADATA_FILE_LINKRULES
                     || curType == ERepositoryObjectType.METADATA_SAPCONNECTIONS
-                    || curType == ERepositoryObjectType.METADATA_BIGQUERYCONNECTIONS
                     || curType == ERepositoryObjectType.METADATA_HEADER_FOOTER) {
                 tmpType = ERepositoryObjectType.METADATA;
             } else if (curType == ERepositoryObjectType.ROUTINES || curType == ERepositoryObjectType.SNIPPETS) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/ui/properties/StatusHelper.java

@@ -77,7 +77,6 @@ public class StatusHelper {
             case PropertiesPackage.CSV_FILE_CONNECTION_ITEM:
             case PropertiesPackage.DATABASE_CONNECTION_ITEM:
             case PropertiesPackage.SAP_CONNECTION_ITEM:
-            case PropertiesPackage.BIG_QUERY_CONNECTION_ITEM:
             case PropertiesPackage.DELIMITED_FILE_CONNECTION_ITEM:
             case PropertiesPackage.POSITIONAL_FILE_CONNECTION_ITEM:
             case PropertiesPackage.CONTEXT_ITEM:

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

@@ -648,7 +648,6 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
             helper.initHelper(contextManager);
             Map<String, Item> items = new HashMap<String, Item>();
             boolean needRefresh = false;
-            ContextUtils.clearMissingContextCache();
             for (IContextParameter param : contextManager.getDefaultContext().getContextParameterList()) {
                 if (!param.isBuiltIn()) {
                     String source = param.getSource();

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

@@ -522,7 +522,6 @@ public class SelectRepositoryContextDialog extends SelectionDialog {
             // remove the params which is unchecked
             Set<String> jobletIds = new HashSet<String>();
             Set<String> chekedIds = new HashSet<String>();
-            ContextUtils.clearMissingContextCache();
             for (IContextParameter param : existParas) {
                 if (param.isBuiltIn()) {
                     continue;

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/cmd/AddRepositoryContextGroupCommand.java

@@ -184,7 +184,6 @@ public class AddRepositoryContextGroupCommand extends Command {
         // remove the params which is unchecked
         Set<String> nonContextIds = new HashSet<String>();
         Set<String> chekedIds = new HashSet<String>();
-        ContextUtils.clearMissingContextCache();
         for (IContextParameter param : existParas) {
             if (param.isBuiltIn()) {
                 continue;

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

@@ -92,7 +92,6 @@ public class ContextNatTableUtils {
         List<ContextTableTabParentModel> output = new ArrayList<ContextTableTabParentModel>();
         if (!contextDatas.isEmpty()) {
             int i = 0;
-            ContextUtils.clearMissingContextCache();
             for (IContextParameter para : contextDatas) {
                 String sourceId = para.getSource();
                 if (IContextParameter.BUILT_IN.equals(sourceId)) {

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

@@ -411,7 +411,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
 
             if (modified) {
                 updateRelation();
-                modelManager.refresh();
             }
         }
 
@@ -426,6 +425,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                     }
                 }
             }
@@ -494,7 +494,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
             }
             if (modified) {
                 updateRelation();
-                modelManager.refresh();
             }
         }
 
@@ -509,6 +508,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                     }
                 }
             }
@@ -576,7 +576,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
             }
             if (modified) {
                 updateRelation();
-                modelManager.refresh();
             }
         }
 
@@ -591,6 +590,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                     }
                 }
             }
@@ -673,7 +673,6 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
             if (modified) {
                 // it is undo, so the order changed
                 updateRelation(newName, originalName);
-                modelManager.refresh();
             }
         }
 
@@ -688,6 +687,7 @@ public class ExtendedContextColumnPropertyAccessor<R> implements IColumnProperty
                             && jobContextManager.isOriginalParameter(param.getName())) {
                         jobContextManager.setModified(true);
                         manager.fireContextsChangedEvent();
+                        modelManager.refresh();
                     }
                 }
             }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/view/Contexts.java

@@ -21,7 +21,6 @@ import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
-import org.talend.core.model.context.ContextUtils;
 import org.talend.core.ui.branding.IBrandingConfiguration;
 
 /**
@@ -52,7 +51,6 @@ public class Contexts {
             public void run() {
                 if (cxtView != null) {
                     updateTitle(cxtView);
-                    ContextUtils.clearMissingContextCache();
                     cxtView.refresh(part);
                 }
             }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/documentation/generation/ExternalNodeComponentHandler.java

@@ -175,28 +175,9 @@ public class ExternalNodeComponentHandler extends AbstractComponentHandler {
                 generateComponentSchemaInfo(externalNode, componentElement);
                 generateComponentElementParamInfo(parametersElement, elementParameterList);
             } else {
-                boolean isSCDComponent = externalNode.getComponent().getName().endsWith("SCD");
-                if (isSCDComponent) {
-                    Element parametersElement = componentElement.addElement("parameters"); //$NON-NLS-1$
-                    List elementParameterList = externalNode.getElementParameters();
-                    generateComponentSchemaInfo(externalNode, componentElement);
-                    generateComponentElementParamInfo(parametersElement, elementParameterList);
-                }
                 URL fileURL = componentDocumentation.getHTMLFile();
                 if (fileURL != null) {
                     this.externalNodeHTMLMap.put(componentName, fileURL);
-                    if (isSCDComponent) {
-                        // add extra check and uncheck icon for SCDComponent
-                        File picPath = new File(
-                                HTMLDocUtils.getTmpFolder() + File.separatorChar + IHTMLDocConstants.PICTUREFOLDERPATH);
-                        if (picPath.exists()) {
-                            for (File f : picPath.listFiles()) {
-                                if (!picFilePathMap.containsKey(f.getName())) {
-                                    picFilePathMap.put(f.getName(), f.getAbsolutePath());
-                                }
-                            }
-                        }
-                    }
                 }
             }
             componentElement.addComment(componentName);

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/token/TokenInforUtil.java

@@ -134,7 +134,7 @@ public final class TokenInforUtil {
                     targetArray = new JSONArray();
                     Map<String,List<JSONObject>> objectMap = new HashMap<String,List<JSONObject>>();
                     for (Object obj : data) {
-                        if((obj instanceof JSONObject) && ((JSONObject)obj).has("component_name") && ((JSONObject)obj).get("component_name")!=null){//$NON-NLS-1$
+                        if((obj instanceof JSONObject) && ((JSONObject)obj).get("component_name")!=null){//$NON-NLS-1$
                             List<JSONObject> dataList = new ArrayList<JSONObject>();
                             String componentName = (String) ((JSONObject)obj).get("component_name");//$NON-NLS-1$
                             if(objectMap.containsKey(componentName)){

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

@@ -317,4 +317,3 @@ ActionBarBuildHelper.SaveAll_toolTip=Save All
 ContextOrderProperty.BuiltInComment=Built-in context variables
 ContextOrderProperty.RepositoryComment=Context variables from repository context:
 BaseComponentInstallerTask.installComponent=Installing component {0}
-ApplicationWorkbenchWindowAdvisor.repositoryConnection=Connection

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

@@ -317,4 +317,3 @@ ActionBarBuildHelper.SaveAll_toolTip=Sauvegarder tout
 ContextOrderProperty.BuiltInComment=Variables de contexte built-in
 ContextOrderProperty.RepositoryComment=Variables de contexte du contexte du r\u00E9f\u00E9rentiel :
 BaseComponentInstallerTask.installComponent=Installation du composant {0}
-ApplicationWorkbenchWindowAdvisor.repositoryConnection=Connexion

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

@@ -317,4 +317,3 @@ ActionBarBuildHelper.SaveAll_toolTip=\u3059\u3079\u3066\u4FDD\u5B58
 ContextOrderProperty.BuiltInComment=\u7D44\u307F\u8FBC\u307F\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u5909\u6570
 ContextOrderProperty.RepositoryComment=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u304B\u3089\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u5909\u6570:
 BaseComponentInstallerTask.installComponent=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8{0}\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u4E2D
-ApplicationWorkbenchWindowAdvisor.repositoryConnection=\u63A5\u7D9A

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

@@ -317,4 +317,3 @@ ActionBarBuildHelper.SaveAll_toolTip=\u4FDD\u5B58\u5168\u90E8
 ContextOrderProperty.BuiltInComment=\u5185\u7F6E\u4E0A\u4E0B\u6587\u53D8\u91CF
 ContextOrderProperty.RepositoryComment=\u6765\u81EA\u5B58\u50A8\u5E93\u4E0A\u4E0B\u6587\u7684\u4E0A\u4E0B\u6587\u53D8\u91CF\uFF1A
 BaseComponentInstallerTask.installComponent=\u6B63\u5728\u5B89\u88C5\u7EC4\u4EF6 {0}
-ApplicationWorkbenchWindowAdvisor.repositoryConnection=\u8FDE\u63A5

main/plugins/org.talend.core/src/main/java/org/talend/core/model/param/ERepositoryCategoryType.java

@@ -30,7 +30,6 @@ public enum ERepositoryCategoryType {
     DATABASE,
     SAP,
     SAPIDOC,
-    BIGQUERY,
     EBCDIC,
     HL7,
     FTP,

main/plugins/org.talend.core/src/main/java/org/talend/core/model/runprocess/shadow/ObjectElementParameter.java

@@ -47,8 +47,6 @@ public class ObjectElementParameter implements IElementParameter {
 
     private boolean enable = true;
 
-    private String originEncryptedValue;
-
     /**
      * Constructs a new TextElementParameter.
      */
@@ -1054,15 +1052,4 @@ public class ObjectElementParameter implements IElementParameter {
         // TODO Auto-generated method stub
         return false;
     }
-    
-    @Override
-    public String getOrignEncryptedValue() {
-        return originEncryptedValue;
-    }
-
-    @Override
-    public void setOrignEncryptedValue(String value) {
-        this.originEncryptedValue = value;
-        
-    }
 }

main/plugins/org.talend.core/src/main/java/org/talend/core/model/utils/TalendWorkbenchUtil.java

@@ -1,86 +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.model.utils;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.talend.commons.exception.PersistenceException;
-import org.talend.commons.utils.VersionUtils;
-import org.talend.core.CorePlugin;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.context.Context;
-import org.talend.core.context.RepositoryContext;
-import org.talend.core.i18n.Messages;
-import org.talend.core.model.general.Project;
-import org.talend.core.repository.model.ProxyRepositoryFactory;
-import org.talend.core.service.IRemoteService;
-import org.talend.core.service.IStudioLiteP2Service;
-import org.talend.core.ui.IInstalledPatchService;
-import org.talend.core.ui.branding.IBrandingService;
-import org.talend.repository.ui.login.connections.ConnectionUserPerReader;
-
-/**
- * DOC jding  class global comment. Detailled comment
- */
-public class TalendWorkbenchUtil {
-
-    public static final String MANAGED_BY_ADMIN = " Managed by administrator"; //$NON-NLS-1$
-
-    public static String getWorkbenchWindowTitle() {
-        String title = "";
-        RepositoryContext repositoryContext = (RepositoryContext) CorePlugin.getContext()
-                .getProperty(Context.REPOSITORY_CONTEXT_KEY);
-        Project project = repositoryContext.getProject();
-        String appName = IBrandingService.get().getFullProductName();
-        // TDI-18644
-        ProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
-        boolean localProvider = false;
-        try {
-            localProvider = factory.isLocalConnectionProvider();
-        } catch (PersistenceException e) {
-            localProvider = true;
-        }
-
-        String buildIdField = " (" + VersionUtils.getVersion() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IInstalledPatchService.class)) {
-            IInstalledPatchService pachService = (IInstalledPatchService) GlobalServiceRegister.getDefault()
-                    .getService(IInstalledPatchService.class);
-            if (pachService != null) {
-                String patchVersion = pachService.getLatestInstalledVersion(true);
-                if (patchVersion != null) {
-                    buildIdField = " (" + patchVersion + ")"; //$NON-NLS-1$ //$NON-NLS-2$ ;
-                    if (IRemoteService.get() != null && IRemoteService.get().isCloudConnection()) {
-                        IStudioLiteP2Service liteP2Service = IStudioLiteP2Service.get();
-                        if (liteP2Service != null && liteP2Service.isUpdateManagedByTmc(new NullProgressMonitor())) {
-                            buildIdField += MANAGED_BY_ADMIN;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (TalendPropertiesUtil.isHideBuildNumber()) {
-            buildIdField = ""; //$NON-NLS-1$
-        }
-        if (localProvider) {
-            title = appName + buildIdField + " | " + project.getLabel() + " (" //$NON-NLS-1$ //$NON-NLS-2$
-                    + Messages.getString("ApplicationWorkbenchWindowAdvisor.repositoryConnection") + ": " //$NON-NLS-1$ //$NON-NLS-2$
-                    + ConnectionUserPerReader.getInstance().readLastConncetion() + ")"; //$NON-NLS-1$
-        } else {
-            title = appName + buildIdField + " | " + repositoryContext.getUser() + " | " + project.getLabel() + " (" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                    + Messages.getString("ApplicationWorkbenchWindowAdvisor.repositoryConnection") + ": " //$NON-NLS-1$ //$NON-NLS-2$
-                    + ConnectionUserPerReader.getInstance().readLastConncetion() + ")"; //$NON-NLS-1$
-        }
-        return title;
-    }
-
-}

main/plugins/org.talend.core/src/main/java/org/talend/core/services/IGITProviderService.java

@@ -95,6 +95,4 @@ public interface IGITProviderService extends IService {
         }
         return register.getService(IGITProviderService.class);
     }
-
-    public void clearOldStorage(IProgressMonitor monitor, Project project) throws PersistenceException;
 }

main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java

@@ -1076,21 +1076,6 @@ public class ProcessorUtilities {
             }
             progressMonitor.subTask(Messages.getString("ProcessorUtilities.loadingJob") + currentJobName); //$NON-NLS-1$
 
-            //APPINT-35554 correct build type for child job of Route
-            JobInfo parentJobInfo = jobInfo.getFatherJobInfo();
-            if (selectedProcessItem != null && parentJobInfo != null 
-            		&& parentJobInfo.getProcessor() != null && parentJobInfo.getProcessor().getProperty() != null ) {
-            	Property childProperty = selectedProcessItem.getProperty();
-                String childBuildType = (String)childProperty.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE);
-                if (childBuildType == null) {
-                    Property parentProperty = parentJobInfo.getProcessor().getProperty();
-                    String parentBuildType = (String)parentProperty.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE);
-                    if ("ROUTE".equalsIgnoreCase(parentBuildType)) {
-                    	childProperty.getAdditionalProperties().put(TalendProcessArgumentConstant.ARG_BUILD_TYPE, "OSGI");
-                    }
-                }
-            }
-            
             if (jobInfo.getProcess() == null) {
                 if (selectedProcessItem != null) {
                     IDesignerCoreService service = CorePlugin.getDefault().getDesignerCoreService();

main/plugins/org.talend.cwm.mip.edit/plugin_fr.properties

@@ -553,7 +553,7 @@ _UI_Column_length_feature=Longueur
 _UI_Column_collationName_feature=Nom de l'interclassement
 _UI_Column_characterSetName_feature=Nom du jeu de caract\u00E8res
 _UI_Column_referencedTableType_feature=Type de la table r\u00E9f\u00E9renc\u00E9e
-_UI_Column_optionScopeColumnSet_feature=P\u00E9rim\u00E8tre des options sur le jeu de colonnes
+_UI_Column_optionScopeColumnSet_feature=Scope des options sur le jeu de colonnes
 _UI_Procedure_type_feature=Type
 _UI_Trigger_eventManipulation_feature=Manipulation d'\u00E9v\u00E9nement
 _UI_Trigger_actionCondition_feature=Condition d'action

main/plugins/org.talend.cwm.mip.edit/plugin_ja.properties

@@ -22,7 +22,7 @@ _UI_Dependency_type=\u4F9D\u5B58\u9805\u76EE
 _UI_Expression_type=\u5F0F
 _UI_BooleanExpression_type=\u30D6\u30FC\u30EB\u5024\u306E\u5F0F
 _UI_ProcedureExpression_type=\u30D7\u30ED\u30B7\u30FC\u30B8\u30E3\u30FC\u30A8\u30AF\u30B9\u30D7\u30EC\u30C3\u30B7\u30E7\u30F3
-_UI_Multiplicity_type=\u591A\u91CD\u5EA6
+_UI_Multiplicity_type=\u591A\u69D8\u6027
 _UI_MultiplicityRange_type=\u591A\u69D8\u6027\u30EC\u30F3\u30B8
 _UI_Stereotype_type=\u30B9\u30C6\u30EC\u30AA\u30BF\u30A4\u30D7
 _UI_TaggedValue_type=\u30BF\u30B0\u4ED8\u3051\u3055\u308C\u305F\u5024
@@ -151,7 +151,7 @@ _UI_ApplicationInputSpecification_type=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E
 _UI_AttributeUsageRelation_type=\u5C5E\u6027\u7528\u6CD5\u95A2\u4FC2
 _UI_Category_type=\u30AB\u30C6\u30B4\u30EA\u30FC
 _UI_CategoryHierarchy_type=\u30AB\u30C6\u30B4\u30EA\u30FC\u968E\u5C64
-_UI_CostMatrix_type=\u30B3\u30B9\u30C8\u30DE\u30C8\u30EA\u30AF\u30B9
+_UI_CostMatrix_type=\u30B3\u30B9\u30C8\u30DE\u30C8\u30EA\u30C3\u30AF\u30B9
 _UI_MiningAttribute_type=\u30DE\u30A4\u30CB\u30F3\u30B0\u5C5E\u6027
 _UI_MiningDataSpecification_type=\u30DE\u30A4\u30CB\u30F3\u30B0\u30C7\u30FC\u30BF\u4ED5\u69D8
 _UI_MiningModel_type=\u30DE\u30A4\u30CB\u30F3\u30B0\u30E2\u30C7\u30EB
@@ -367,7 +367,7 @@ _UI_Feature_featureNode_feature=\u6A5F\u80FD\u30CE\u30FC\u30C9
 _UI_Feature_featureMap_feature=\u6A5F\u80FD\u30DE\u30C3\u30D7
 _UI_Feature_cfMap_feature=Cf\u30DE\u30C3\u30D7
 _UI_StructuralFeature_changeability_feature=\u53EF\u5909\u6027
-_UI_StructuralFeature_multiplicity_feature=\u591A\u91CD\u5EA6
+_UI_StructuralFeature_multiplicity_feature=\u591A\u69D8\u6027
 _UI_StructuralFeature_ordering_feature=\u9806\u5E8F\u4ED8\u3051
 _UI_StructuralFeature_targetScope_feature=\u30BF\u30FC\u30B2\u30C3\u30C8\u30B9\u30B3\u30FC\u30D7
 _UI_StructuralFeature_type_feature=\u30BF\u30A4\u30D7
@@ -390,7 +390,7 @@ _UI_Expression_language_feature=\u8A00\u8A9E
 _UI_Multiplicity_range_feature=\u7BC4\u56F2
 _UI_MultiplicityRange_lower_feature=\u4E0B\u65B9
 _UI_MultiplicityRange_upper_feature=\u4E0A\u65B9
-_UI_MultiplicityRange_multiplicity_feature=\u591A\u91CD\u5EA6
+_UI_MultiplicityRange_multiplicity_feature=\u591A\u69D8\u6027
 _UI_Stereotype_baseClass_feature=\u30D9\u30FC\u30B9\u30AF\u30E9\u30B9
 _UI_Stereotype_stereotypeConstraint_feature=\u30B9\u30C6\u30EC\u30AA\u30BF\u30A4\u30D7\u5236\u7D04
 _UI_Stereotype_extendedElement_feature=\u62E1\u5F35\u3055\u308C\u305F\u30A8\u30EC\u30E1\u30F3\u30C8
@@ -418,7 +418,7 @@ _UI_Parameter_behavioralFeature_feature=\u52D5\u4F5C\u6A5F\u80FD
 _UI_Parameter_event_feature=\u30A4\u30D9\u30F3\u30C8
 _UI_Parameter_type_feature=\u30BF\u30A4\u30D7
 _UI_AssociationEnd_aggregation_feature=\u96C6\u7D04
-_UI_AssociationEnd_isNavigable_feature=\u8A98\u5C0E\u53EF\u80FD\u3067\u3042\u308B
+_UI_AssociationEnd_isNavigable_feature=Navigable\u3067\u3042\u308B
 _UI_Generalization_child_feature=\u5B50
 _UI_Generalization_parent_feature=\u89AA
 _UI_Instance_valueSlot_feature=\u5024\u30BB\u30C3\u30C8
@@ -552,7 +552,7 @@ _UI_Column_isNullable_feature=NULL\u53EF\u80FD
 _UI_Column_length_feature=\u9577\u3055
 _UI_Column_collationName_feature=\u7167\u5408\u540D
 _UI_Column_characterSetName_feature=\u6587\u5B57\u30BB\u30C3\u30C8\u540D
-_UI_Column_referencedTableType_feature=\u53C2\u7167\u30C6\u30FC\u30D6\u30EB\u30BF\u30A4\u30D7
+_UI_Column_referencedTableType_feature=\u53C2\u7167\u3055\u308C\u308B\u30C6\u30FC\u30D6\u30EB\u30BF\u30A4\u30D7
 _UI_Column_optionScopeColumnSet_feature=\u30AA\u30D7\u30B7\u30E7\u30F3\u30B9\u30B3\u30FC\u30D7\u30AB\u30E9\u30E0\u30BB\u30C3\u30C8
 _UI_Procedure_type_feature=\u30BF\u30A4\u30D7
 _UI_Trigger_eventManipulation_feature=\u30A4\u30D9\u30F3\u30C8\u64CD\u4F5C
@@ -743,7 +743,7 @@ _UI_ClusteringSettings_clusterIdAttributeName_feature=\u30AF\u30E9\u30B9\u30BF\u
 _UI_SupervisedMiningSettings_confidenceAttributeName_feature=\u4FE1\u7528\u5C5E\u6027\u540D
 _UI_SupervisedMiningSettings_predictedAttributeName_feature=\u4E88\u6E2C\u3055\u308C\u308B\u5C5E\u6027\u540D
 _UI_SupervisedMiningSettings_costFunction_feature=\u30B3\u30B9\u30C8\u95A2\u6570
-_UI_ClassificationSettings_costMatrix_feature=\u30B3\u30B9\u30C8\u30DE\u30C8\u30EA\u30AF\u30B9
+_UI_ClassificationSettings_costMatrix_feature=\u30B3\u30B9\u30C8\u30DE\u30C8\u30EA\u30C3\u30AF\u30B9
 _UI_AssociationRulesSettings_minimumSupport_feature=\u6700\u5C0F\u30B5\u30DD\u30FC\u30C8
 _UI_AssociationRulesSettings_minimumConfidence_feature=\u6700\u5C0F\u306E\u4FE1\u7528
 _UI_AssociationRulesSettings_itemId_feature=\u30A2\u30A4\u30C6\u30E0ID

main/plugins/org.talend.cwm.mip.editor/plugin_ja.properties

@@ -184,10 +184,10 @@ _UI_RecordEditor_label = \u30EC\u30B3\u30FC\u30C9\u30E2\u30C7\u30EB\u30A8\u30C7\
 _UI_RecordEditorFilenameDefaultBase = My
 _UI_RecordEditorFilenameExtension = \u30EC\u30B3\u30FC\u30C9
 
-_UI_MultidimensionalModelWizard_label = \u591A\u6B21\u5143\u30E2\u30C7\u30EB
-_UI_MultidimensionalModelWizard_description = \u65B0\u898F\u306E\u591A\u6B21\u5143\u30E2\u30C7\u30EB\u3092\u4F5C\u6210
+_UI_MultidimensionalModelWizard_label = \u591A\u6B21\u5143\u7684\u30E2\u30C7\u30EB
+_UI_MultidimensionalModelWizard_description = \u65B0\u898F\u306E\u591A\u6B21\u5143\u7684\u30E2\u30C7\u30EB\u3092\u4F5C\u6210
 
-_UI_MultidimensionalEditor_label = \u591A\u6B21\u5143\u30E2\u30C7\u30EB\u30A8\u30C7\u30A3\u30BF\u30FC
+_UI_MultidimensionalEditor_label = \u591A\u6B21\u5143\u7684\u30E2\u30C7\u30EB\u30A8\u30C7\u30A3\u30BF
 
 _UI_MultidimensionalEditorFilenameDefaultBase = My
 _UI_MultidimensionalEditorFilenameExtension = \u591A\u6B21\u5143\u7684

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

@@ -15,12 +15,12 @@
 		<geronimo.version>1.0.2</geronimo.version>
 		<jcache.version>1.0.5</jcache.version>
 		<jcache_spec.version>1.0-alpha-1</jcache_spec.version>
-		<johnzon.version>1.2.20</johnzon.version>
+		<johnzon.version>1.2.19</johnzon.version>
 		<meecrowave.version>1.2.15</meecrowave.version>
 		<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.75</tomcat.version>
+		<tomcat.version>9.0.73</tomcat.version>
 		<xbean.version>4.20</xbean.version>
 		<reload4j.version>1.2.22</reload4j.version>
 		<log4j2.version>2.20.0</log4j2.version>

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

@@ -17,7 +17,7 @@
 		<talend_releases>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</talend_releases>
 		<talend_snapshots_ee>https://artifacts-zl.talend.com/nexus/content/repositories/snapshots/</talend_snapshots_ee>
 		<talend_releases_ee>https://artifacts-zl.talend.com/nexus/content/repositories/releases/</talend_releases_ee>
-        <tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
+        <tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
 	</properties>
 	<repositories>
 		<repository>
@@ -72,15 +72,15 @@
 			<dependency>
 				<groupId>org.json</groupId>
 				<artifactId>json</artifactId>
-				<version>20230227</version>
+				<version>20140107</version>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.dataformat</groupId>
 				<artifactId>jackson-dataformat-cbor</artifactId>
 				<version>${m2.fasterxml.jackson.version}</version>
 			</dependency>
-			<!-- It fixes provided dependency scope to compile, because maven-dependency-plugin is setup to include
-				 only compile and runtime scopes, but provided is also required. It's not possible to setup plugin to
+			<!-- It fixes provided dependency scope to compile, because maven-dependency-plugin is setup to include
+				 only compile and runtime scopes, but provided is also required. It's not possible to setup plugin to
 				 include all: compile, runtime and provided dependencies -->
 			<dependency>
 				<groupId>biz.aQute.bnd</groupId>
@@ -99,7 +99,7 @@
 	</dependencyManagement>
 
 	<dependencies>
-		<!-- Dependencies in provided scope should be explicitly added as dependency in this module,
+		<!-- Dependencies in provided scope should be explicitly added as dependency in this module,
 				because provided scope is not transitive -->
 		<dependency>
 			<groupId>org.osgi</groupId>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/karaf-maven-plugin-4-2-10/pom.xml

@@ -52,17 +52,8 @@
 					<groupId>org.jsoup</groupId>
 					<artifactId>jsoup</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>org.apache.velocity</groupId>
-					<artifactId>velocity</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.velocity</groupId>
-			<artifactId>velocity-engine-core</artifactId>
-			<version>2.3</version>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
@@ -76,18 +67,13 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-framework-bom</artifactId>
-			<version>5.2.9.RELEASE</version>
+			<version>5.2.7.RELEASE</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-archiver</artifactId>
-			<version>4.8.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-xml</artifactId>
-			<version>4.0.0</version>
+			<version>3.6.0</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.codehaus.plexus</groupId>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/maven-bundle-plugin-5-1-1/pom.xml

@@ -59,17 +59,8 @@
 					<groupId>org.apache.commons</groupId>
 					<artifactId>commons-compress</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>org.apache.velocity</groupId>
-					<artifactId>velocity</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.velocity</groupId>
-			<artifactId>velocity-engine-core</artifactId>
-			<version>2.3</version>
-		</dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-utils</artifactId>
@@ -108,7 +99,7 @@
 		<dependency>
 		    <groupId>com.thoughtworks.xstream</groupId>
 		    <artifactId>xstream</artifactId>
-		    <version>1.4.20</version>
+		    <version>1.4.16</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/talend-compiler-plugin/pom.xml

@@ -13,7 +13,7 @@
 	 	<dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.8.8</version>
+            <version>3.8.6</version>
         </dependency>
 		<dependency>
 			<groupId>org.eclipse.tycho</groupId>

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

@@ -32,7 +32,7 @@
 		<dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.8.8</version>
+            <version>3.8.6</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-io</groupId>
@@ -123,7 +123,7 @@
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-compat</artifactId>
-			<version>3.8.8</version>
+			<version>3.8.6</version>
 		</dependency>
 		<dependency>
             <groupId>commons-codec</groupId>
@@ -133,7 +133,7 @@
 		<dependency>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-surefire-plugin</artifactId>
-			<version>2.22.2</version>
+			<version>2.20</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.sonatype.plexus</groupId>
@@ -141,21 +141,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-        <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-booter</artifactId>
-            <version>2.22.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-api</artifactId>
-            <version>2.22.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-junit4</artifactId>
-            <version>2.22.2</version>
-        </dependency>
 		<dependency>
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-cipher</artifactId>

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

@@ -42,7 +42,7 @@
 			<dependency>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
-                <version>20230227</version>
+                <version>20140107</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.dataformat</groupId>

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

@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.5.13</version>
+			<version>4.2.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.tycho</groupId>

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

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

main/plugins/org.talend.designer.maven/META-INF/MANIFEST.MF

@@ -37,4 +37,3 @@ Export-Package: org.talend.designer.maven,
  org.talend.designer.maven.tools.extension,
  org.talend.designer.maven.utils
 Import-Package: org.slf4j
-

main/plugins/org.talend.designer.maven/plugin.xml

@@ -26,4 +26,5 @@
             serviceId="IDesignerMavenService">
       </Service>
    </extension>
+
 </plugin>

main/plugins/org.talend.designer.maven/resources/templates/general/pom_project_template.xml

@@ -44,12 +44,7 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-utils</artifactId>
-							<version>4.0.0</version>
-						</dependency>
-						<dependency>
-							<groupId>org.codehaus.plexus</groupId>
-							<artifactId>plexus-xml</artifactId>
-							<version>4.0.0</version>
+							<version>3.0.24</version>
 						</dependency>
 						<dependency>
 							<groupId>commons-io</groupId>
@@ -59,12 +54,12 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-archiver</artifactId>
-							<version>4.8.0</version>
+							<version>3.6.0</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-compat</artifactId>
-							<version>3.8.8</version>
+							<version>3.8.6</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.commons</groupId>
@@ -74,12 +69,12 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.8</version>
+							<version>3.8.6</version>
 						</dependency>
 						<dependency>
 							<groupId>com.google.guava</groupId>
 							<artifactId>guava</artifactId>
-							<version>32.0.1-jre</version>
+							<version>30.0-jre</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -106,12 +101,12 @@
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.8</version>
+							<version>3.8.6</version>
 						</dependency>
 						<dependency>
 							<groupId>com.google.guava</groupId>
 							<artifactId>guava</artifactId>
-							<version>32.0.1-jre</version>
+							<version>30.0-jre</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -128,12 +123,7 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-utils</artifactId>
-							<version>4.0.0</version>
-						</dependency>
-						<dependency>
-							<groupId>org.codehaus.plexus</groupId>
-							<artifactId>plexus-xml</artifactId>
-							<version>4.0.0</version>
+							<version>3.0.24</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.commons</groupId>
@@ -148,22 +138,22 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-archiver</artifactId>
-							<version>4.8.0</version>
+							<version>3.6.0</version>
 						</dependency>
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-io</artifactId>
-							<version>3.4.1</version>
+							<version>3.0.1</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.8</version>
+							<version>3.8.6</version>
 						</dependency>
 						<dependency>
 							<groupId>com.google.guava</groupId>
 							<artifactId>guava</artifactId>
-							<version>32.0.1-jre</version>
+							<version>30.0-jre</version>
 						</dependency>
 					</dependencies>
 					<configuration>
@@ -175,7 +165,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.6.0</version>
+					<version>3.0.0</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.apache.maven.shared</groupId>
@@ -185,17 +175,7 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-utils</artifactId>
-							<version>4.0.0</version>
-						</dependency>
-						<dependency>
-							<groupId>org.codehaus.plexus</groupId>
-							<artifactId>plexus-io</artifactId>
-							<version>3.4.1</version>
-						</dependency>
-						<dependency>
-							<groupId>org.codehaus.plexus</groupId>
-							<artifactId>plexus-xml</artifactId>
-							<version>4.0.0</version>
+							<version>3.0.24</version>
 						</dependency>
 						<dependency>
 							<groupId>commons-codec</groupId>
@@ -215,29 +195,29 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-archiver</artifactId>
-							<version>4.8.0</version>
+							<version>3.6.0</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-compat</artifactId>
-							<version>3.8.8</version>
+							<version>3.8.6</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.maven</groupId>
 							<artifactId>maven-core</artifactId>
-							<version>3.8.8</version>
+							<version>3.8.6</version>
 						</dependency>
 						<dependency>
 							<groupId>com.google.guava</groupId>
 							<artifactId>guava</artifactId>
-							<version>32.0.1-jre</version>
+							<version>30.0-jre</version>
 						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.22.2</version>
+					<version>2.20</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.sonatype.plexus</groupId>

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/AbstractMavenProcessorPom.java

@@ -216,7 +216,7 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
                 Dependency guavaDep = new Dependency();
                 guavaDep.setGroupId("com.google.guava");
                 guavaDep.setArtifactId("guava");
-                guavaDep.setVersion("32.0.1-jre");
+                guavaDep.setVersion("30.0-jre");
                 
                 Dependency ioDep = new Dependency();
                 ioDep.setGroupId("commons-io");
@@ -231,7 +231,7 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
                 Dependency mavenCoreDep = new Dependency();
                 mavenCoreDep.setGroupId("org.apache.maven");
                 mavenCoreDep.setArtifactId("maven-core");
-                mavenCoreDep.setVersion("3.8.8");
+                mavenCoreDep.setVersion("3.8.6");
                 
                 shade.getDependencies().add(guavaDep);
                 shade.getDependencies().add(codecDep);

main/plugins/org.talend.libraries.jdbc.mysql/plugin.xml

@@ -18,11 +18,11 @@
         </libraryNeeded>
         <libraryNeeded
               context="plugin:org.talend.libraries.jdbc.mysql"
-              id="mariadb-java-client-3.1.4.jar"
+              id="mariadb-java-client-2.5.3.jar"
               language="java"
               message="Needed for Mysql jdbc plugin"
-              mvn_uri="mvn:org.mariadb.jdbc/mariadb-java-client/3.1.4"
-              name="mariadb-java-client-3.1.4.jar"
+              mvn_uri="mvn:org.mariadb.jdbc/mariadb-java-client/2.5.3"
+              name="mariadb-java-client-2.5.3.jar"
               required="true">
         </libraryNeeded>
         <libraryNeeded

main/plugins/org.talend.libraries.jfreechart.jars/lib_src/jfreechart-1.0.12/experimental/org/jfree/experimental/chart/demo/CombinedCategoryPlotDemo1.java

@@ -0,0 +1,223 @@
+/* ===========================================================
+ * JFreeChart : a free chart library for the Java(tm) platform
+ * ===========================================================
+ *
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
+ *
+ * Project Info:  http://www.jfree.org/jfreechart/index.html
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * ------------------------------
+ * CombinedCategoryPlotDemo1.java
+ * ------------------------------
+ * (C) Copyright 2008, by Object Refinery Limited and Contributors.
+ *
+ * Original Author:  David Gilbert (for Object Refinery Limited);
+ * Contributor(s):   ;
+ *
+ * Changes
+ * -------
+ * 05-May-2008 : Version 1 (DG);
+ *
+ */
+
+package org.jfree.experimental.chart.demo;
+
+import java.awt.Font;
+
+import javax.swing.JPanel;
+
+import org.jfree.chart.ChartPanel;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.axis.CategoryAxis;
+import org.jfree.chart.axis.NumberAxis;
+import org.jfree.chart.labels.StandardCategoryToolTipGenerator;
+import org.jfree.chart.plot.CategoryPlot;
+import org.jfree.chart.renderer.category.BarRenderer;
+import org.jfree.chart.renderer.category.LineAndShapeRenderer;
+import org.jfree.data.category.CategoryDataset;
+import org.jfree.data.category.DefaultCategoryDataset;
+import org.jfree.experimental.chart.plot.CombinedCategoryPlot;
+import org.jfree.ui.ApplicationFrame;
+import org.jfree.ui.RefineryUtilities;
+
+/**
+ * A demo for the {@link CombinedCategoryPlot} class.
+ */
+public class CombinedCategoryPlotDemo1 extends ApplicationFrame {
+
+    /**
+     * Creates a new demo instance.
+     *
+     * @param title  the frame title.
+     */
+    public CombinedCategoryPlotDemo1(String title) {
+        super(title);
+        JPanel chartPanel = createDemoPanel();
+        chartPanel.setPreferredSize(new java.awt.Dimension(500, 270));
+        setContentPane(chartPanel);
+    }
+
+    /**
+     * Creates a dataset.
+     *
+     * @return A dataset.
+     */
+    public static CategoryDataset createDataset1() {
+        DefaultCategoryDataset result = new DefaultCategoryDataset();
+        String series1 = "First";
+        String series2 = "Second";
+        String type1 = "Type 1";
+        String type2 = "Type 2";
+        String type3 = "Type 3";
+        String type4 = "Type 4";
+        String type5 = "Type 5";
+        String type6 = "Type 6";
+        String type7 = "Type 7";
+        String type8 = "Type 8";
+
+        result.addValue(1.0, series1, type1);
+        result.addValue(4.0, series1, type2);
+        result.addValue(3.0, series1, type3);
+        result.addValue(5.0, series1, type4);
+        result.addValue(5.0, series1, type5);
+        result.addValue(7.0, series1, type6);
+        result.addValue(7.0, series1, type7);
+        result.addValue(8.0, series1, type8);
+
+        result.addValue(5.0, series2, type1);
+        result.addValue(7.0, series2, type2);
+        result.addValue(6.0, series2, type3);
+        result.addValue(8.0, series2, type4);
+        result.addValue(4.0, series2, type5);
+        result.addValue(4.0, series2, type6);
+        result.addValue(2.0, series2, type7);
+        result.addValue(1.0, series2, type8);
+
+        return result;
+    }
+
+    /**
+     * Creates a dataset.
+     *
+     * @return A dataset.
+     */
+    public static CategoryDataset createDataset2() {
+
+        DefaultCategoryDataset result = new DefaultCategoryDataset();
+
+        String series1 = "Third";
+        String series2 = "Fourth";
+
+        String type1 = "Type 1";
+        String type2 = "Type 2";
+        String type3 = "Type 3";
+        String type4 = "Type 4";
+        String type5 = "Type 5";
+        String type6 = "Type 6";
+        String type7 = "Type 7";
+        String type8 = "Type 8";
+
+        result.addValue(11.0, series1, type1);
+        result.addValue(14.0, series1, type2);
+        result.addValue(13.0, series1, type3);
+        result.addValue(15.0, series1, type4);
+        result.addValue(15.0, series1, type5);
+        result.addValue(17.0, series1, type6);
+        result.addValue(17.0, series1, type7);
+        result.addValue(18.0, series1, type8);
+
+        result.addValue(15.0, series2, type1);
+        result.addValue(17.0, series2, type2);
+        result.addValue(16.0, series2, type3);
+        result.addValue(18.0, series2, type4);
+        result.addValue(14.0, series2, type5);
+        result.addValue(14.0, series2, type6);
+        result.addValue(12.0, series2, type7);
+        result.addValue(11.0, series2, type8);
+
+        return result;
+
+    }
+
+    /**
+     * Creates a chart.
+     *
+     * @return A chart.
+     */
+    private static JFreeChart createChart() {
+
+        CategoryDataset dataset1 = createDataset1();
+        NumberAxis rangeAxis1 = new NumberAxis("Value");
+        rangeAxis1.setStandardTickUnits(NumberAxis.createIntegerTickUnits());
+        LineAndShapeRenderer renderer1 = new LineAndShapeRenderer();
+        renderer1.setBaseToolTipGenerator(
+                new StandardCategoryToolTipGenerator());
+        CategoryPlot subplot1 = new CategoryPlot(dataset1, null, rangeAxis1,
+                renderer1);
+        subplot1.setDomainGridlinesVisible(true);
+
+        CategoryDataset dataset2 = createDataset2();
+        NumberAxis rangeAxis2 = new NumberAxis("Value");
+        rangeAxis2.setStandardTickUnits(NumberAxis.createIntegerTickUnits());
+        BarRenderer renderer2 = new BarRenderer();
+        renderer2.setBaseToolTipGenerator(
+                new StandardCategoryToolTipGenerator());
+        CategoryPlot subplot2 = new CategoryPlot(dataset2, null, rangeAxis2,
+                renderer2);
+        subplot2.setDomainGridlinesVisible(true);
+
+        CategoryAxis domainAxis = new CategoryAxis("Category");
+        CombinedCategoryPlot plot = new CombinedCategoryPlot(
+                domainAxis, new NumberAxis("Range"));
+        plot.add(subplot1, 2);
+        plot.add(subplot2, 1);
+
+        JFreeChart result = new JFreeChart(
+                "Combined Domain Category Plot Demo",
+                new Font("SansSerif", Font.BOLD, 12), plot, true);
+        return result;
+
+    }
+
+    /**
+     * Creates a panel for the demo (used by SuperDemo.java).
+     *
+     * @return A panel.
+     */
+    public static JPanel createDemoPanel() {
+        JFreeChart chart = createChart();
+        return new ChartPanel(chart);
+    }
+
+    /**
+     * Starting point for the demonstration application.
+     *
+     * @param args  ignored.
+     */
+    public static void main(String[] args) {
+        String title = "Combined Category Plot Demo 1";
+        CombinedCategoryPlotDemo1 demo = new CombinedCategoryPlotDemo1(title);
+        demo.pack();
+        RefineryUtilities.centerFrameOnScreen(demo);
+        demo.setVisible(true);
+    }
+
+}

main/plugins/org.talend.libraries.jfreechart.jars/lib_src/jfreechart-1.0.12/experimental/org/jfree/experimental/chart/demo/CombinedXYPlotDemo1.java

@@ -0,0 +1,262 @@
+/* ===========================================================
+ * JFreeChart : a free chart library for the Java(tm) platform
+ * ===========================================================
+ *
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
+ *
+ * Project Info:  http://www.jfree.org/jfreechart/index.html
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * ------------------------
+ * CombinedXYPlotDemo1.java
+ * ------------------------
+ * (C) Copyright 2008, by Object Refinery Limited and Contributors.
+ *
+ * Original Author:  David Gilbert (for Object Refinery Limited);
+ * Contributor(s):   ;
+ *
+ * Changes
+ * -------
+ * 05-May-2008 : Version 1 (DG);
+ *
+ */
+
+package org.jfree.experimental.chart.demo;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Paint;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+
+import javax.swing.JPanel;
+
+import org.jfree.chart.ChartPanel;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.axis.DateAxis;
+import org.jfree.chart.axis.NumberAxis;
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.labels.StandardXYToolTipGenerator;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.renderer.xy.XYBarRenderer;
+import org.jfree.chart.renderer.xy.XYItemRenderer;
+import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
+import org.jfree.chart.title.LegendTitle;
+import org.jfree.data.time.Month;
+import org.jfree.data.time.TimeSeries;
+import org.jfree.data.time.TimeSeriesCollection;
+import org.jfree.data.xy.IntervalXYDataset;
+import org.jfree.data.xy.XYDataset;
+import org.jfree.experimental.chart.plot.CombinedXYPlot;
+import org.jfree.ui.ApplicationFrame;
+import org.jfree.ui.RefineryUtilities;
+
+/**
+ * A demonstration application showing a {@link CombinedXYPlot} with
+ * two subplots.
+ */
+public class CombinedXYPlotDemo1 extends ApplicationFrame {
+
+    /**
+     * Constructs a new demonstration application.
+     *
+     * @param title  the frame title.
+     */
+    public CombinedXYPlotDemo1(String title) {
+        super(title);
+        JPanel panel = createDemoPanel();
+        panel.setPreferredSize(new java.awt.Dimension(500, 270));
+        setContentPane(panel);
+    }
+
+    /**
+     * Creates an overlaid chart.
+     *
+     * @return The chart.
+     */
+    private static JFreeChart createCombinedChart() {
+
+        // create plot ...
+        IntervalXYDataset data1 = createDataset1();
+        XYItemRenderer renderer1 = new XYLineAndShapeRenderer(true, false);
+        renderer1.setBaseToolTipGenerator(new StandardXYToolTipGenerator(
+                StandardXYToolTipGenerator.DEFAULT_TOOL_TIP_FORMAT,
+                new SimpleDateFormat("d-MMM-yyyy"), new DecimalFormat("0.00")));
+        renderer1.setSeriesStroke(0, new BasicStroke(4.0f,
+                BasicStroke.CAP_ROUND, BasicStroke.JOIN_BEVEL));
+        renderer1.setSeriesPaint(0, Color.blue);
+
+        DateAxis domainAxis = new DateAxis("Year");
+        domainAxis.setLowerMargin(0.0);
+        domainAxis.setUpperMargin(0.02);
+        ValueAxis rangeAxis = new NumberAxis("$billion");
+        XYPlot plot1 = new XYPlot(data1, null, rangeAxis, renderer1);
+        plot1.setBackgroundPaint(Color.lightGray);
+        plot1.setDomainGridlinePaint(Color.white);
+        plot1.setRangeGridlinePaint(Color.white);
+
+        // add a second dataset and renderer...
+        IntervalXYDataset data2 = createDataset2();
+        XYBarRenderer renderer2 = new XYBarRenderer() {
+            public Paint getItemPaint(int series, int item) {
+                XYDataset dataset = getPlot().getDataset();
+                if (dataset.getYValue(series, item) >= 0.0) {
+                    return Color.red;
+                }
+                else {
+                    return Color.green;
+                }
+            }
+        };
+        renderer2.setSeriesPaint(0, Color.red);
+        renderer2.setDrawBarOutline(false);
+        renderer2.setBaseToolTipGenerator(new StandardXYToolTipGenerator(
+                StandardXYToolTipGenerator.DEFAULT_TOOL_TIP_FORMAT,
+                new SimpleDateFormat("d-MMM-yyyy"), new DecimalFormat("0.00")));
+
+        XYPlot plot2 = new XYPlot(data2, null, new NumberAxis("$billion"),
+                renderer2);
+        plot2.setBackgroundPaint(Color.lightGray);
+        plot2.setDomainGridlinePaint(Color.white);
+        plot2.setRangeGridlinePaint(Color.white);
+
+        CombinedXYPlot cplot = new CombinedXYPlot(domainAxis, rangeAxis);
+        cplot.add(plot1, 3);
+        cplot.add(plot2, 2);
+        cplot.setGap(8.0);
+        cplot.setDomainGridlinePaint(Color.white);
+        cplot.setDomainGridlinesVisible(true);
+
+        // return a new chart containing the overlaid plot...
+        JFreeChart chart = new JFreeChart("CombinedXYPlotDemo1",
+                JFreeChart.DEFAULT_TITLE_FONT, cplot, false);
+        chart.setBackgroundPaint(Color.white);
+        LegendTitle legend = new LegendTitle(cplot);
+        chart.addSubtitle(legend);
+        return chart;
+    }
+
+    /**
+     * Creates a sample dataset.  You wouldn't normally hard-code the
+     * population of a dataset in this way (it would be better to read the
+     * values from a file or a database query), but for a self-contained demo
+     * this is the least complicated solution.
+     *
+     * @return The dataset.
+     */
+    private static IntervalXYDataset createDataset1() {
+
+        // create dataset 1...
+        TimeSeries series1 = new TimeSeries("Series 1", Month.class);
+        series1.add(new Month(1, 2005), 7627.743);
+        series1.add(new Month(2, 2005), 7713.138);
+        series1.add(new Month(3, 2005), 6776.939);
+        series1.add(new Month(4, 2005), 5764.537);
+        series1.add(new Month(5, 2005), 4777.880);
+        series1.add(new Month(6, 2005), 4836.496);
+        series1.add(new Month(7, 2005), 3887.618);
+        series1.add(new Month(8, 2005), 3926.933);
+        series1.add(new Month(9, 2005), 4932.710);
+        series1.add(new Month(10, 2005), 4027.123);
+        series1.add(new Month(11, 2005), 8092.322);
+        series1.add(new Month(12, 2005), 8170.414);
+        series1.add(new Month(1, 2006), 8196.070);
+        series1.add(new Month(2, 2006), 8269.886);
+        series1.add(new Month(3, 2006), 5371.156);
+        series1.add(new Month(4, 2006), 5355.718);
+        series1.add(new Month(5, 2006), 5356.777);
+        series1.add(new Month(6, 2006), 8420.042);
+        series1.add(new Month(7, 2006), 8444.347);
+        series1.add(new Month(8, 2006), 8515.034);
+        series1.add(new Month(9, 2006), 8506.974);
+        series1.add(new Month(10, 2006), 8584.329);
+        series1.add(new Month(11, 2006), 8633.246);
+        series1.add(new Month(12, 2006), 8680.224);
+        series1.add(new Month(1, 2007), 8707.561);
+        return new TimeSeriesCollection(series1);
+
+    }
+
+    /**
+     * Creates a sample dataset.  You wouldn't normally hard-code the
+     * population of a dataset in this way (it would be better to read the
+     * values from a file or a database query), but for a self-contained demo
+     * this is the least complicated solution.
+     *
+     * @return A sample dataset.
+     */
+    private static IntervalXYDataset createDataset2() {
+        TimeSeriesCollection dataset = new TimeSeriesCollection();
+
+        TimeSeries series1 = new TimeSeries("Series 2", Month.class);
+        series1.add(new Month(1, 2005), 1200);
+        series1.add(new Month(2, 2005), 1400);
+        series1.add(new Month(3, 2005), 1500);
+        series1.add(new Month(4, 2005), 1700);
+        series1.add(new Month(5, 2005), 1600);
+        series1.add(new Month(6, 2005), 2400);
+        series1.add(new Month(7, 2005), 2100);
+        series1.add(new Month(8, 2005), 2200);
+        series1.add(new Month(9, 2005), 800);
+        series1.add(new Month(10, 2005), 2350);
+        series1.add(new Month(11, 2005), 500);
+        series1.add(new Month(12, 2005), 700);
+        series1.add(new Month(1, 2006), 900);
+        series1.add(new Month(2, 2006), 1500);
+        series1.add(new Month(3, 2006), 2100);
+        series1.add(new Month(4, 2006), 2200);
+        series1.add(new Month(5, 2006), 1900);
+        series1.add(new Month(6, 2006), 3000);
+        series1.add(new Month(7, 2006), 3780);
+        series1.add(new Month(8, 2006), 4000);
+        series1.add(new Month(9, 2006), 4500);
+        series1.add(new Month(10, 2006), 7000);
+        series1.add(new Month(11, 2006), 5500);
+        series1.add(new Month(12, 2006), 6000);
+        series1.add(new Month(1, 2007), 6500);
+        dataset.addSeries(series1);
+        return dataset;
+
+    }
+
+    /**
+     * Creates a panel for the demo (used by SuperDemo.java).
+     *
+     * @return A panel.
+     */
+    public static JPanel createDemoPanel() {
+        JFreeChart chart = createCombinedChart();
+        return new ChartPanel(chart);
+    }
+
+    /**
+     * Starting point for the demonstration application.
+     *
+     * @param args  ignored.
+     */
+    public static void main(String[] args) {
+        CombinedXYPlotDemo1 demo = new CombinedXYPlotDemo1(
+                "JFreeChart : CombinedXYPlotDemo1");
+        demo.pack();
+        RefineryUtilities.centerFrameOnScreen(demo);
+        demo.setVisible(true);
+    }
+
+}

main/plugins/org.talend.libraries.jfreechart.jars/lib_src/jfreechart-1.0.12/experimental/org/jfree/experimental/chart/plot/CombinedCategoryPlot.java

@@ -0,0 +1,139 @@
+/* ===========================================================
+ * JFreeChart : a free chart library for the Java(tm) platform
+ * ===========================================================
+ *
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
+ *
+ * Project Info:  http://www.jfree.org/jfreechart/index.html
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * -------------------------
+ * CombinedCategoryPlot.java
+ * -------------------------
+ * (C) Copyright 2008, by Richard West and Contributors.
+ *
+ * Original Author:  Richard West, Advanced Micro Devices, Inc.;
+ * Contributor(s):   David Gilbert (for Object Refinery Limited);
+ *
+ * Changes
+ * -------
+ * 02-Feb-2007 : Version 1, contributed by Richard West - see
+ *               patch 1924543 (DG);
+ *
+ */
+
+package org.jfree.experimental.chart.plot;
+
+import java.util.Iterator;
+
+import org.jfree.chart.axis.CategoryAxis;
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.plot.CategoryPlot;
+import org.jfree.chart.plot.CombinedDomainCategoryPlot;
+import org.jfree.data.Range;
+
+/**
+ * A specialised form of {@link CombinedDomainCategoryPlot} where the
+ * subplots share not only the same x-axis, but also the same y-axis.
+ */
+public class CombinedCategoryPlot extends CombinedDomainCategoryPlot {
+
+    /**
+     * Creates a new instance with the specified axes.
+     *
+     * @param domainAxis  the x-axis.
+     * @param rangeAxis  the y-axis.
+     */
+    public CombinedCategoryPlot (CategoryAxis domainAxis, ValueAxis rangeAxis) {
+        super(domainAxis);
+        super.setGap(10.0);
+        super.setRangeAxis(rangeAxis);
+    }
+
+    /**
+     * Adds a new subplot with weight <code>1</code>.
+     *
+     * @param subplot  the subplot.
+     */
+    public void add(CategoryPlot subplot) {
+        this.add(subplot, 1);
+    }
+
+    /**
+     * Adds a new subplot with the specified weight.
+     *
+     * @param subplot  the subplot.
+     * @param weight  the weight for the subplot.
+     */
+    public void add(CategoryPlot subplot, int weight) {
+        super.add(subplot, weight);
+
+        ValueAxis l_range = super.getRangeAxis();
+        subplot.setRangeAxis(0, l_range, false);
+
+        super.setRangeAxis(l_range);
+        if (null == l_range) {
+            return;
+        }
+
+        l_range.configure();
+    }
+
+    /**
+     * Returns the bounds of the data values that will be plotted against
+     * the specified axis.
+     *
+     * @param axis  the axis.
+     *
+     * @return The bounds.
+     */
+    public Range getDataRange(ValueAxis axis) {
+        Range l_result = null;
+        Iterator l_itr = getSubplots().iterator();
+        while (l_itr.hasNext()) {
+            CategoryPlot l_subplot = (CategoryPlot) l_itr.next();
+
+            l_result = Range.combine(l_result, l_subplot.getDataRange(axis));
+        }
+        return l_result;
+    }
+
+    /**
+     * Sets the range axis that is shared by all the subplots.
+     *
+     * @param axis  the axis.
+     */
+    public void setRangeAxis(ValueAxis axis) {
+        Iterator l_itr = getSubplots().iterator();
+        while (l_itr.hasNext()) {
+            CategoryPlot l_subplot = (CategoryPlot) l_itr.next();
+            l_subplot.setRangeAxis(0, axis, false);
+        }
+
+        super.setRangeAxis(axis);
+        if (null == axis) {
+            return;
+        }
+
+        axis.configure();
+    }
+}
+
+

main/plugins/org.talend.libraries.jfreechart.jars/lib_src/jfreechart-1.0.12/experimental/org/jfree/experimental/chart/plot/CombinedXYPlot.java

@@ -0,0 +1,139 @@
+/* ===========================================================
+ * JFreeChart : a free chart library for the Java(tm) platform
+ * ===========================================================
+ *
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
+ *
+ * Project Info:  http://www.jfree.org/jfreechart/index.html
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * -------------------
+ * CombinedXYPlot.java
+ * -------------------
+ * (C) Copyright 2008, by Richard West and Contributors.
+ *
+ * Original Author:  Richard West, Advanced Micro Devices, Inc.;
+ * Contributor(s):   David Gilbert (for Object Refinery Limited);
+ *
+ * Changes
+ * -------
+ * 05-May-2008 : Version 1, contributed by Richard West - see
+ *               patch 1924543 (DG);
+ *
+ */
+
+package org.jfree.experimental.chart.plot;
+
+import java.util.Iterator;
+
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.plot.CombinedDomainCategoryPlot;
+import org.jfree.chart.plot.CombinedDomainXYPlot;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.data.Range;
+
+/**
+ * A specialised form of {@link CombinedDomainCategoryPlot} where the
+ * subplots share not only the same x-axis, but also the same y-axis.
+ */
+public class CombinedXYPlot extends CombinedDomainXYPlot {
+
+    /**
+     * Creates a new instance with the specified axes.
+     *
+     * @param domainAxis  the x-axis.
+     * @param rangeAxis  the y-axis.
+     */
+    public CombinedXYPlot(ValueAxis domainAxis, ValueAxis rangeAxis) {
+        super(domainAxis);
+        super.setGap(10.0);
+        super.setRangeAxis(rangeAxis);
+    }
+
+    /**
+     * Adds a new subplot with weight <code>1</code>.
+     *
+     * @param subplot  the subplot.
+     */
+    public void add(XYPlot subplot) {
+        this.add(subplot, 1);
+    }
+
+    /**
+     * Adds a new subplot with the specified weight.
+     *
+     * @param subplot  the subplot.
+     * @param weight  the weight for the subplot.
+     */
+    public void add(XYPlot subplot, int weight) {
+        super.add(subplot, weight);
+
+        ValueAxis l_range = super.getRangeAxis();
+        subplot.setRangeAxis(0, l_range, false);
+
+        super.setRangeAxis(l_range);
+        if (null == l_range) {
+            return;
+        }
+
+        l_range.configure();
+    }
+
+    /**
+     * Returns the bounds of the data values that will be plotted against
+     * the specified axis.
+     *
+     * @param axis  the axis.
+     *
+     * @return The bounds.
+     */
+    public Range getDataRange(ValueAxis axis) {
+        Range l_result = null;
+        Iterator l_itr = getSubplots().iterator();
+        while (l_itr.hasNext()) {
+            XYPlot l_subplot = (XYPlot) l_itr.next();
+
+            l_result = Range.combine(l_result, l_subplot.getDataRange(axis));
+        }
+        return l_result;
+    }
+
+    /**
+     * Sets the range axis that is shared by all the subplots.
+     *
+     * @param axis  the axis.
+     */
+    public void setRangeAxis(ValueAxis axis) {
+        Iterator l_itr = getSubplots().iterator();
+        while (l_itr.hasNext()) {
+            XYPlot l_subplot = (XYPlot) l_itr.next();
+            l_subplot.setRangeAxis(0, axis, false);
+        }
+
+        super.setRangeAxis(axis);
+        if (null == axis) {
+            return;
+        }
+
+        axis.configure();
+    }
+
+}
+

main/plugins/org.talend.libraries.jfreechart.jars/lib_src/jfreechart-1.0.12/experimental/org/jfree/experimental/chart/renderer/xy/XYSmoothLineAndShapeRenderer.java

@@ -0,0 +1,298 @@
+/* ===========================================================
+ * JFreeChart : a free chart library for the Java(tm) platform
+ * ===========================================================
+ *
+ * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
+ *
+ * Project Info:  http://www.jfree.org/jfreechart/index.html
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * ---------------------------------
+ * XYSmoothLineAndShapeRenderer.java
+ * ---------------------------------
+ * (C) Copyright 2007, by Object Refinery Limited and Contributors.
+ *
+ * Original Author:  -;
+ * Contributor(s):   -;
+ *
+ * Changes
+ * -------
+ * 14-Jun-2007 : Version 1;
+ *
+ */
+
+package org.jfree.experimental.chart.renderer.xy;
+
+import java.awt.Graphics2D;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.entity.EntityCollection;
+import org.jfree.chart.plot.CrosshairState;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.renderer.xy.XYItemRendererState;
+import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
+import org.jfree.data.xy.XYDataset;
+import org.jfree.ui.RectangleEdge;
+
+/**
+ * A line and shape renderer that performs line smoothing.  See
+ * http://www.jfree.org/phpBB2/viewtopic.php?t=20671
+ *
+ * WARNING: THIS CLASS IS NOT PART OF THE STANDARD JFREECHART API AND IS
+ * SUBJECT TO ALTERATION OR REMOVAL.  DO NOT RELY ON THIS CLASS FOR
+ * PRODUCTION USE.  Please experiment with this code and provide feedback.
+ */
+public class XYSmoothLineAndShapeRenderer extends XYLineAndShapeRenderer {
+
+    /**
+     * Draws the item (first pass). This method draws the lines
+     * connecting the items.
+     *
+     * @param g2  the graphics device.
+     * @param state  the renderer state.
+     * @param dataArea  the area within which the data is being drawn.
+     * @param plot  the plot (can be used to obtain standard color
+     *              information etc).
+     * @param domainAxis  the domain axis.
+     * @param rangeAxis  the range axis.
+     * @param dataset  the dataset.
+     * @param pass  the pass.
+     * @param series  the series index (zero-based).
+     * @param item  the item index (zero-based).
+     */
+    protected void drawPrimaryLine(XYItemRendererState state, Graphics2D g2,
+            XYPlot plot, XYDataset dataset, int pass, int series, int item,
+            ValueAxis domainAxis, ValueAxis rangeAxis, Rectangle2D dataArea) {
+
+        if (item == 0) {
+            return;
+        }
+
+        // get the data point...
+        double x1 = dataset.getXValue(series, item);
+        double y1 = dataset.getYValue(series, item);
+        if (Double.isNaN(y1) || Double.isNaN(x1)) {
+            return;
+        }
+
+        double x0 = dataset.getXValue(series, item - 1);
+        double y0 = dataset.getYValue(series, item - 1);
+        if (Double.isNaN(y0) || Double.isNaN(x0)) {
+            return;
+        }
+
+        RectangleEdge xAxisLocation = plot.getDomainAxisEdge();
+        RectangleEdge yAxisLocation = plot.getRangeAxisEdge();
+
+        double transX0 = domainAxis.valueToJava2D(x0, dataArea, xAxisLocation);
+        double transY0 = rangeAxis.valueToJava2D(y0, dataArea, yAxisLocation);
+
+        double transX1 = domainAxis.valueToJava2D(x1, dataArea, xAxisLocation);
+        double transY1 = rangeAxis.valueToJava2D(y1, dataArea, yAxisLocation);
+
+        // only draw if we have good values
+        if (Double.isNaN(transX0) || Double.isNaN(transY0)
+                || Double.isNaN(transX1) || Double.isNaN(transY1)) {
+            return;
+        }
+
+        Point2D.Double point0 = new Point2D.Double();
+        Point2D.Double point1 = new Point2D.Double();
+        Point2D.Double point2 = new Point2D.Double();
+        Point2D.Double point3 = new Point2D.Double();
+
+        if (item == 1) {
+            point0 = null;
+        }
+        else {
+            point0.x = domainAxis.valueToJava2D(dataset.getXValue(series,
+                    item - 2), dataArea, xAxisLocation);
+            point0.y = rangeAxis.valueToJava2D(dataset.getYValue(series,
+                    item - 2), dataArea, yAxisLocation);
+        }
+
+        point1.x = transX0;
+        point1.y = transY0;
+
+        point2.x = transX1;
+        point2.y = transY1;
+
+        if ((item + 1) == dataset.getItemCount(series)) {
+            point3 = null;
+        }
+        else {
+            point3.x = domainAxis.valueToJava2D(dataset.getXValue(series,
+                    item + 1), dataArea, xAxisLocation);
+            point3.y = rangeAxis.valueToJava2D(dataset.getYValue(series,
+                    item + 1), dataArea, yAxisLocation);
+        }
+
+        int steps = ((int) ((point2.x - point1.x) / 0.2) < 30)
+                ? (int) ((point2.x - point1.x) / 0.2) : 30;
+
+        Point2D.Double[] points = getBezierCurve(point0, point1, point2,
+                point3, 1, steps);
+
+        for (int i = 1; i < points.length; i++) {
+            transX0 = points[i - 1].x;
+            transY0 = points[i - 1].y;
+            transX1 = points[i].x;
+            transY1 = points[i].y;
+
+            PlotOrientation orientation = plot.getOrientation();
+            if (orientation == PlotOrientation.HORIZONTAL) {
+                state.workingLine.setLine(transY0, transX0, transY1, transX1);
+            }
+            else if (orientation == PlotOrientation.VERTICAL) {
+                state.workingLine.setLine(transX0, transY0, transX1, transY1);
+            }
+
+            if (state.workingLine.intersects(dataArea)) {
+                drawFirstPassShape(g2, pass, series, item, state.workingLine);
+            }
+        }
+    }
+
+    /**
+     * Draws the item shapes and adds chart entities (second pass). This method
+     * draws the shapes which mark the item positions. If <code>entities</code>
+     * is not <code>null</code> it will be populated with entity information
+     * for points that fall within the data area.
+     *
+     * @param g2  the graphics device.
+     * @param plot  the plot (can be used to obtain standard color
+     *              information etc).
+     * @param domainAxis  the domain axis.
+     * @param dataArea  the area within which the data is being drawn.
+     * @param rangeAxis  the range axis.
+     * @param dataset  the dataset.
+     * @param pass  the pass.
+     * @param series  the series index (zero-based).
+     * @param item  the item index (zero-based).
+     * @param crosshairState  the crosshair state.
+     * @param entities the entity collection.
+     */
+    protected void drawSecondaryPass(Graphics2D g2, XYPlot plot,
+            XYDataset dataset, int pass, int series, int item,
+            ValueAxis domainAxis, Rectangle2D dataArea,
+            ValueAxis rangeAxis, CrosshairState crosshairState,
+            EntityCollection entities) {
+        // super.drawSecondaryPass(g2, plot, dataset, pass, series, item,
+        // domainAxis, dataArea, rangeAxis, crosshairState, entities);
+    }
+
+    /**
+     * Updates the control points.
+     *
+     * @param point0
+     * @param point1
+     * @param point2
+     * @param point3
+     * @param control1
+     * @param control2
+     * @param smooth
+     */
+    public static void getControlPoints(Point2D.Double point0,
+            Point2D.Double point1, Point2D.Double point2,
+            Point2D.Double point3, Point2D.Double control1,
+            Point2D.Double control2, double smooth) {
+
+        // Reference: http://www.antigrain.com/research/bezier_interpolation/
+
+        if (point0 == null) point0 = point1; //new Point2D.Double(0, 0);
+        if (point3 == null) point3 = point2; //new Point2D.Double(0, 0);
+
+        Point2D.Double c1 = new Point2D.Double(
+               (point0.x + point1.x) / 2.0, (point0.y + point1.y) / 2.0);
+        Point2D.Double c2 = new Point2D.Double(
+               (point1.x + point2.x) / 2.0, (point1.y + point2.y) / 2.0);
+        Point2D.Double c3 = new Point2D.Double(
+               (point2.x + point3.x) / 2.0, (point2.y + point3.y) / 2.0);
+
+        double len1 = point1.distance(point0);
+        double len2 = point2.distance(point1);
+        double len3 = point3.distance(point2);
+
+        double k1 = len1 / (len1 + len2);
+        double k2 = len2 / (len2 + len3);
+
+        Point2D.Double m1 = new Point2D.Double(
+               c1.x + (c2.x - c1.x) * k1, c1.y + (c2.y - c1.y) * k1);
+        Point2D.Double m2 = new Point2D.Double(
+               c2.x + (c3.x - c2.x) * k2, c2.y + (c3.y - c2.y) * k2);
+
+        control1.setLocation(new Point2D.Double(
+               m1.x + (c2.x - m1.x) * smooth + point1.x - m1.x,
+               m1.y + (c2.y - m1.y) * smooth + point1.y - m1.y));
+        control2.setLocation(new Point2D.Double(
+               m2.x + (c2.x - m2.x) * smooth + point2.x - m2.x,
+               m2.y + (c2.y - m2.y) * smooth + point2.y - m2.y));
+    }
+
+    /**
+     * Returns the points for a bezier curve.
+     *
+     * @param point0
+     * @param point1
+     * @param point2
+     * @param point3
+     * @param smooth
+     * @param steps
+     *
+     * @return The curve points.
+     */
+    public static Point2D.Double[] getBezierCurve(Point2D.Double point0,
+            Point2D.Double point1, Point2D.Double point2,
+            Point2D.Double point3, double smooth, int steps) {
+        Point2D.Double control1 = new Point2D.Double();
+        Point2D.Double control2 = new Point2D.Double();
+
+        getControlPoints(point0, point1, point2, point3, control1, control2,
+                smooth);
+
+        Point2D.Double C = new Point2D.Double(
+               3 * (control1.x - point1.x), 3 * (control1.y - point1.y));
+        Point2D.Double B = new Point2D.Double(3 * (control2.x - control1.x)
+                - C.x, 3 * (control2.y - control1.y) - C.y);
+        Point2D.Double A = new Point2D.Double(point2.x - point1.x - C.x - B.x,
+                point2.y - point1.y - C.y - B.y);
+
+        Point2D.Double[] res = new Point2D.Double[steps + 1];
+        double stepSize = 1.0 / steps;
+        double step = stepSize;
+
+        res[0] = point1;
+        for (int i = 1; i < steps; i++) {
+            res[i] = new Point2D.Double(A.x * Math.pow(step, 3) + B.x
+                    * Math.pow(step, 2) + C.x * step + point1.x, A.y
+                    * Math.pow(step, 3) + B.y * Math.pow(step, 2) + C.y * step
+                    + point1.y);
+            //System.out.println(step + " : " + res[i]);
+            step += stepSize;
+        }
+        res[steps] = point2;
+
+        return res;
+    }
+
+}

main/plugins/org.talend.libraries.jfreechart.jars/lib_src/jfreechart-1.0.12/source/org/jfree/chart/ChartColor.java

@@ -0,0 +1,189 @@
+/* ===========================================================
+ * JFreeChart : a free chart library for the Java(tm) platform
+ * ===========================================================
+ *
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
+ *
+ * Project Info:  http://www.jfree.org/jfreechart/index.html
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * ---------------
+ * ChartColor.java
+ * ---------------
+ * (C) Copyright 2003-2008, by Cameron Riley and Contributors.
+ *
+ * Original Author:  Cameron Riley;
+ * Contributor(s):   David Gilbert (for Object Refinery Limited);
+ *
+ * Changes
+ * -------
+ * 23-Jan-2003 : Version 1, contributed by Cameron Riley (DG);
+ * 25-Nov-2004 : Changed first 7 colors to softer shades (DG);
+ * 03-Nov-2005 : Removed orange color, too close to yellow - see bug
+ *               report 1328408 (DG);
+ * ------------- JFREECHART 1.0.x ---------------------------------------------
+ * 02-Feb-2007 : Removed author tags all over JFreeChart sources (DG);
+ *
+ */
+
+package org.jfree.chart;
+
+import java.awt.Color;
+import java.awt.Paint;
+
+/**
+ * Class to extend the number of Colors available to the charts. This
+ * extends the java.awt.Color object and extends the number of final
+ * Colors publically accessible.
+ */
+public class ChartColor extends Color {
+
+    /** A very dark red color. */
+    public static final Color VERY_DARK_RED = new Color(0x80, 0x00, 0x00);
+
+    /** A dark red color. */
+    public static final Color DARK_RED = new Color(0xc0, 0x00, 0x00);
+
+    /** A light red color. */
+    public static final Color LIGHT_RED = new Color(0xFF, 0x40, 0x40);
+
+    /** A very light red color. */
+    public static final Color VERY_LIGHT_RED = new Color(0xFF, 0x80, 0x80);
+
+    /** A very dark yellow color. */
+    public static final Color VERY_DARK_YELLOW = new Color(0x80, 0x80, 0x00);
+
+    /** A dark yellow color. */
+    public static final Color DARK_YELLOW = new Color(0xC0, 0xC0, 0x00);
+
+    /** A light yellow color. */
+    public static final Color LIGHT_YELLOW = new Color(0xFF, 0xFF, 0x40);
+
+    /** A very light yellow color. */
+    public static final Color VERY_LIGHT_YELLOW = new Color(0xFF, 0xFF, 0x80);
+
+    /** A very dark green color. */
+    public static final Color VERY_DARK_GREEN = new Color(0x00, 0x80, 0x00);
+
+    /** A dark green color. */
+    public static final Color DARK_GREEN = new Color(0x00, 0xC0, 0x00);
+
+    /** A light green color. */
+    public static final Color LIGHT_GREEN = new Color(0x40, 0xFF, 0x40);
+
+    /** A very light green color. */
+    public static final Color VERY_LIGHT_GREEN = new Color(0x80, 0xFF, 0x80);
+
+    /** A very dark cyan color. */
+    public static final Color VERY_DARK_CYAN = new Color(0x00, 0x80, 0x80);
+
+    /** A dark cyan color. */
+    public static final Color DARK_CYAN = new Color(0x00, 0xC0, 0xC0);
+
+    /** A light cyan color. */
+    public static final Color LIGHT_CYAN = new Color(0x40, 0xFF, 0xFF);
+
+    /** Aa very light cyan color. */
+    public static final Color VERY_LIGHT_CYAN = new Color(0x80, 0xFF, 0xFF);
+
+    /** A very dark blue color. */
+    public static final Color VERY_DARK_BLUE = new Color(0x00, 0x00, 0x80);
+
+    /** A dark blue color. */
+    public static final Color DARK_BLUE = new Color(0x00, 0x00, 0xC0);
+
+    /** A light blue color. */
+    public static final Color LIGHT_BLUE = new Color(0x40, 0x40, 0xFF);
+
+    /** A very light blue color. */
+    public static final Color VERY_LIGHT_BLUE = new Color(0x80, 0x80, 0xFF);
+
+    /** A very dark magenta/purple color. */
+    public static final Color VERY_DARK_MAGENTA = new Color(0x80, 0x00, 0x80);
+
+    /** A dark magenta color. */
+    public static final Color DARK_MAGENTA = new Color(0xC0, 0x00, 0xC0);
+
+    /** A light magenta color. */
+    public static final Color LIGHT_MAGENTA = new Color(0xFF, 0x40, 0xFF);
+
+    /** A very light magenta color. */
+    public static final Color VERY_LIGHT_MAGENTA = new Color(0xFF, 0x80, 0xFF);
+
+    /**
+     * Creates a Color with an opaque sRGB with red, green and blue values in
+     * range 0-255.
+     *
+     * @param r  the red component in range 0x00-0xFF.
+     * @param g  the green component in range 0x00-0xFF.
+     * @param b  the blue component in range 0x00-0xFF.
+     */
+    public ChartColor(int r, int g, int b) {
+        super(r, g, b);
+    }
+
+    /**
+     * Convenience method to return an array of <code>Paint</code> objects that
+     * represent the pre-defined colors in the <code>Color<code> and
+     * <code>ChartColor</code> objects.
+     *
+     * @return An array of objects with the <code>Paint</code> interface.
+     */
+    public static Paint[] createDefaultPaintArray() {
+
+        return new Paint[] {
+            new Color(0xFF, 0x55, 0x55),
+            new Color(0x55, 0x55, 0xFF),
+            new Color(0x55, 0xFF, 0x55),
+            new Color(0xFF, 0xFF, 0x55),
+            new Color(0xFF, 0x55, 0xFF),
+            new Color(0x55, 0xFF, 0xFF),
+            Color.pink,
+            Color.gray,
+            ChartColor.DARK_RED,
+            ChartColor.DARK_BLUE,
+            ChartColor.DARK_GREEN,
+            ChartColor.DARK_YELLOW,
+            ChartColor.DARK_MAGENTA,
+            ChartColor.DARK_CYAN,
+            Color.darkGray,
+            ChartColor.LIGHT_RED,
+            ChartColor.LIGHT_BLUE,
+            ChartColor.LIGHT_GREEN,
+            ChartColor.LIGHT_YELLOW,
+            ChartColor.LIGHT_MAGENTA,
+            ChartColor.LIGHT_CYAN,
+            Color.lightGray,
+            ChartColor.VERY_DARK_RED,
+            ChartColor.VERY_DARK_BLUE,
+            ChartColor.VERY_DARK_GREEN,
+            ChartColor.VERY_DARK_YELLOW,
+            ChartColor.VERY_DARK_MAGENTA,
+            ChartColor.VERY_DARK_CYAN,
+            ChartColor.VERY_LIGHT_RED,
+            ChartColor.VERY_LIGHT_BLUE,
+            ChartColor.VERY_LIGHT_GREEN,
+            ChartColor.VERY_LIGHT_YELLOW,
+            ChartColor.VERY_LIGHT_MAGENTA,
+            ChartColor.VERY_LIGHT_CYAN
+        };
+    }
+
+}

main/plugins/org.talend.libraries.jfreechart.jars/lib_src/jfreechart-1.0.12/source/org/jfree/chart/ChartFrame.java

@@ -0,0 +1,96 @@
+/* ===========================================================
+ * JFreeChart : a free chart library for the Java(tm) platform
+ * ===========================================================
+ *
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
+ *
+ * Project Info:  http://www.jfree.org/jfreechart/index.html
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * in the United States and other countries.]
+ *
+ * ---------------
+ * ChartFrame.java
+ * ---------------
+ * (C) Copyright 2001-2008, by Object Refinery Limited and Contributors.
+ *
+ * Original Author:  David Gilbert (for Object Refinery Limited);
+ * Contributor(s):   -;
+ *
+ * Changes
+ * -------
+ * 22-Nov-2001 : Version 1 (DG);
+ * 08-Jan-2001 : Added chartPanel attribute (DG);
+ * 24-May-2002 : Renamed JFreeChartFrame --> ChartFrame (DG);
+ *
+ */
+
+package org.jfree.chart;
+
+import javax.swing.JFrame;
+import javax.swing.JScrollPane;
+import javax.swing.WindowConstants;
+
+/**
+ * A frame for displaying a chart.
+ */
+public class ChartFrame extends JFrame {
+
+    /** The chart panel. */
+    private ChartPanel chartPanel;
+
+    /**
+     * Constructs a frame for a chart.
+     *
+     * @param title  the frame title.
+     * @param chart  the chart.
+     */
+    public ChartFrame(String title, JFreeChart chart) {
+        this(title, chart, false);
+    }
+
+    /**
+     * Constructs a frame for a chart.
+     *
+     * @param title  the frame title.
+     * @param chart  the chart.
+     * @param scrollPane  if <code>true</code>, put the Chart(Panel) into a
+     *                    JScrollPane.
+     */
+    public ChartFrame(String title, JFreeChart chart, boolean scrollPane) {
+        super(title);
+        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        this.chartPanel = new ChartPanel(chart);
+        if (scrollPane) {
+            setContentPane(new JScrollPane(this.chartPanel));
+        }
+        else {
+            setContentPane(this.chartPanel);
+        }
+    }
+
+    /**
+     * Returns the chart panel for the frame.
+     *
+     * @return The chart panel.
+     */
+    public ChartPanel getChartPanel() {
+        return this.chartPanel;
+    }
+
+}