feature(TUP-24029):[FTP] Connection wizard add timeout property #2684

This reverts commit 992e01de37.

main/features/org.talend.utils.feature/feature.xml

@@ -20,8 +20,10 @@
     <import plugin="org.apache.servicemix.bundles.avro" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.junit" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.commons.configuration" version="2.0.0" match="greaterOrEqual"/>
   </requires>  
   <plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.daikon.crypto.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>

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

@@ -136,3 +136,4 @@ ArchiveDirectoryChooser.DataTransfer_browse=B&rowse...
 ArchiveDirectoryChooser.WizardProjectsImportPage_ArchiveSelectTitle=Select &archive file:
 ArchiveDirectoryChooser.FileExport_selectDestinationMessage=Select a directory to export to.
 ArchiveDirectoryChooser.ArchiveExport_description=Export resources to an archive file on the local file system.
+DisplayUtils.NotSupportedExceptionOnLinux=Linux/Unit doesn't support multiple display.

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/gmf/util/DisplayUtils.java

@@ -20,6 +20,8 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.ui.i18n.Messages;
+import org.talend.commons.utils.system.EnvironmentUtils;
 
 /**
  * Utility methods to work with Display object
@@ -128,6 +130,13 @@ public class DisplayUtils {
     }
 
     public static void syncExecInNewUIThread(Runnable runnable, DeviceData deviceData) throws Exception {
+        /**
+         * Linux doesn't allow creating a display instance in a new thread after upgrading eclipse platform 4.10, we can
+         * remove this check if future eclipse version support it again
+         */
+        if (EnvironmentUtils.isLinuxUnixSystem()) {
+            throw new UnsupportedOperationException(Messages.getString("DisplayUtils.NotSupportedExceptionOnLinux"));//$NON-NLS-1$
+        }
         final Semaphore semaphore = new Semaphore(1, true);
         semaphore.acquire();
         Thread thread = new Thread(new Runnable() {

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/drawing/background/BackgroundRefresher.java

@@ -22,6 +22,7 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.ScrollBar;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Tree;
@@ -111,7 +112,7 @@ public class BackgroundRefresher implements IBackgroundRefresher {
              */
             @Override
             protected void execute(final boolean isFinalExecution, Object data) {
-                drawableComposite.getBgDrawableComposite().getDisplay().syncExec(new Runnable() {
+                Display.getDefault().syncExec(new Runnable() {
 
                     public void run() {
                         if (isFinalExecution) {
@@ -339,7 +340,7 @@ public class BackgroundRefresher implements IBackgroundRefresher {
             }
             if ((WindowSystem.isGTK() || EnvironmentUtils.isMacOsSytem()) && child instanceof Tree) {
                 returnedPoint.y += ((Tree) child).getHeaderHeight();
-                returnedPoint.y += ((Table) child).getItemHeight();
+                returnedPoint.y += ((Tree) child).getItemHeight();
             }
             child = child.getParent();
             ScrollBar vScrollBar = child.getVerticalBar();

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/linking/TreeToTablesLinker.java

@@ -33,6 +33,7 @@ import org.eclipse.swt.widgets.TreeItem;
 import org.talend.commons.ui.runtime.i18n.Messages;
 import org.talend.commons.ui.runtime.utils.TableUtils;
 import org.talend.commons.ui.runtime.ws.WindowSystem;
+import org.talend.commons.ui.swt.advanced.dataeditor.AbstractDataTableEditorView;
 import org.talend.commons.ui.swt.drawing.background.IBackgroundRefresher;
 import org.talend.commons.ui.swt.drawing.background.IBgDrawableComposite;
 import org.talend.commons.ui.swt.drawing.link.BezierHorizontalLink;
@@ -464,4 +465,19 @@ public class TreeToTablesLinker<D1, D2> extends BgDrawableComposite implements I
         }
     }
 
+    protected <B> void loadItemDataForLazyLoad(AbstractDataTableEditorView<B> tableEditorView) {
+        if (!tableEditorView.getTableViewerCreator().isLazyLoad()) {
+            return;
+        }
+        List<B> beansList = tableEditorView.getExtendedTableModel().getBeansList();
+        Table table = tableEditorView.getTable();
+        for (TableItem tableItem : table.getItems()) {
+            if (tableItem.getData() == null) {
+                int index = table.indexOf(tableItem);
+                B schemaTarget = beansList.get(index);
+                tableItem.setData(schemaTarget);
+            }
+        }
+    }
+
 }

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

@@ -212,4 +212,5 @@ RenameFolderAction.warning.cannotFind.message=Cannot rename folder, it may have
 RenameFolderAction.warning.cannotFind.title=Action not available
 
 ConvertJobsUtil.warning.title=Warning
-ConvertJobsUtil.warning.message=The target framework is not fully supported for this release.
+ConvertJobsUtil.warning.message=The target framework is not fully supported for this release.
+SyncLibrariesLoginTask.createStatsLogAndImplicitParamter=Create stats log and implicit parameters

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/logintask/SyncLibrariesLoginTask.java

@@ -2,12 +2,25 @@ package org.talend.core.repository.logintask;
 
 import java.lang.reflect.InvocationTargetException;
 
+import org.eclipse.core.resources.IResourceRuleFactory;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.exception.LoginException;
+import org.talend.commons.exception.PersistenceException;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ICoreService;
+import org.talend.core.repository.i18n.Messages;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
+import org.talend.core.repository.utils.ProjectDataJsonProvider;
 import org.talend.login.AbstractLoginTask;
 import org.talend.repository.ProjectManager;
+import org.talend.repository.RepositoryWorkUnit;
 
 public class SyncLibrariesLoginTask extends AbstractLoginTask implements IRunnableWithProgress {
 
@@ -20,7 +33,38 @@ public class SyncLibrariesLoginTask extends AbstractLoginTask implements IRunnab
 
     @Override
     public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-        coreService.createStatsLogAndImplicitParamter(ProjectManager.getInstance().getCurrentProject());
+        try {
+            if (ProjectDataJsonProvider.hasFilledProjectSettingFile(ProjectManager.getInstance().getCurrentProject())) {
+                return;
+            }
+        } catch (PersistenceException e1) {
+            ExceptionHandler.process(e1);
+            return;
+        }
+        ProxyRepositoryFactory.getInstance().executeRepositoryWorkUnit(
+                new RepositoryWorkUnit<Void>(Messages.getString("SyncLibrariesLoginTask.createStatsLogAndImplicitParamter")) {
+
+                    @Override
+                    protected void run() throws LoginException, PersistenceException {
+                        try {
+                            IWorkspace workspace = ResourcesPlugin.getWorkspace();
+                            IResourceRuleFactory ruleFactory = workspace.getRuleFactory();
+                            ProjectManager projectManager = ProjectManager.getInstance();
+                            ISchedulingRule refreshRule = ruleFactory.refreshRule(
+                                    projectManager.getResourceProject(projectManager.getCurrentProject().getEmfProject()));
+                            workspace.run(new IWorkspaceRunnable() {
+
+                                @Override
+                                public void run(IProgressMonitor monitor) throws CoreException {
+                                    coreService
+                                            .createStatsLogAndImplicitParamter(ProjectManager.getInstance().getCurrentProject());
+                                }
+                            }, refreshRule, IWorkspace.AVOID_UPDATE, monitor);
+                        } catch (Exception e) {
+                            ExceptionHandler.process(e);
+                        }
+                    }
+                });
     }
 
 }

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

@@ -406,6 +406,38 @@ public class ProjectDataJsonProvider {
         return null;
     }
 
+    public static boolean hasFilledProjectSettingFile(org.talend.core.model.general.Project project) throws PersistenceException {
+        FileInputStream InputStream = null;
+        boolean hasFilled = false;
+        try {
+            IProject physProject = ResourceUtils.getProject(project);
+            IPath location = physProject.getLocation();
+            File file = ProjectDataJsonProvider.getLoadingConfigurationFile(location, FileConstants.PROJECTSETTING_FILE_NAME);
+            if (file != null && file.exists()) {
+                InputStream = new FileInputStream(file);
+                ProjectSettings projectSetting = new ObjectMapper().readValue(new FileInputStream(file), ProjectSettings.class);
+                if (projectSetting != null) {
+                    ImplicitContextSettingJson implicitContextSettingJson = projectSetting.getImplicitContextSettingJson();
+                    if (implicitContextSettingJson != null) {
+                        ParametersTypeJson parametersTypeJson = implicitContextSettingJson.getParametersTypeJson();
+                        if (parametersTypeJson != null) {
+                            List<ElementParameterTypeJson> elementParameters = parametersTypeJson.getElementParameters();
+                            if (elementParameters.size() > 0) {
+                                hasFilled = true;
+                            }
+                        }
+
+                    }
+                }
+            }
+        } catch (Exception e1) {
+            throw new PersistenceException(e1);
+        } finally {
+            closeInputStream(InputStream);
+        }
+        return hasFilled;
+    }
+
     protected static ImplicitContextSettingJson getImplicitContextSettingJson(ImplicitContextSettings implicitContextSettings) {
         if (implicitContextSettings != null) {
             ImplicitContextSettingJson implicitContextSettingJson = new ImplicitContextSettingJson(implicitContextSettings);

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

@@ -131,4 +131,22 @@ public class ProjectHelper {
         }
         return null;
     }
+
+    /**
+     * define the different value for the project types the string value in the licence files Matcht the java enum name
+     * this is a copy of org.talend.commons.model.KeyConstants.ProjectType to avoid adding the all library
+     *
+     */
+    public static enum ProjectType {
+        DI,
+        DQ,
+        MDM;
+    }
+
+    public static int getProjectTypeOrdinal(org.talend.core.model.properties.Project project) {
+        if (project != null && project.getType() != null) {
+            return ProjectType.valueOf(project.getType()).ordinal();
+        }
+        return 0;
+    }
 }

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

@@ -12,11 +12,14 @@
 // ============================================================================
 package org.talend.core;
 
+import java.util.List;
+
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPart;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.process.IProcess;
 import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.utils.IXSDPopulationUtil;
@@ -47,6 +50,8 @@ public interface IESBService extends IService {
 
     public StringBuffer getAllTheJObNames(IRepositoryNode jobList);
 
+    public List<String> getSerivceRelatedJobIds(Item serviceItem);
+
     public void deleteOldRelation(String jobID);
 
     // public void setSelectedItem(Item, )
@@ -59,6 +64,8 @@ public interface IESBService extends IService {
 
     public void copyDataServiceRelateJob(Item newItem);
 
+    public boolean isRESTService(ProcessItem processItem);
+
     public IXSDPopulationUtil getXSDPopulationUtil();
 
     public boolean isWSDLEditor(IWorkbenchPart part);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/classloader/ClassLoaderFactory.java

@@ -316,7 +316,7 @@ public class ClassLoaderFactory {
             String jarsStr = (String) metadataConn.getParameter(ConnParameterKeys.CONN_PARA_KEY_HADOOP_CUSTOM_JARS);
             moduleList = jarsStr.split(";"); //$NON-NLS-1$
         } else {
-            String index = getDistributionIndex(metadataConn); //$NON-NLS-1$
+            String index = getDistributionIndex(metadataConn); 
             moduleList = getDriverModuleList(index);
         }
         return moduleList;
@@ -365,39 +365,41 @@ public class ClassLoaderFactory {
         return hdClassLoader;
     }
 
-    private static synchronized IConfigurationElement[] getConfigurationElements() {
-        if (isCacheChanged()) {
-            IExtensionRegistry registry = Platform.getExtensionRegistry();
-            configurationElements = registry.getConfigurationElementsFor(EXTENSION_POINT_ID);
-        }
+    private static IConfigurationElement[] getConfigurationElements() {
+        checkCache();
         return configurationElements;
     }
 
-    private static boolean isCacheChanged() {
-        if (classLoadersMap == null) {
-            return true;
-        }
-        if (configurationElements == null) {
-            return true;
-        }
+    private synchronized static void checkCache() {
+        boolean isCacheChanged = false;
         if (configurationElements != null) {
             for (IConfigurationElement configElement : configurationElements) {
                 if (!configElement.isValid()) {
-                    return true;
+                    isCacheChanged = true;
                 }
             }
         }
-        if (cacheVersion != null && !cacheVersion.equals(BigDataBasicUtil.getDynamicDistributionCacheVersion())) {
-            return true;
+        if (!StringUtils.equals(cacheVersion, BigDataBasicUtil.getDynamicDistributionCacheVersion())) {
+            isCacheChanged = true;
+        }
+        if (isCacheChanged) {
+            init();
+            IExtensionRegistry registry = Platform.getExtensionRegistry();
+            configurationElements = registry.getConfigurationElementsFor(EXTENSION_POINT_ID);
+            cacheVersion = BigDataBasicUtil.getDynamicDistributionCacheVersion();
+        } else {
+            if (classLoadersMap == null) {
+                init();
+            }
+            if (configurationElements == null) {
+                IExtensionRegistry registry = Platform.getExtensionRegistry();
+                configurationElements = registry.getConfigurationElementsFor(EXTENSION_POINT_ID);
+            }
         }
-        return false;
     }
 
     private static Map<String, DynamicClassLoader> getClassLoaderMap() {
-        if (isCacheChanged()) {
-            init();
-            cacheVersion = BigDataBasicUtil.getDynamicDistributionCacheVersion();
-        }
+        checkCache();
         return classLoadersMap;
     }
 }

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

@@ -107,7 +107,7 @@ public enum EDatabaseVersion4Drivers {
 
     PLUSPSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL,
             "Prior to v9", "PRIOR_TO_V9", "postgresql-8.4-703.jdbc4.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9.X", "V9_X", "postgresql-9.4-1201.jdbc41.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9 and later", "V9_X", "postgresql-9.4-1201.jdbc41.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     IBMDB2(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
             "db2jcc_license_cisuz.jar" })), //$NON-NLS-1$
     IBMDB2ZOS(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2ZOS, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
@@ -164,9 +164,9 @@ public enum EDatabaseVersion4Drivers {
     MAPRDB(new DbVersion4Drivers(EDatabaseTypeName.MAPRDB, new String[] {})),
 
     REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "redshift", "REDSHIFT", //$NON-NLS-1$ //$NON-NLS-2$
-            "redshift-jdbc42-no-awssdk-1.2.20.1043.jar")), //$NON-NLS-1$
+            "redshift-jdbc42-no-awssdk-1.2.32.1056.jar")), //$NON-NLS-1$
     REDSHIFT_SSO(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT_SSO, "redshift sso", "REDSHIFT_SSO", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "redshift-jdbc42-no-awssdk-1.2.20.1043.jar", "aws-java-sdk-1.11.406.jar", "jackson-core-2.9.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            new String[] { "redshift-jdbc42-no-awssdk-1.2.32.1056.jar", "aws-java-sdk-1.11.406.jar", "jackson-core-2.9.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                     "jackson-databind-2.9.5.jar", "jackson-annotations-2.9.0.jar", "httpcore-4.4.9.jar", "httpclient-4.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
                     "joda-time-2.8.1.jar", "commons-logging-1.1.3.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
 

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

@@ -98,6 +98,15 @@ public class JobContext implements IContext, Cloneable {
         return true;
     }
 
+    public boolean containsSameParameterIgnoreCase(String parameterName) {
+        for (IContextParameter contextParam : contextParameterList) {
+            if (contextParam.getName() != null && contextParam.getName().equalsIgnoreCase(parameterName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Commented by Marvin Wang on Mar.2, 2012, the user who invokes the method should notice that if the
      * <code>JobContext</code> has more than one <code>ContextParameter</code>s which names are same, this case will

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

@@ -153,7 +153,7 @@ public class MetadataTable implements IMetadataTable, Cloneable {
             List<IMetadataColumn> temp = new ArrayList<IMetadataColumn>();
             temp.addAll(this.listColumns);
             temp.addAll(this.unusedColumns);
-            if (originalColumns != null) {
+            if (originalColumns != null && isRepository) {
                 Collections.sort(temp, new Comparator<IMetadataColumn>() {
 
                     @Override

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

@@ -585,11 +585,6 @@ public final class MetadataToolHelper {
 
     public static void copyTable(IMetadataTable source, IMetadataTable target, String targetDbms,
             boolean avoidUsedColumnsFromInput) {
-        copyTable(source, target, targetDbms, avoidUsedColumnsFromInput, false);
-    }
-
-    public static void copyTable(IMetadataTable source, IMetadataTable target, String targetDbms,
-            boolean avoidUsedColumnsFromInput, boolean withCustoms) {
         if (source == null || target == null) {
             return;
         }
@@ -609,7 +604,7 @@ public final class MetadataToolHelper {
         List<IMetadataColumn> columnsTAdd = new ArrayList<IMetadataColumn>();
         for (IMetadataColumn column : source.getListColumns(!avoidUsedColumnsFromInput)) {
             IMetadataColumn targetColumn = target.getColumn(column.getLabel());
-            IMetadataColumn newTargetColumn = column.clone(withCustoms);
+            IMetadataColumn newTargetColumn = column.clone();
             if (targetColumn == null) {
                 columnsTAdd.add(newTargetColumn);
                 newTargetColumn
@@ -674,7 +669,7 @@ public final class MetadataToolHelper {
     	List<IMetadataColumn> targetColumns = target.getListColumns();
     	List<String> temp = new ArrayList<String>(tColumns);
     	if (targetColumns != null) {
-    		List<String> columnNames = new ArrayList<String>();
+            final List<String> columnNames = new ArrayList<String>();
         	for(IMetadataColumn column : targetColumns){
         		columnNames.add(column.getLabel());
         	}

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

@@ -93,10 +93,10 @@ public class ComponentToRepositoryProperty {
         // impossible to use OCI in oracle
         IElementParameter elementParameter = node.getElementParameter("CONNECTION_TYPE"); //$NON-NLS-1$
         if (elementParameter != null) {
-            if ("ORACLE_OCI".equals(elementParameter.getValue())) { //$NON-NLS-1$
+            if ("ORACLE_WALLET".equals(elementParameter.getValue())) { //$NON-NLS-1$
                 Shell shell = Display.getCurrent().getActiveShell();
                 String title = Messages.getString("ComponentToRepositoryProperty.error"); //$NON-NLS-1$
-                String message = Messages.getString("ComponentToRepositoryProperty.ImpossibleUseOCI"); //$NON-NLS-1$
+                String message = Messages.getString("ComponentToRepositoryProperty.ImpossibleUseWALLET"); //$NON-NLS-1$
                 MessageDialog.openError(shell, title, message);
                 return false;
             }
@@ -503,6 +503,10 @@ public class ComponentToRepositoryProperty {
             parameter = node.getElementParameter("CONNECTION_TYPE"); //$NON-NLS-1$
             // if ("ORACLE_OCI".equals(parameter.getValue())) {
             // }
+            if ("ORACLE_OCI".equals(parameter.getValue())) {
+                connection.setDatabaseType(EDatabaseTypeName.ORACLE_OCI.getDisplayName());
+                connection.setProductId(EDatabaseTypeName.ORACLE_OCI.getProduct());
+            }
 
             if ("ORACLE_SERVICE_NAME".equals(parameter.getValue()) || "service_name".equals(parameter.getValue())) { //$NON-NLS-1$ //$NON-NLS-2$
                 connection.setDatabaseType(EDatabaseTypeName.ORACLESN.getDisplayName());
@@ -510,7 +514,8 @@ public class ComponentToRepositoryProperty {
             } else if ("ORACLE_SID".equals(parameter.getValue()) || "sid".equals(parameter.getValue())) { //$NON-NLS-1$  //$NON-NLS-2$
                 connection.setDatabaseType(EDatabaseTypeName.ORACLEFORSID.getDisplayName());
                 connection.setProductId(EDatabaseTypeName.ORACLESN.getProduct());
-            } else if ("ORACLE_CUSTOM".equals(parameter.getValue()) || "rac".equals(parameter.getValue())) { //$NON-NLS-1$  //$NON-NLS-2$
+            } else if ("ORACLE_CUSTOM".equals(parameter.getValue()) || "rac".equals(parameter.getValue()) //$NON-NLS-1$ //$NON-NLS-2$
+                    || "ORACLE_RAC".equals(parameter.getValue())) {
                 connection.setDatabaseType(EDatabaseTypeName.ORACLE_CUSTOM.getDisplayName());
                 connection.setProductId(EDatabaseTypeName.ORACLESN.getProduct());
             }
@@ -668,6 +673,12 @@ public class ComponentToRepositoryProperty {
         if (connection.getDatabaseType().equals(EDatabaseTypeName.ORACLESN.getDisplayName())) {
             setDatabaseValueForOracleSeverName(connection, node, param);
         }
+        if (connection.getDatabaseType().equals(EDatabaseTypeName.ORACLE_CUSTOM.getDisplayName())) {
+            setDatabaseValueForOracleCustom(connection, node, param);
+        }
+        if (connection.getDatabaseType().equals(EDatabaseTypeName.ORACLE_OCI.getDisplayName())) {
+            setDatabaseValueForOracleOci(connection, node, param);
+        }
         if (connection.getDatabaseType().equals(EDatabaseTypeName.ACCESS.getDisplayName())) {
             setDatabaseValueForAccess(connection, node, param);
         }
@@ -683,6 +694,9 @@ public class ComponentToRepositoryProperty {
         if (connection.getDatabaseType().equals(EDatabaseTypeName.PSQL.getDisplayName())) {
             setDatabaseValueForPSQL(connection, node, param);
         }
+        if (connection.getDatabaseType().equals(EDatabaseTypeName.PLUSPSQL.getDisplayName())) {
+            setDatabaseValueForPLUSPSQL(connection, node, param);
+        }
         if (connection.getDatabaseType().equals(EDatabaseTypeName.SYBASEASE.getDisplayName())
                 || connection.getDatabaseType().equals(EDatabaseTypeName.SYBASEIQ.getDisplayName())) {
             setDatabaseValueForSysbase(connection, node, param);
@@ -699,6 +713,11 @@ public class ComponentToRepositoryProperty {
         if (connection.getDatabaseType().equals(EDatabaseTypeName.GENERAL_JDBC.getDisplayName())) {
             setDatabaseValueForJdbc(connection, node, param);
         }
+
+        if (connection.getDatabaseType().equals(EDatabaseTypeName.MSSQL.getDisplayName())) {
+            setDatabaseValueForMSSql(connection, node, param);
+        }
+
     }
 
     /**
@@ -756,6 +775,53 @@ public class ComponentToRepositoryProperty {
         }
     }
 
+    private static void setDatabaseValueForOracleCustom(DatabaseConnection connection, INode node, IElementParameter param) {
+
+        if ("DB_VERSION".equals(param.getRepositoryValue())) { //$NON-NLS-1$
+            String value = getParameterValue(connection, node, param);
+            String dbVersionName = EDatabaseVersion4Drivers.getDbVersionName(EDatabaseTypeName.ORACLE_CUSTOM, value);
+            if (value != null) {
+                connection.setDbVersionString(dbVersionName);
+            }
+        }
+        if ("SID".equals(param.getRepositoryValue())) { //$NON-NLS-1$
+            if (param != null && "ORACLE_OCI".equals(param.getValue())) { //$NON-NLS-1$
+                String value = getParameterValue(connection, node, node.getElementParameter("LOCAL_SERVICE_NAME")); //$NON-NLS-1$
+                if (value != null) {
+                    connection.setSID(value);
+                }
+            } else {
+                String value = getParameterValue(connection, node, node.getElementParameter("DBNAME")); //$NON-NLS-1$
+                if (value != null) {
+                    connection.setSID(value);
+                }
+            }
+        }
+    }
+
+    private static void setDatabaseValueForOracleOci(DatabaseConnection connection, INode node, IElementParameter param) {
+
+        if ("DB_VERSION".equals(param.getRepositoryValue())) { //$NON-NLS-1$
+            String value = getParameterValue(connection, node, param);
+            String dbVersionName = EDatabaseVersion4Drivers.getDbVersionName(EDatabaseTypeName.ORACLE_OCI, value);
+            if (value != null) {
+                connection.setDbVersionString(dbVersionName);
+            }
+        }
+        if ("SID".equals(param.getRepositoryValue())) { //$NON-NLS-1$
+            if (param != null && "ORACLE_OCI".equals(param.getValue())) { //$NON-NLS-1$
+                String value = getParameterValue(connection, node, node.getElementParameter("LOCAL_SERVICE_NAME")); //$NON-NLS-1$
+                if (value != null) {
+                    connection.setSID(value);
+                }
+            } else {
+                String value = getParameterValue(connection, node, node.getElementParameter("DBNAME")); //$NON-NLS-1$
+                if (value != null) {
+                    connection.setSID(value);
+                }
+            }
+        }
+    }
     private static void setDatabaseValueForAs400(DatabaseConnection connection, INode node, IElementParameter param) {
         if ("DB_VERSION".equals(param.getRepositoryValue())) { //$NON-NLS-1$
             String value = getParameterValue(connection, node, param);
@@ -797,6 +863,16 @@ public class ComponentToRepositoryProperty {
             }
         }
     }
+
+    private static void setDatabaseValueForPLUSPSQL(DatabaseConnection connection, INode node, IElementParameter param) {
+        if ("DB_VERSION".equals(param.getRepositoryValue())) { //$NON-NLS-1$
+            String value = getParameterValue(connection, node, param);
+            String dbVersionName = EDatabaseVersion4Drivers.getDbVersionName(EDatabaseTypeName.PLUSPSQL, value);
+            if (value != null) {
+                connection.setDbVersionString(dbVersionName);
+            }
+        }
+    }
     private static void setDatabaseValueForSysbase(DatabaseConnection connection, INode node, IElementParameter param) {
         if ("DB_VERSION".equals(param.getRepositoryValue())) { //$NON-NLS-1$
             String value = getParameterValue(connection, node, param); // $NON-NLS-1$
@@ -806,6 +882,16 @@ public class ComponentToRepositoryProperty {
             }
         }
     }
+
+    private static void setDatabaseValueForMSSql(DatabaseConnection connection, INode node, IElementParameter param) {
+        if ("DRIVER".equals(param.getRepositoryValue())) { //$NON-NLS-1$
+            String value = getParameterValue(connection, node, param);
+            String dbVersionName = EDatabaseVersion4Drivers.getDbVersionName(EDatabaseTypeName.MSSQL, value);
+            if (value != null) {
+                connection.setDbVersionString(dbVersionName);
+            }
+        }
+    }
     private static void setDatabaseValueForAccess(DatabaseConnection connection, INode node, IElementParameter param) {
         if ("DB_VERSION".equals(param.getRepositoryValue())) { //$NON-NLS-1$
             String value = getParameterValue(connection, node, param);

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

@@ -1697,6 +1697,11 @@ public class RepositoryToComponentProperty {
                 return "STANDARD";
             }
         }
+        if (value.equals("DBTYPE")) {
+            String repositoryType = connection.getDatabaseType();
+            EDatabaseTypeName typeFromDbType = EDatabaseTypeName.getTypeFromDbType(repositoryType);
+            return typeFromDbType.getXMLType();
+        }
 
         return null;
 
@@ -2840,6 +2845,10 @@ public class RepositoryToComponentProperty {
         if (value.equals("USE_ENCODING")) {
             return connection.isUseFileNameEncoding();
         }
+        
+        if(value.equals("CONNECTION_TIMEOUT")) {
+            return connection.getTimeout();
+        }
 
         if (value.equals("ENCODING")) {
             if (isContextMode(connection, connection.getCustomEncode())) {

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

@@ -123,7 +123,8 @@ public enum EParameterFieldType {
     TACOKIT_GUESS_SCHEMA,
     TACOKIT_BUTTON,
     TACOKIT_SUGGESTABLE_TABLE,
-    TACOKIT_VALUE_SELECTION;
+    TACOKIT_VALUE_SELECTION,
+    TACOKIT_TEXT_AREA_SELECTION;
 
     public String getName() {
         return toString();

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

@@ -62,4 +62,6 @@ public interface IContext {
     public IContext clone();
 
     public boolean sameAs(IContext context);
+
+    public boolean containsSameParameterIgnoreCase(String parameterName);
 }

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

@@ -25,6 +25,7 @@ import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.utils.VersionUtils;
 import org.talend.core.GlobalServiceRegister;
+import org.talend.core.IESBService;
 import org.talend.core.ITDQItemService;
 import org.talend.core.PluginChecker;
 import org.talend.core.hadoop.IHadoopClusterService;
@@ -33,7 +34,6 @@ import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.JobletProcessItem;
 import org.talend.core.model.properties.ProcessItem;
-import org.talend.core.model.properties.ProjectReference;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.properties.SQLPatternItem;
 import org.talend.core.model.relationship.Relation;
@@ -904,27 +904,7 @@ public final class ProcessUtils {
                 }
             }
         }
-
-        if (needBeans && GlobalServiceRegister.getDefault().isServiceRegistered(IProxyRepositoryService.class)) {
-            IProxyRepositoryService service = (IProxyRepositoryService) GlobalServiceRegister.getDefault()
-                    .getService(IProxyRepositoryService.class);
-            ERepositoryObjectType beansType = ERepositoryObjectType.valueOf("BEANS"); //$NON-NLS-1$
-            try {
-                IProxyRepositoryFactory factory = service.getProxyRepositoryFactory();
-                List<IRepositoryViewObject> all = factory.getAll(project, beansType);
-                List<ProjectReference> references = ProjectManager.getInstance().getCurrentProject()
-                        .getProjectReferenceList(true);
-                for (ProjectReference ref : references) {
-                    all.addAll(factory.getAll(new Project(ref.getReferencedProject()), beansType));
-                }
-                if (!all.isEmpty()) { // has bean
-                    return true;
-                }
-            } catch (PersistenceException e) {
-                ExceptionHandler.process(e);
-            }
-        }
-        return false;
+        return needBeans && GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class);
     }
 
     public static boolean isRequiredPigUDFs(IProcess process) {

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

@@ -77,21 +77,24 @@ public final class ParameterValueUtil {
                 }
             }
         } else if (param.getValue() instanceof List) { // for TABLE
-            List<Map<String, Object>> tableValues = (List<Map<String, Object>>) param.getValue();
-            for (Map<String, Object> line : tableValues) {
-                for (String key : line.keySet()) {
-                    Object cellValue = line.get(key);
-                    if (cellValue instanceof String) { // cell is text so
-                        // rename data if
-                        // needed
-                        String value = (String) cellValue;
-                        if (value.contains(oldName)) {
-                            // line.put(key, value.replaceAll(oldName,
-                            // newName));
-                            // String newValue = renameValues(value, oldName, newName, flag);
-                            String newValue = splitQueryData(oldName, newName, value);
-                            if (!value.equals(newValue)) {
-                                line.put(key, newValue);
+            List tableValues = (List) param.getValue();
+            for (Object current : tableValues) {
+                if (current != null && current instanceof Map) {
+                    Map<String, Object> line = (Map<String, Object>) current;
+                    for (String key : line.keySet()) {
+                        Object cellValue = line.get(key);
+                        if (cellValue instanceof String) { // cell is text so
+                            // rename data if
+                            // needed
+                            String value = (String) cellValue;
+                            if (value.contains(oldName)) {
+                                // line.put(key, value.replaceAll(oldName,
+                                // newName));
+                                // String newValue = renameValues(value, oldName, newName, flag);
+                                String newValue = splitQueryData(oldName, newName, value);
+                                if (!value.equals(newValue)) {
+                                    line.put(key, newValue);
+                                }
                             }
                         }
                     }
@@ -721,13 +724,22 @@ public final class ParameterValueUtil {
                 return true;
             }
         } else if (param.getValue() instanceof List) { // for TABLE
-            List<Map<String, Object>> tableValues = (List<Map<String, Object>>) param.getValue();
-            for (Map<String, Object> line : tableValues) {
-                for (String key : line.keySet()) {
-                    Object cellValue = line.get(key);
-                    if (cellValue instanceof String) { // cell is text so
-                        // test data
-                        if (ParameterValueUtil.valueContains((String) cellValue, name)) {
+            List tableValues = (List) param.getValue();
+            for (Object current : tableValues) {
+                if (current != null) {
+                    if (current instanceof Map) {
+                        Map<String, Object> line = (Map<String, Object>) current;
+                        for (String key : line.keySet()) {
+                            Object cellValue = line.get(key);
+                            if (cellValue instanceof String) { // cell is text so
+                                // test data
+                                if (ParameterValueUtil.valueContains((String) cellValue, name)) {
+                                    return true;
+                                }
+                            }
+                        }
+                    } else if (current instanceof String) {
+                        if (ParameterValueUtil.valueContains((String) current, name)) {
                             return true;
                         }
                     }

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

@@ -0,0 +1,33 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2019 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.nexus;
+
+import java.io.IOException;
+
+public class ResolverExceptionHandler {
+
+    public static IOException hideCredential(IOException e) {
+        // hide the user/password in the error
+        String regex = "\\://(.+)\\:(.+)@"; //$NON-NLS-1$
+        String message = e.getMessage();
+        message = message.replaceAll(regex, "://"); //$NON-NLS-1$
+        Exception cause = null;
+        if (e.getCause() != null) {
+            String causeMessage = e.getCause().getMessage();
+            causeMessage = causeMessage.replaceAll(regex, "://"); //$NON-NLS-1$
+            cause = new Exception(causeMessage);
+        }
+        return new IOException(message, cause);
+    }
+
+}

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

@@ -101,8 +101,12 @@ public class TalendMavenResolver {
 
     }
 
-    public static File resolve(String mvnUri) throws IOException, RuntimeException {
-        return getMavenResolver().resolve(mvnUri);
+    public static File resolve(String mvnUri) throws IOException {
+        try {
+            return getMavenResolver().resolve(mvnUri);
+        } catch (IOException e) {
+            throw ResolverExceptionHandler.hideCredential(e);
+        }
     }
 
     public static void upload(String groupId, String artifactId, String classifier, String extension, String version,
@@ -110,7 +114,11 @@ public class TalendMavenResolver {
         getMavenResolver().upload(groupId, artifactId, classifier, extension, version, artifact);
     }
 
-    public static MavenResolver getMavenResolver() throws RuntimeException {
+    public static void initMavenResovler() throws RuntimeException {
+        getMavenResolver();
+    }
+
+    private static MavenResolver getMavenResolver() throws RuntimeException {
         if (mavenResolver == null) {
             final BundleContext context = CoreRuntimePlugin.getInstance().getBundle().getBundleContext();
             ServiceReference<org.ops4j.pax.url.mvn.MavenResolver> mavenResolverService = context

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

@@ -23,6 +23,10 @@ public interface IAdditionalInfo {
 
     void onEvent(final String event, final Object... parameters);
 
+    default Object func(final String funcName, final Object... params) throws Exception {
+        throw new UnsupportedOperationException();
+    }
+
     void cloneAddionalInfoTo(final IAdditionalInfo targetAdditionalInfo);
 
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/maven/MavenConstants.java

@@ -42,6 +42,8 @@ public interface MavenConstants {
 
     static final String POM_FILTER = "POM_FILTER";
 
+    static final String USE_PROFILE_MODULE = "USE_PROFILE_MODULE";
+
     /*
      * for lib
      */

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

@@ -19,6 +19,7 @@ import java.util.Set;
 
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.process.JobInfo;
+import org.talend.core.model.process.ProcessUtils;
 
 /**
  * DOC nrousseau class global comment. Detailled comment
@@ -78,7 +79,7 @@ public class LastGenerationInfo {
      * @return the modulesNeededPerJob
      */
     public Set<ModuleNeeded> getModulesNeededWithSubjobPerJob(String jobId, String jobVersion) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion);
         if (!modulesNeededWithSubjobPerJob.containsKey(key)) {
             modulesNeededWithSubjobPerJob.put(key, new HashSet<ModuleNeeded>());
         }
@@ -90,7 +91,7 @@ public class LastGenerationInfo {
      * @return the modulesNeededPerJob
      */
     public Set<ModuleNeeded> getModulesNeededPerJob(String jobId, String jobVersion) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion);
         if (!modulesNeededPerJob.containsKey(key)) {
             modulesNeededPerJob.put(key, new HashSet<ModuleNeeded>());
         }
@@ -103,7 +104,7 @@ public class LastGenerationInfo {
      * @return the contextPerJob
      */
     public Set<String> getContextPerJob(String jobId, String jobVersion) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion);
         if (!contextPerJob.containsKey(key)) {
             contextPerJob.put(key, new HashSet<String>());
         }
@@ -116,7 +117,7 @@ public class LastGenerationInfo {
      * @param modulesNeededPerJob the modulesNeededPerJob to set
      */
     public void setModulesNeededPerJob(String jobId, String jobVersion, Set<ModuleNeeded> modulesNeeded) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion); 
         modulesNeededPerJob.put(key, new HashSet<ModuleNeeded>(modulesNeeded));
     }
 
@@ -125,8 +126,8 @@ public class LastGenerationInfo {
      *
      * @param modulesNeededWithSubjobPerJob the modulesNeededWithSubjobPerJob to set
      */
-    public void setModulesNeededWithSubjobPerJob(String jobId, String jobVersion, Set<ModuleNeeded> modulesNeeded) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+    public void setModulesNeededWithSubjobPerJob(String jobId, String jobVersion, Set<ModuleNeeded> modulesNeeded) {      
+        String key = this.getProcessKey(jobId, jobVersion);
         if (modulesNeeded == null) {
             modulesNeededWithSubjobPerJob.put(key, null);
         } else {
@@ -140,17 +141,17 @@ public class LastGenerationInfo {
      * @param contextPerJob the contextPerJob to set
      */
     public void setContextPerJob(String jobId, String jobVersion, Set<String> contexts) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion); 
         contextPerJob.put(key, new HashSet<String>(contexts));
     }
 
     public void setUseDynamic(String jobId, String jobVersion, boolean dynamic) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion); 
         useDynamic.put(key, dynamic);
     }
 
     public boolean isUseDynamic(String jobId, String jobVersion) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion); 
         if (!useDynamic.containsKey(key)) {
             return false;
         }
@@ -162,12 +163,12 @@ public class LastGenerationInfo {
     }
 
     public void setUseRules(String jobId, String jobVersion, boolean useRules) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion); 
         this.useRules.put(key, useRules);
     }
 
     public boolean isUseRules(String jobId, String jobVersion) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion); 
         if (!useRules.containsKey(key)) {
             return false;
         }
@@ -179,12 +180,12 @@ public class LastGenerationInfo {
     }
 
     public void setUsePigUDFs(String jobId, String jobVersion, boolean useRules) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion); 
         this.usedPigUDFs.put(key, useRules);
     }
 
     public boolean isUsePigUDFs(String jobId, String jobVersion) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion); 
         if (!usedPigUDFs.containsKey(key)) {
             return false;
         }
@@ -251,7 +252,7 @@ public class LastGenerationInfo {
      * @return the modulesNeededPerJob
      */
     public Set<String> getRoutinesNeededPerJob(String jobId, String jobVersion) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion);
         if (!routinesNeededPerJob.containsKey(key)) {
             routinesNeededPerJob.put(key, new HashSet<String>());
         }
@@ -279,7 +280,8 @@ public class LastGenerationInfo {
     }
 
     private String getProcessKey(String jobId, String jobVersion) {
-        return jobId + "_" + jobVersion; //$NON-NLS-1$
+        String pureJobId = ProcessUtils.getPureItemId(jobId);
+        return pureJobId + "_" + jobVersion; //$NON-NLS-1$
     }
 
     /**
@@ -288,7 +290,7 @@ public class LastGenerationInfo {
      * @return the pigudfNeededPerJob
      */
     public Set<String> getPigudfNeededPerJob(String jobId, String jobVersion) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion);
         if (!pigudfNeededPerJob.containsKey(key)) {
             pigudfNeededPerJob.put(key, new HashSet<String>());
         }
@@ -302,7 +304,7 @@ public class LastGenerationInfo {
      * @param modulesNeededPerJob the modulesNeededPerJob to set
      */
     public void setRoutinesNeededPerJob(String jobId, String jobVersion, Set<String> modulesNeeded) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion);
         routinesNeededPerJob.put(key, new HashSet<String>(modulesNeeded));
     }
 
@@ -312,7 +314,7 @@ public class LastGenerationInfo {
      * @param pigudfNeededPerJob the pigudfNeededPerJob to set
      */
     public void setPigudfNeededPerJob(String jobId, String jobVersion, Set<String> modulesNeeded) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion);
         pigudfNeededPerJob.put(key, new HashSet<String>(modulesNeeded));
     }
 
@@ -321,7 +323,7 @@ public class LastGenerationInfo {
      * @return the modulesNeededPerJob
      */
     public Set<String> getRoutinesNeededWithSubjobPerJob(String jobId, String jobVersion) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion);
         if (!routinesNeededWithSubjobPerJob.containsKey(key)) {
             routinesNeededWithSubjobPerJob.put(key, new HashSet<String>());
         }
@@ -334,7 +336,7 @@ public class LastGenerationInfo {
      * @return the pigudfNeededWithSubjobPerJob
      */
     public Set<String> getPigudfNeededWithSubjobPerJob(String jobId, String jobVersion) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion);
         if (!pigudfNeededWithSubjobPerJob.containsKey(key)) {
             pigudfNeededWithSubjobPerJob.put(key, new HashSet<String>());
         }
@@ -348,7 +350,7 @@ public class LastGenerationInfo {
      * @param modulesNeededPerJob the modulesNeededPerJob to set
      */
     public void setRoutinesNeededWithSubjobPerJob(String jobId, String jobVersion, Set<String> modulesNeeded) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion);
         routinesNeededWithSubjobPerJob.put(key, new HashSet<String>(modulesNeeded));
     }
 
@@ -358,7 +360,7 @@ public class LastGenerationInfo {
      * @param pigudfNeededWithSubjobPerJob the pigudfNeededWithSubjobPerJob to set
      */
     public void setPigudfNeededWithSubjobPerJob(String jobId, String jobVersion, Set<String> modulesNeeded) {
-        String key = jobId + "_" + jobVersion; //$NON-NLS-1$
+        String key = this.getProcessKey(jobId, jobVersion);
         pigudfNeededWithSubjobPerJob.put(key, new HashSet<String>(modulesNeeded));
     }
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/codegen/AbstractRoutineSynchronizer.java

@@ -19,6 +19,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.eclipse.core.resources.IFile;
@@ -97,17 +98,24 @@ public abstract class AbstractRoutineSynchronizer implements ITalendSynchronizer
 
     private void getReferencedProjectRoutine(final Map<String, RoutineItem> beansList, final Project project,
             ERepositoryObjectType routineType, boolean syncRef) throws SystemException {
-        for (IRepositoryViewObject obj : getRepositoryService().getProxyRepositoryFactory().getAll(project, routineType)) {
-            final String key = obj.getProperty().getLabel();
-            // it does not have a routine with same name
-            if (!beansList.containsKey(key)) {
-                beansList.put(key, (RoutineItem) obj.getProperty().getItem());
-            }
-            if (syncRef) {
-                // sync routine
-                syncRoutine((RoutineItem) obj.getProperty().getItem(), false, true, true);
+        List<IRepositoryViewObject> list = getRepositoryService().getProxyRepositoryFactory().getAll(project, routineType);
+
+        if (list.size() == 0) {
+            getRunProcessService().getTalendCodeJavaProject(routineType, project.getTechnicalLabel());
+        } else {
+            for (IRepositoryViewObject obj : list) {
+                final String key = obj.getProperty().getLabel();
+                // it does not have a routine with same name
+                if (!beansList.containsKey(key)) {
+                    beansList.put(key, (RoutineItem) obj.getProperty().getItem());
+                }
+                if (syncRef) {
+                    // sync routine
+                    syncRoutine((RoutineItem) obj.getProperty().getItem(), false, true, true);
+                }
             }
         }
+
         if (syncRef) {
             // sync system routine
             syncSystemRoutine(project);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/core/IDesignerCoreService.java

@@ -195,4 +195,7 @@ public interface IDesignerCoreService extends IService {
     public void setTACReadTimeout(int timeout);
 
     boolean isDelegateNode(INode node);
+
+    boolean isNeedContextInJar(IProcess process);
+
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/IProcessor.java

@@ -254,6 +254,9 @@ public interface IProcessor {
 
     public String[] getCommandLine(boolean needContext, boolean externalUse, int statOption, int traceOption,
             String... codeOptions);
+    
+    public String[] getCommandLine(boolean needContext, boolean externalUse, int statOption, int traceOption, boolean ignoreCustomJVMSetting,
+            String... codeOptions);
 
     public void setContext(IContext context);
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/ItemCacheManager.java

@@ -71,7 +71,12 @@ public class ItemCacheManager {
             processItem = getRefProcessItem(ProjectManager.getInstance().getCurrentProject(), parsedArray[1]);
         } else {
             Project project = ProjectManager.getInstance().getProjectFromProjectTechLabel(parsedArray[0]);
-            processItem = getProcessItem(project, parsedArray[1]);
+            if (project != null) {
+                processItem = getProcessItem(project, parsedArray[1]);
+            }
+            if (processItem == null) {
+                processItem = getRefProcessItem(ProjectManager.getInstance().getCurrentProject(), parsedArray[1]);
+            }
         }
         return processItem;
     }
@@ -112,7 +117,12 @@ public class ItemCacheManager {
             refProcessItem = getRefProcessItem(ProjectManager.getInstance().getCurrentProject(), parsedArray[1], version);
         } else {
             Project project = ProjectManager.getInstance().getProjectFromProjectTechLabel(parsedArray[0]);
-            refProcessItem = getProcessItem(project, parsedArray[1], version);
+            if (project != null) {
+                refProcessItem = getProcessItem(project, parsedArray[1], version);
+            }
+            if (refProcessItem == null) {
+                refProcessItem = getRefProcessItem(ProjectManager.getInstance().getCurrentProject(), parsedArray[1], version);
+            }
         }
         return refProcessItem;
     }

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

@@ -138,4 +138,6 @@ public interface IRepositoryService extends IService {
 
     boolean isGIT();
 
+    public void setShouldCheckRepoViewCommonNavigatorDirty(IRepositoryView repView, boolean shouldFlag);
+
 }

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

@@ -98,6 +98,8 @@ public class RepositoryConstants {
 
     public static final String REPOSITORY_CLOUD_APAC_ID = "cloud_apac"; //$NON-NLS-1$
 
+    public static final String REPOSITORY_CLOUD_US_WEST_ID = "cloud_us_west"; //$NON-NLS-1$
+
     public static final String REPOSITORY_CLOUD_CUSTOM_ID = "cloud_custom"; //$NON-NLS-1$
 
     public static final String REPOSITORY_URL = "url"; //$NON-NLS-1$

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/advanced/composite/FilteredCheckboxTree.java

@@ -152,11 +152,11 @@ public class FilteredCheckboxTree extends Composite {
      */
     static {
         ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PlatformUI.PLUGIN_ID,
-                "$nl$/icons/full/etool16/clear_co.gif"); //$NON-NLS-1$
+                "$nl$/icons/full/etool16/clear_co.png"); //$NON-NLS-1$
         if (descriptor != null) {
             JFaceResources.getImageRegistry().put(CLEAR_ICON, descriptor);
         }
-        descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PlatformUI.PLUGIN_ID, "$nl$/icons/full/dtool16/clear_co.gif"); //$NON-NLS-1$
+        descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PlatformUI.PLUGIN_ID, "$nl$/icons/full/dtool16/clear_co.png"); //$NON-NLS-1$
         if (descriptor != null) {
             JFaceResources.getImageRegistry().put(DCLEAR_ICON, descriptor);
         }

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

@@ -472,7 +472,7 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
             paramNameFound = true;
             paramName = NEW_PARAM_NAME + numParam;
             for (int i = 0; i < listParams.size(); i++) {
-                if (paramName.equals(listParams.get(i).getName())) {
+                if (paramName.equalsIgnoreCase(listParams.get(i).getName())) {
                     paramNameFound = false;
                 }
             }

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

@@ -715,6 +715,13 @@ public class SelectRepositoryContextDialog extends SelectionDialog {
                 if (param != null && param.isBuiltIn()) {
                     return false;
                 }
+                if (param == null) {
+                    boolean containsSameParameterIgnoreCase = manager.getDefaultContext()
+                            .containsSameParameterIgnoreCase(paramType.getName());
+                    if (containsSameParameterIgnoreCase) {
+                        return false;
+                    }
+                }
             }
             return true;
         }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/preference/I18nPreferencePage.java

@@ -47,7 +47,9 @@ import org.talend.commons.utils.VersionUtils;
 import org.talend.core.CorePlugin;
 import org.talend.core.model.genhtml.FileCopyUtils;
 import org.talend.core.prefs.ITalendCorePrefConstants;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.ui.i18n.Messages;
+import org.talend.repository.model.IProxyRepositoryFactory;
 
 public abstract class I18nPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
 
@@ -138,19 +140,27 @@ public abstract class I18nPreferencePage extends FieldEditorPreferencePage imple
             serbian = "Serbian"; //$NON-NLS-1$
         }
 
-        String[][] entryNamesAndValues =
-                { { Locale.ENGLISH.getDisplayLanguage(Locale.ENGLISH), Locale.ENGLISH.getLanguage() },
-                        { Locale.FRENCH.getDisplayLanguage(Locale.FRENCH), Locale.FRENCH.getLanguage() },
-                        { Locale.CHINESE.getDisplayLanguage(Locale.CHINESE), "zh_CN" },
-                        { Locale.GERMAN.getDisplayLanguage(Locale.GERMAN), Locale.GERMAN.getLanguage() },
-                        { Locale.JAPANESE.getDisplayLanguage(Locale.JAPANESE), Locale.JAPANESE.getLanguage() },
-                        { Locale.ITALIAN.getDisplayLanguage(Locale.ITALIAN), Locale.ITALIAN.getLanguage() },
-                        { "Brasil", "pt_BR" }, //$NON-NLS-1$ //$NON-NLS-2$
-                        { spanish, "es" }, { russian, "ru" }, //$NON-NLS-1$ //$NON-NLS-2$
-                        { Locale.KOREA.getDisplayLanguage(Locale.KOREA), "kr" }, { "Turkish", "tr" }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                        { greek, "el" }, { "Hrvatski", "hr" }, { arabic, "ar" }, { serbian, "sr" }, { "Polski", "pl" },
-                        { "Romanian", "ro" }, { "Netherlands", "nl" } }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-                                                                         // // /$NON-NLS-7$
+        String slovak = "Sloven\u010dina";//$NON-NLS-1$
+        try {
+            utf8Bytes = slovak.getBytes("UTF8");//$NON-NLS-1$
+            slovak = new String(utf8Bytes, "UTF8");//$NON-NLS-1$
+        } catch (UnsupportedEncodingException e2) {
+            slovak = "Slovak";//$NON-NLS-1$
+        }
+
+        String[][] entryNamesAndValues = { { Locale.ENGLISH.getDisplayLanguage(Locale.ENGLISH), Locale.ENGLISH.getLanguage() },
+                { Locale.FRENCH.getDisplayLanguage(Locale.FRENCH) + " (French)", Locale.FRENCH.getLanguage() }, //$NON-NLS-1$
+                { Locale.CHINESE.getDisplayLanguage(Locale.CHINESE) + " (Chinese)", "zh_CN" }, //$NON-NLS-1$ //$NON-NLS-2$
+                { Locale.GERMAN.getDisplayLanguage(Locale.GERMAN) + " (German)", Locale.GERMAN.getLanguage() }, //$NON-NLS-1$
+                { Locale.JAPANESE.getDisplayLanguage(Locale.JAPANESE) + " (Japanese)", Locale.JAPANESE.getLanguage() }, //$NON-NLS-1$
+                { Locale.ITALIAN.getDisplayLanguage(Locale.ITALIAN) + " (Italian)", Locale.ITALIAN.getLanguage() }, //$NON-NLS-1$
+                { "Brasil (Brazilian)", "pt_BR" }, //$NON-NLS-1$ //$NON-NLS-2$
+                { spanish + " (Spanish)", "es" }, { russian + " (Russion)", "ru" }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                { Locale.KOREA.getDisplayLanguage(Locale.KOREA) + " (Korean)", "kr" }, { "Turkish (Turkish)", "tr" }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                { greek + " (Greek)", "el" }, { "Hrvatski (Croatian)", "hr" }, { arabic + " (Arabic)", "ar" }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$//$NON-NLS-5$ //$NON-NLS-6$
+                { serbian + " (Serbian)", "sr" }, { "Polski (Polish)", "pl" }, { "Romanian (Romanian)", "ro" }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$//$NON-NLS-5$ //$NON-NLS-6$
+                { "Netherlands (Netherlands)", "nl" }, { slovak + " (Slovak)", "sk" }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                { "Current OS Language", Locale.getDefault().getLanguage() } };//$NON-NLS-1$
         languageSelectionEditor = new OneLineComboFieldEditor(ITalendCorePrefConstants.LANGUAGE_SELECTOR,
                 Messages.getString("I18nPreferencePage.needRestart"), entryNamesAndValues, getFieldEditorParent()); //$NON-NLS-1$
         addField(languageSelectionEditor);
@@ -219,6 +229,8 @@ public abstract class I18nPreferencePage extends FieldEditorPreferencePage imple
                 }
             }
         });
+
+        handleUserReadOnlyStatus(composite);
     }
 
     private void applyBabiliResource(String zipFileName) {
@@ -649,4 +661,27 @@ public abstract class I18nPreferencePage extends FieldEditorPreferencePage imple
         fields.add(editor);
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.preference.PreferencePage#contributeButtons(org.eclipse.swt.widgets.Composite)
+     */
+    @Override
+    protected void contributeButtons(Composite parent) {
+        super.contributeButtons(parent);
+        handleUserReadOnlyStatus(parent);
+    }
+
+    /**
+     * 
+     * When the user is read only for current project then setting composite is disable
+     * 
+     * @param mainComposite
+     */
+    public void handleUserReadOnlyStatus(Composite mainComposite) {
+        IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
+        if (factory.isUserReadOnlyOnCurrentProject()) {
+            mainComposite.setEnabled(false);
+        }
+    }
 }

main/plugins/org.talend.core/src/main/java/org/talend/core/CoreService.java

@@ -54,6 +54,7 @@ import org.talend.core.model.metadata.QueryUtil;
 import org.talend.core.model.metadata.builder.ConvertionHelper;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.process.ElementParameterParser;
+import org.talend.core.model.process.ProcessUtils;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.relationship.RelationshipItemBuilder;
 import org.talend.core.model.repository.IRepositoryViewObject;
@@ -280,9 +281,10 @@ public class CoreService implements ICoreService {
             ICodeGeneratorService codeGenService = (ICodeGeneratorService) GlobalServiceRegister.getDefault().getService(
                     ICodeGeneratorService.class);
             codeGenService.createRoutineSynchronizer().syncAllRoutinesForLogOn();
-            codeGenService.createRoutineSynchronizer().syncAllPigudfForLogOn();
+            if (ProcessUtils.isRequiredPigUDFs(null)) {
+                codeGenService.createRoutineSynchronizer().syncAllPigudfForLogOn();
+            }
         }
-
     }
 
     @Override

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

@@ -16,7 +16,7 @@ import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-import org.talend.commons.exception.WarningException;
+import org.talend.commons.exception.ExceptionHandler;
 
 /**
  * cli class global comment. Detailled comment
@@ -104,26 +104,31 @@ public final class ProcessStreamTrashReaderUtil {
 
     public static void readAndForget(final Process process) {
         try {
+            final String encoding = "UTF-8";
             // input stream thread
             new Thread() {
 
                 public void run() {
-                    InputStream is = process.getInputStream();
-                    InputStreamReader din = new InputStreamReader(is);
-                    BufferedReader reader = new BufferedReader(din);
                     try {
-                        String line = null;
-                        while ((line = reader.readLine()) != null) {
-                            System.out.println("getInputStream " + line); //$NON-NLS-1$
-                        }
-                    } catch (Exception ex) {
-                        // nothing to do
-                    } finally {
+                        InputStream is = process.getInputStream();
+                        InputStreamReader din = new InputStreamReader(is, encoding);
+                        BufferedReader reader = new BufferedReader(din);
                         try {
-                            is.close();
+                            String line = null;
+                            while ((line = reader.readLine()) != null) {
+                                System.out.println("getInputStream " + line); //$NON-NLS-1$
+                            }
                         } catch (Exception ex) {
                             // nothing to do
+                        } finally {
+                            try {
+                                is.close();
+                            } catch (Exception ex) {
+                                // nothing to do
+                            }
                         }
+                    } catch (Exception e) {
+                        ExceptionHandler.process(e);
                     }
                 }
             }.start();
@@ -132,23 +137,31 @@ public final class ProcessStreamTrashReaderUtil {
             new Thread() {
 
                 public void run() {
-                    InputStream is = process.getErrorStream();
-                    InputStreamReader din = new InputStreamReader(is);
-                    BufferedReader reader = new BufferedReader(din);
                     try {
-                        String line = null;
-                        while ((line = reader.readLine()) != null) {
-                            System.out.println("getErrorStream " + line); //$NON-NLS-1$
-                            throw new WarningException("AAAAA");
-                        }
-                    } catch (Exception ex) {
-                        // nothing to do
-                    } finally {
+                        InputStream is = process.getErrorStream();
+                        InputStreamReader din = new InputStreamReader(is, encoding);
+                        BufferedReader reader = new BufferedReader(din);
+                        StringBuilder strBuilder = new StringBuilder();
                         try {
-                            is.close();
+                            String line = null;
+                            while ((line = reader.readLine()) != null) {
+                                System.out.println("getErrorStream " + line); //$NON-NLS-1$
+                                strBuilder.append(line).append("\n");
+                            }
                         } catch (Exception ex) {
                             // nothing to do
+                        } finally {
+                            try {
+                                is.close();
+                            } catch (Exception ex) {
+                                // nothing to do
+                            }
                         }
+                        if (!strBuilder.toString().replaceAll("[\n]", " ").trim().isEmpty()) {
+                            throw new Exception(strBuilder.toString());
+                        }
+                    } catch (Exception e) {
+                        ExceptionHandler.process(e);
                     }
                 }
             }.start();

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

@@ -756,7 +756,7 @@ public class ProcessorUtilities {
 
     public static boolean hasMetadataDynamic(IProcess currentProcess, JobInfo jobInfo) {
         boolean hasDynamicMetadata = false;
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IDesignerCoreService.class)) {
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IDesignerCoreService.class) && !isExportConfig()) {
             IDesignerCoreService designerCoreService =
                     (IDesignerCoreService) GlobalServiceRegister.getDefault().getService(IDesignerCoreService.class);
             for (INode node : currentProcess.getGraphicalNodes()) {
@@ -1073,9 +1073,11 @@ public class ProcessorUtilities {
             JobInfo parentJob = jobInfo.getFatherJobInfo();
             if (parentJob != null && (parentJob.getProcessor() != null)) {
                 for (JobInfo subJob : parentJob.getProcessor().getBuildChildrenJobs()) {
+
                     if (ProcessUtils.isSameProperty(subJob.getJobId(), jobInfo.getJobId(), false)) {
                         subJob.setProcessor(processor);
                     }
+
                 }
             }
             if (!timerStarted) {
@@ -1229,14 +1231,23 @@ public class ProcessorUtilities {
     public static void cleanSourceFolder(IProgressMonitor progressMonitor, IProcess currentProcess,
             IProcessor processor) {
         try {
+            ITalendProcessJavaProject jobProject = processor.getTalendJavaProject();
+            // clean up source code
             IPath codePath = processor.getSrcCodePath().removeLastSegments(2);
-            IFolder srcFolder = processor.getTalendJavaProject().getProject().getFolder(codePath);
+            IFolder srcFolder = jobProject.getProject().getFolder(codePath);
             String jobPackageFolder = JavaResourcesHelper.getJobClassPackageFolder(currentProcess);
             for (IResource resource : srcFolder.members()) {
-                if (resource.getProjectRelativePath().toPortableString().endsWith(jobPackageFolder)) {
-                    break;
+                if (!resource.getProjectRelativePath().toPortableString().endsWith(jobPackageFolder)) {
+                    resource.delete(true, progressMonitor);
+                }
+            }
+            // clean up resources folder if needed
+            if (ProcessorUtilities.isExportConfig() && !designerCoreService.isNeedContextInJar(currentProcess)) {
+                for (IResource resource : jobProject.getResourcesFolder().members()) {
+                    if (resource.exists()) {
+                        resource.delete(true, progressMonitor);
+                    }
                 }
-                resource.delete(true, progressMonitor);
             }
         } catch (CoreException e) {
             ExceptionHandler.process(e);
@@ -2026,7 +2037,15 @@ public class ProcessorUtilities {
     public static String[] getCommandLine(String targetPlatform, boolean skipClasspathJar, boolean externalUse,
             String processId, String contextName, int statisticPort, int tracePort, String... codeOptions)
             throws ProcessorException {
+        return getCommandLine(targetPlatform, skipClasspathJar, externalUse,
+                processId, contextName, statisticPort, tracePort, false, codeOptions);
+    }
 
+    //ignoreCustomJVMSetting mean will generate the java command without the job VM setting in studio "Run job" setting and studio preferences "Run/Debug" setting
+    //only use for TDI-42443 in tRunJob
+    public static String[] getCommandLine(String targetPlatform, boolean skipClasspathJar, boolean externalUse,
+            String processId, String contextName, int statisticPort, int tracePort, boolean ignoreCustomJVMSetting, String... codeOptions)
+            throws ProcessorException {
         IProcessor processor = findProcessorFromJobList(processId, contextName, null);
         if (processor != null && targetPlatform.equals(processor.getTargetPlatform())) {
             if (processor.isProcessUnloaded()) {
@@ -2035,7 +2054,7 @@ public class ProcessorUtilities {
             boolean oldSkipClasspathJar = processor.isSkipClasspathJar();
             processor.setSkipClasspathJar(skipClasspathJar);
             try {
-                return processor.getCommandLine(true, externalUse, statisticPort, tracePort, codeOptions);
+                return processor.getCommandLine(true, externalUse, statisticPort, tracePort, ignoreCustomJVMSetting, codeOptions);
             } finally {
                 processor.setSkipClasspathJar(oldSkipClasspathJar);
             }
@@ -2053,7 +2072,7 @@ public class ProcessorUtilities {
         }
         // because all jobs are based one new way, set the flag "oldBuildJob" to false.
         return getCommandLine(false, skipClasspathJar, targetPlatform, externalUse, process,
-                selectedProcessItem.getProperty(), contextName, true, statisticPort, tracePort, codeOptions);
+                selectedProcessItem.getProperty(), contextName, true, statisticPort, tracePort, ignoreCustomJVMSetting, codeOptions);
     }
 
     /**
@@ -2127,6 +2146,14 @@ public class ProcessorUtilities {
     public static String[] getCommandLine(boolean oldBuildJob, boolean skipClasspathJar, String targetPlatform,
             boolean externalUse, IProcess currentProcess, Property property, String contextName, boolean needContext,
             int statisticPort, int tracePort, String... codeOptions) throws ProcessorException {
+        return getCommandLine(oldBuildJob, skipClasspathJar, targetPlatform,
+                externalUse, currentProcess, property, contextName, needContext,
+                statisticPort, tracePort, false, codeOptions);
+    }
+    
+    private static String[] getCommandLine(boolean oldBuildJob, boolean skipClasspathJar, String targetPlatform,
+            boolean externalUse, IProcess currentProcess, Property property, String contextName, boolean needContext,
+            int statisticPort, int tracePort, boolean ignoreCustomJVMSetting, String... codeOptions) throws ProcessorException {
         if (currentProcess == null) {
             return new String[] {};
         }
@@ -2139,7 +2166,7 @@ public class ProcessorUtilities {
         processor.setSkipClasspathJar(skipClasspathJar);
         processor.setTargetPlatform(targetPlatform);
         processor.setOldBuildJob(oldBuildJob);
-        return processor.getCommandLine(needContext, externalUse, statisticPort, tracePort, codeOptions);
+        return processor.getCommandLine(needContext, externalUse, statisticPort, tracePort, ignoreCustomJVMSetting, codeOptions);
     }
 
     public static String[] getCommandLine(boolean oldBuildJob, String targetPlatform, boolean externalUse,
@@ -2588,15 +2615,32 @@ public class ProcessorUtilities {
         return doSupportDynamicHadoopConfLoading(property) && !isExportAsOSGI();
     }
 
-    public static boolean isEsbJob(String processId, String version) {
-        return esbJobs.contains(esbJobKey(processId, version));
+    public static boolean isEsbJob(IProcess process) {
+
+        if (process instanceof IProcess2) {
+            Set<JobInfo> infos = ProcessorUtilities.getChildrenJobInfo(((IProcess2) process).getProperty().getItem(), false);
+
+            for (JobInfo jobInfo : infos) {
+                ProcessType processType = jobInfo.getProcessItem().getProcess();
+                EList<NodeType> nodes = processType.getNode();
+                for (NodeType nodeType : nodes) {
+                    if (isEsbComponentName(nodeType.getComponentName())) {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        return false;
     }
 
     private static void addEsbJob(JobInfo jobInfo) {
         if (esbJobs.contains(esbJobKey(jobInfo.getJobId(), jobInfo.getJobVersion()))) {
             return;
         }
-
+        
         esbJobs.add(esbJobKey(jobInfo.getJobId(), jobInfo.getJobVersion()));
         if (jobInfo.getFatherJobInfo() != null) {
             addEsbJob(jobInfo.getFatherJobInfo());
@@ -2628,5 +2672,4 @@ public class ProcessorUtilities {
     public static boolean isNeedProjectProcessId(String componentName) {
         return "tRunJob".equalsIgnoreCase(componentName) || "cTalendJob".equalsIgnoreCase(componentName);
     }
-
 }

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

@@ -46,12 +46,6 @@
 			<version>${project.version}</version>
 			<type>pom</type>
 		</dependency>
-		<dependency>
-			<groupId>org.talend.studio</groupId>
-			<artifactId>features-maven-plugin-2-2-9-tos</artifactId>
-			<version>${project.version}</version>
-			<type>pom</type>
-		</dependency>		
 		<dependency>
 			<groupId>org.talend.studio</groupId>
 			<artifactId>maven-bundle-plugin-2-3-7-tos</artifactId>
@@ -76,18 +70,30 @@
 			<version>${project.version}</version>
 			<type>pom</type>
 		</dependency>
-        <dependency>
-            <groupId>org.talend.studio</groupId>
-            <artifactId>studio-maven-repository-zip</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-        </dependency>
         <dependency>        
             <groupId>org.talend.studio</groupId>
             <artifactId>build-helper-maven-plugin-3-0-0-tos</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
         </dependency>
+		<dependency>
+			<groupId>org.talend.studio</groupId>
+			<artifactId>karaf-maven-plugin-4-2-4-tos</artifactId>
+			<version>${project.version}</version>
+			<type>pom</type>
+		</dependency>
+        <dependency>
+            <groupId>org.talend.studio</groupId>
+            <artifactId>studio-maven-repository-zip</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
+		<dependency>
+			<groupId>org.talend.studio</groupId>
+			<artifactId>karaf-maven-plugin-4-2-4-tos</artifactId>
+			<version>${project.version}</version>
+			<type>pom</type>
+		</dependency>		
 	</dependencies>
 	<profiles>
 		<profile>

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

@@ -7,41 +7,30 @@
 		<version>7.3.1-SNAPSHOT</version>
 		<relativePath>../../../</relativePath>
 	</parent>
-	<artifactId>features-maven-plugin-2-2-9-tos</artifactId>
+	<artifactId>karaf-maven-plugin-4-2-4-tos</artifactId>
 	<packaging>pom</packaging>
 	<dependencies>
-	
 		<dependency>
 			<groupId>org.apache.karaf.tooling</groupId>
-			<artifactId>features-maven-plugin</artifactId>
-			<version>2.2.9</version>
+			<artifactId>karaf-maven-plugin</artifactId>
+			<version>4.2.4</version>
 		</dependency>
-		
 		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>org.apache.felix.bundlerepository</artifactId>
-			<version>1.6.4</version>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>1.7.12</version>
 		</dependency>
-		
 		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.core</artifactId>
-			<version>4.2.0</version>
+			<groupId>org.apache.maven.shared</groupId>
+			<artifactId>maven-dependency-tree</artifactId>
+			<version>3.0.1</version>
 		</dependency>
-		
 		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymock</artifactId>
-			<version>3.1</version>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-framework-bom</artifactId>
+			<version>5.0.2.RELEASE</version>
+			<type>pom</type>
 		</dependency>
-		
-                <!-- Required by commons-lang-2.6.pom -->
-                <dependency>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-parent</artifactId>
-                    <version>17</version>
-                    <type>pom</type>
-                </dependency>		
 	</dependencies>
 	<build>
 		<plugins>

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

@@ -10,9 +10,9 @@
 	<artifactId>studio-maven-repository-build</artifactId>
 	<packaging>pom</packaging>
 	<modules>
-		<module>plugins/features-maven-plugin-2-2-9</module>
 		<module>plugins/maven-bundle-plugin-2-3-7</module>
 		<module>plugins/maven-bundle-plugin-2-5-3</module>
+		<module>plugins/karaf-maven-plugin-4-2-4</module>
 		<module>plugins/maven-install-plugin-2-5-1</module>
 		<module>plugins/talend-compiler-plugin</module>
 		<module>plugins/build-helper-maven-plugin-3-0-0</module>

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

@@ -10,7 +10,7 @@
 	<artifactId>studio-components-dependencies</artifactId>
 	<packaging>pom</packaging>
 	<properties>
-		<components.version>0.27.3</components.version>
+		<components.version>0.28.0-SNAPSHOT</components.version>
 	</properties>
 	<repositories>
 		<repository>

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

@@ -10,7 +10,7 @@
 	<artifactId>studio-tacokit-dependencies</artifactId>
 	<packaging>pom</packaging>
 	<properties>
-		<tacokit.components.version>1.1.0</tacokit.components.version>
+		<tacokit.components.version>1.3.0-SNAPSHOT</tacokit.components.version>
 	</properties>
 	<repositories>
 		<repository>

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

@@ -11,4 +11,5 @@ ProjectPomProjectSettingPage_FilterPomLabel=Filter to use to generate poms:
 ProjectPomProjectSettingPage_FilterErrorMessage=Invalid filter: {0}
 ProjectPomProjectSettingPage.syncAllPomsButtonText=Force full re-synchronize poms
 AbstractPersistentProjectSettingPage.syncAllPoms=Do you want to update all poms? \n This operation might take long time depends on your project size.
-MavenProjectSettingPage.filterExampleMessage=Filter examples:\nlabel=myJob       \t\t\t\t=> Generate only the job named "myJob"\n!(label=myJob)    \t\t\t\t=> Generate any job except the one named "myJob"\n(path=folder1/folder2)  \t\t\t=> Generate any job in the folder "folder1/folder2"\n(path=folder1/folder2)or(label=myJob)\t=> Generate any job in the folder "folder1/folder2" or named "myJob"\n(label=myJob)and(version=0.2)	\t=> Generate only the job named "myJob" with version 0.2\n!((label=myJob)and(version=0.1))	\t=> Generate every jobs except the "myJob" version 0.1
+MavenProjectSettingPage.filterExampleMessage=Filter examples:\nlabel=myJob       \t\t\t\t=> Generate only the job named "myJob"\n!(label=myJob)    \t\t\t\t=> Generate any job except the one named "myJob"\n(path=folder1/folder2)  \t\t\t=> Generate any job in the folder "folder1/folder2"\n(path=folder1/folder2)or(label=myJob)\t=> Generate any job in the folder "folder1/folder2" or named "myJob"\n(label=myJob)and(version=0.2)	\t=> Generate only the job named "myJob" with version 0.2\n!((label=myJob)and(version=0.1))	\t=> Generate every jobs except the "myJob" version 0.1
+MavenProjectSettingPage.refModuleText=Set reference project modules in profile

main/plugins/org.talend.designer.maven.ui/src/main/java/org/talend/designer/maven/ui/setting/project/page/MavenProjectSettingPage.java

@@ -50,6 +50,8 @@ public class MavenProjectSettingPage extends AbstractProjectSettingPage {
 
 	private IPreferenceStore preferenceStore;
 
+    private Button useProfileModuleCheckbox;
+
 	public MavenProjectSettingPage() {
 		noDefaultAndApplyButton();
 	}
@@ -84,6 +86,10 @@ public class MavenProjectSettingPage extends AbstractProjectSettingPage {
         filterExampleLable.setText(Messages.getString("MavenProjectSettingPage.filterExampleMessage")); //$NON-NLS-1$
         filterExampleLable.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 
+        useProfileModuleCheckbox = new Button(parent, SWT.CHECK);
+        useProfileModuleCheckbox.setText(Messages.getString("MavenProjectSettingPage.refModuleText")); //$NON-NLS-1$
+        useProfileModuleCheckbox.setSelection(preferenceStore.getBoolean(MavenConstants.USE_PROFILE_MODULE));
+
         filterText.setText(filter);
 		filterText.addModifyListener(new ModifyListener() {
 
@@ -115,6 +121,7 @@ public class MavenProjectSettingPage extends AbstractProjectSettingPage {
 			public void widgetSelected(SelectionEvent event) {
 				try {
                     preferenceStore.setValue(MavenConstants.POM_FILTER, getRealVersionFilter(filter));
+                    preferenceStore.setValue(MavenConstants.USE_PROFILE_MODULE, useProfileModuleCheckbox.getSelection());
 					new AggregatorPomsHelper().syncAllPoms();
 				} catch (Exception e) {
 					ExceptionHandler.process(e);
@@ -133,6 +140,7 @@ public class MavenProjectSettingPage extends AbstractProjectSettingPage {
 		boolean ok = super.performOk();
 		if (preferenceStore != null) {
             preferenceStore.setValue(MavenConstants.POM_FILTER, getRealVersionFilter(filter));
+            preferenceStore.setValue(MavenConstants.USE_PROFILE_MODULE, useProfileModuleCheckbox.getSelection());
 		}
 		return ok;
 	}

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

@@ -36,17 +36,36 @@
 							<artifactId>tycho-compiler-jdt</artifactId>
 							<version>1.4.0</version>
 						</dependency>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-utils</artifactId>
+							<version>3.0.24</version>
+						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-resources-plugin</artifactId>
 					<version>3.0.2</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-utils</artifactId>
+							<version>3.0.24</version>
+						</dependency>
+					</dependencies>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>3.0.2</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-utils</artifactId>
+							<version>3.0.24</version>
+						</dependency>
+					</dependencies>
 					<configuration>
 						<archive>
 							<addMavenDescriptor>false</addMavenDescriptor>
@@ -57,11 +76,49 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
 					<version>3.0.0</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-utils</artifactId>
+							<version>3.0.24</version>
+						</dependency>
+					</dependencies>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>2.20</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-utils</artifactId>
+							<version>3.0.24</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-install-plugin</artifactId>
+					<version>2.5.1</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-utils</artifactId>
+							<version>3.0.24</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>2.7</version>
+					<dependencies>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-utils</artifactId>
+							<version>3.0.24</version>
+						</dependency>
+					</dependencies>
 				</plugin>
 			</plugins>
 		</pluginManagement>

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java

@@ -12,24 +12,22 @@
 // ============================================================================
 package org.talend.designer.maven.tools;
 
-import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_AGGREGATORS;
-import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_BEANS;
-import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_CODES;
-import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_JOBS;
-import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_PIGUDFS;
-import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_POMS;
-import static org.talend.designer.maven.model.TalendJavaProjectConstants.DIR_ROUTINES;
+import static org.talend.designer.maven.model.TalendJavaProjectConstants.*;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.maven.model.Activation;
 import org.apache.maven.model.Model;
+import org.apache.maven.model.Profile;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -56,7 +54,6 @@ import org.talend.core.context.Context;
 import org.talend.core.context.RepositoryContext;
 import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.model.general.ModuleNeeded;
-import org.talend.core.model.general.Project;
 import org.talend.core.model.process.ProcessUtils;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.ProjectReference;
@@ -110,27 +107,29 @@ public class AggregatorPomsHelper {
         return projectTechName;
     }
 
-    public void createRootPom(List<String> modules, boolean force, IProgressMonitor monitor) throws Exception {
+    public void createRootPom(Model model, boolean force, IProgressMonitor monitor)
+            throws Exception {
         IFile pomFile = getProjectRootPom();
         if (force || !pomFile.exists()) {
-            Map<String, Object> parameters = new HashMap<String, Object>();
-            parameters.put(MavenTemplateManager.KEY_PROJECT_NAME, projectTechName);
-            Model model = MavenTemplateManager.getCodeProjectTemplateModel(parameters);
-            if (modules != null && !modules.isEmpty()) {
-                model.setModules(modules);
+            if (model == null) {
+                model = getCodeProjectTemplateModel();
             }
             PomUtil.savePom(monitor, model, pomFile);
         }
     }
 
     public void createRootPom(IProgressMonitor monitor) throws Exception {
+        Model newModel = getCodeProjectTemplateModel();
         IFile pomFile = getProjectRootPom();
-        List<String> modules = null;
         if (pomFile != null && pomFile.exists()) {
-            Model model = MavenPlugin.getMavenModelManager().readMavenModel(pomFile);
-            modules = model.getModules();
+            Model oldModel = MavenPlugin.getMavenModelManager().readMavenModel(pomFile);
+            List<Profile> profiles = oldModel.getProfiles().stream()
+                    .filter(profile -> StringUtils.startsWithIgnoreCase(profile.getId(), projectTechName))
+                    .collect(Collectors.toList());
+            newModel.setModules(oldModel.getModules());
+            newModel.getProfiles().addAll(profiles);
         }
-        createRootPom(modules, true, monitor);
+        createRootPom(newModel, true, monitor);
     }
 
     public void installRootPom(boolean force) throws Exception {
@@ -290,37 +289,38 @@ public class AggregatorPomsHelper {
         }
     }
 
-    public void updateRefProjectModules(List<ProjectReference> references) {
+    public void updateRefProjectModules(List<ProjectReference> references, IProgressMonitor monitor) {
         if (!needUpdateRefProjectModules()) {
             return;
         }
         try {
-            List<String> modules = new ArrayList<>();
-            for (ProjectReference reference : references) {
-                String refProjectTechName = reference.getReferencedProject().getTechnicalLabel();
-                String modulePath = "../../" + refProjectTechName + "/" + TalendJavaProjectConstants.DIR_POMS; //$NON-NLS-1$ //$NON-NLS-2$
-                modules.add(modulePath);
+            Model model = MavenPlugin.getMavenModelManager().readMavenModel(getProjectRootPom());
+            if (PomIdsHelper.useProfileModule()) {
+                List<Profile> profiles = collectRefProjectProfiles(references);
+                Iterator<Profile> iterator = model.getProfiles().listIterator();
+                iterator.forEachRemaining(profile -> {
+                    if (StringUtils.startsWithIgnoreCase(profile.getId(), projectTechName)) {
+                        iterator.remove();
+                    }
+                });
+                model.getProfiles().addAll(profiles);
+            } else {
+                List<String> refPrjectModules = new ArrayList<>();
+                references.forEach(reference -> {
+                    String refProjectTechName = reference.getReferencedProject().getTechnicalLabel();
+                    String modulePath = "../../" + refProjectTechName + "/" + TalendJavaProjectConstants.DIR_POMS; //$NON-NLS-1$ //$NON-NLS-2$
+                    refPrjectModules.add(modulePath);
+                });
+                List<String> modules = model.getModules();
+                Iterator<String> iterator = modules.listIterator();
+                iterator.forEachRemaining(modulePath -> {
+                    if (modulePath.startsWith("../../")) { //$NON-NLS-1$
+                        iterator.remove();
+                    }
+                });
+                modules.addAll(refPrjectModules);
             }
-
-            Project mainProject = ProjectManager.getInstance().getCurrentProject();
-            IFolder mainPomsFolder = new AggregatorPomsHelper(mainProject.getTechnicalLabel()).getProjectPomsFolder();
-            IFile mainPomFile = mainPomsFolder.getFile(TalendMavenConstants.POM_FILE_NAME);
-
-            Model model = MavenPlugin.getMavenModelManager().readMavenModel(mainPomFile);
-            List<String> oldModules = model.getModules();
-            if (oldModules == null) {
-                oldModules = new ArrayList<>();
-            }
-            ListIterator<String> iterator = oldModules.listIterator();
-            while (iterator.hasNext()) {
-                String modulePath = iterator.next();
-                if (modulePath.startsWith("../../")) { //$NON-NLS-1$
-                    iterator.remove();
-                }
-            }
-            oldModules.addAll(modules);
-
-            PomUtil.savePom(null, model, mainPomFile);
+            createRootPom(model, true, monitor);
         } catch (Exception e) {
             ExceptionHandler.process(e);
         }
@@ -684,6 +684,23 @@ public class AggregatorPomsHelper {
         new ProgressMonitorDialog(Display.getDefault().getActiveShell()).run(true, true, runnableWithProgress);
     }
 
+    public void syncParentJobPomsForPropertyChange(Property property) {
+        IRunProcessService runProcessService = getRunProcessService();
+        ProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
+        List<Relation> itemsHaveRelationWith = RelationshipItemBuilder.getInstance().getItemsHaveRelationWith(property.getId(),
+                property.getVersion());
+        try {
+            for (Relation relation : itemsHaveRelationWith) {
+                IRepositoryViewObject object = factory.getSpecificVersion(relation.getId(), relation.getVersion(), true);
+                if (runProcessService != null) {
+                    runProcessService.generatePom(object.getProperty().getItem());
+                }
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
     private String getModulePath(IFile pomFile) {
         IFile parentPom = getProjectRootPom();
         if (parentPom != null) {
@@ -693,47 +710,48 @@ public class AggregatorPomsHelper {
         return null;
     }
 
-    private void collectModules(List<String> modules) {
-        IRunProcessService service = getRunProcessService();
-        if (service != null) {
-            modules.add(
-                    getModulePath(service.getTalendCodeJavaProject(ERepositoryObjectType.ROUTINES).getProjectPom()));
-            if (ProcessUtils.isRequiredPigUDFs(null)) {
-                modules.add(
-                        getModulePath(service.getTalendCodeJavaProject(ERepositoryObjectType.PIG_UDF).getProjectPom()));
-            }
-            if (ProcessUtils.isRequiredBeans(null)) {
-                modules.add(getModulePath(service
-                        .getTalendCodeJavaProject(ERepositoryObjectType.valueOf("BEANS")) //$NON-NLS-1$
-                        .getProjectPom()));
-            }
+    private List<Profile> collectRefProjectProfiles(List<ProjectReference> references) throws CoreException {
+        if (!needUpdateRefProjectModules()) {
+            Model model = MavenPlugin.getMavenModelManager().readMavenModel(getProjectRootPom());
+            List<Profile> profiles = model.getProfiles();
+            return profiles.stream().filter(profile -> StringUtils.startsWithIgnoreCase(profile.getId(), projectTechName))
+                    .collect(Collectors.toList());
         }
-        if (needUpdateRefProjectModules()) {
-            List<ProjectReference> references =
-                    ProjectManager.getInstance().getCurrentProject().getProjectReferenceList(true);
-            for (ProjectReference reference : references) {
-                String refProjectTechName = reference.getReferencedProject().getTechnicalLabel();
-                String modulePath = "../../" + refProjectTechName + "/" + TalendJavaProjectConstants.DIR_POMS; //$NON-NLS-1$ //$NON-NLS-2$
-                modules.add(modulePath);
-            }
-        } else {
-            Project mainProject = ProjectManager.getInstance().getCurrentProject();
-            IFolder mainPomsFolder = new AggregatorPomsHelper(mainProject.getTechnicalLabel()).getProjectPomsFolder();
-            IFile mainPomFile = mainPomsFolder.getFile(TalendMavenConstants.POM_FILE_NAME);
-            try {
-                Model model = MavenPlugin.getMavenModelManager().readMavenModel(mainPomFile);
-                List<String> oldModules = model.getModules();
-                if (oldModules != null) {
-                    for (String modulePath : oldModules) {
-                        if (modulePath.startsWith("../../")) { //$NON-NLS-1$
-                            modules.add(modulePath);
-                        }
-                    }
-                }
-            } catch (CoreException e) {
-                ExceptionHandler.process(e);
-            }
+        if (references == null) {
+            references = ProjectManager.getInstance().getCurrentProject().getProjectReferenceList(true);
         }
+        List<Profile> profiles = new ArrayList<>();
+        references.forEach(reference -> {
+            String refProjectTechName = reference.getReferencedProject().getTechnicalLabel();
+            String modulePath = "../../" + refProjectTechName + "/" + TalendJavaProjectConstants.DIR_POMS; //$NON-NLS-1$ //$NON-NLS-2$
+            Profile profile = new Profile();
+            profile.setId((projectTechName + "_" + refProjectTechName).toLowerCase()); //$NON-NLS-1$
+            Activation activation = new Activation();
+            activation.setActiveByDefault(true);
+            profile.setActivation(activation);
+            profile.getModules().add(modulePath);
+            profiles.add(profile);
+        });
+        return profiles;
+    }
+
+    private List<String> collectRefProjectModules(List<ProjectReference> references) throws CoreException {
+        if (!needUpdateRefProjectModules()) {
+            Model model = MavenPlugin.getMavenModelManager().readMavenModel(getProjectRootPom());
+            return model.getModules().stream().filter(modulePath -> modulePath.startsWith("../../")) //$NON-NLS-1$
+                    .collect(Collectors.toList());
+        }
+        if (references == null) {
+            references = ProjectManager.getInstance().getCurrentProject().getProjectReferenceList(true);
+        }
+        List<String> modules = new ArrayList<>();
+        references.forEach(reference -> {
+            String refProjectTechName = reference.getReferencedProject().getTechnicalLabel();
+            String modulePath = "../../" + refProjectTechName + "/" + TalendJavaProjectConstants.DIR_POMS; //$NON-NLS-1$ //$NON-NLS-2$
+            modules.add(modulePath);
+        });
+        return modules;
+
     }
 
     public boolean needUpdateRefProjectModules() {
@@ -824,8 +842,15 @@ public class AggregatorPomsHelper {
         }
         // sync project pom again with all modules.
         monitor.subTask("Synchronize project pom with modules"); //$NON-NLS-1$
-        collectModules(modules);
-        createRootPom(modules, true, monitor);
+        collectCodeModules(modules);
+        Model model = getCodeProjectTemplateModel();
+        if (PomIdsHelper.useProfileModule()) {
+            model.getProfiles().addAll(collectRefProjectProfiles(null));
+        } else {
+            modules.addAll(collectRefProjectModules(null));
+        }
+        model.setModules(modules);
+        createRootPom(model, true, monitor);
         installRootPom(true);
         monitor.worked(1);
         if (monitor.isCanceled()) {
@@ -834,6 +859,21 @@ public class AggregatorPomsHelper {
         monitor.done();
     }
 
+    private void collectCodeModules(List<String> modules) {
+        // collect codes modules
+        IRunProcessService service = getRunProcessService();
+        if (service != null) {
+            modules.add(getModulePath(service.getTalendCodeJavaProject(ERepositoryObjectType.ROUTINES).getProjectPom()));
+            if (ProcessUtils.isRequiredPigUDFs(null)) {
+                modules.add(getModulePath(service.getTalendCodeJavaProject(ERepositoryObjectType.PIG_UDF).getProjectPom()));
+            }
+            if (ProcessUtils.isRequiredBeans(null)) {
+                modules.add(getModulePath(service.getTalendCodeJavaProject(ERepositoryObjectType.valueOf("BEANS")) //$NON-NLS-1$
+                        .getProjectPom()));
+            }
+        }
+    }
+
     /**
      * Check if is a esb data service job
      *
@@ -862,6 +902,12 @@ public class AggregatorPomsHelper {
         return null;
     }
 
+    private Model getCodeProjectTemplateModel() {
+        Map<String, Object> parameters = new HashMap<String, Object>();
+        parameters.put(MavenTemplateManager.KEY_PROJECT_NAME, projectTechName);
+        return MavenTemplateManager.getCodeProjectTemplateModel(parameters);
+    }
+
     private static IRunProcessService getRunProcessService() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
             IRunProcessService runProcessService =

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/BuildCacheManager.java

@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -43,6 +44,7 @@ import org.talend.designer.maven.launch.MavenPomCommandLauncher;
 import org.talend.designer.maven.model.BuildCacheInfo;
 import org.talend.designer.maven.model.TalendMavenConstants;
 import org.talend.designer.maven.utils.MavenProjectUtils;
+import org.talend.designer.maven.utils.PomIdsHelper;
 import org.talend.designer.maven.utils.PomUtil;
 import org.talend.designer.runprocess.IRunProcessService;
 import org.talend.repository.ProjectManager;
@@ -314,7 +316,11 @@ public class BuildCacheManager {
         model.setModules(new ArrayList<String>());
         model.getModules().addAll(currentJobmodules);
         model.getModules().addAll(currentJobletmodules);
-
+        Parent parent = new Parent();      
+        parent.setGroupId(PomIdsHelper.getProjectGroupId());
+        parent.setArtifactId(PomIdsHelper.getProjectArtifactId());
+        parent.setVersion(PomIdsHelper.getProjectVersion());        
+        model.setParent(parent);
         PomUtil.savePom(null, model, pomFile);
     }
 

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

@@ -45,6 +45,7 @@ import org.talend.core.model.utils.JavaResourcesHelper;
 import org.talend.core.runtime.maven.MavenArtifact;
 import org.talend.core.runtime.maven.MavenConstants;
 import org.talend.core.runtime.maven.MavenUrlHelper;
+import org.talend.core.runtime.process.TalendProcessArgumentConstant;
 import org.talend.core.runtime.projectsetting.IProjectSettingTemplateConstants;
 import org.talend.core.runtime.repository.build.IMavenPomCreator;
 import org.talend.core.ui.ITestContainerProviderService;
@@ -269,6 +270,7 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
 
     protected void addChildrenDependencies(final List<Dependency> dependencies) {
         String parentId = getJobProcessor().getProperty().getId();
+
         final Set<JobInfo> clonedChildrenJobInfors = getJobProcessor().getBuildFirstChildrenJobs();
         for (JobInfo jobInfo : clonedChildrenJobInfors) {
             if (jobInfo.getFatherJobInfo() != null && jobInfo.getFatherJobInfo().getJobId().equals(parentId)) {
@@ -284,6 +286,10 @@ public abstract class AbstractMavenProcessorPom extends CreateMavenBundleTemplat
                     property = jobInfo.getProcessItem().getProperty();
                     groupId = PomIdsHelper.getJobGroupId(property);
                     artifactId = PomIdsHelper.getJobArtifactId(jobInfo);
+                    if ("OSGI".equals(property.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE))) {
+                        artifactId = artifactId + "-bundle";
+                    }
+
                     version = PomIdsHelper.getJobVersion(property);
                     // try to get the pom version of children job and load from the pom file.
                     String childPomFileName = PomUtil.getPomFileName(jobInfo.getJobName(), jobInfo.getJobVersion());

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

@@ -33,7 +33,10 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.model.Activation;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginExecution;
 import org.apache.maven.model.Profile;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.runtime.CoreException;
@@ -742,12 +745,12 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
             Document document = PomUtil.loadAssemblyFile(null, assemblyFile);
             // add talend libs & codes
             setupDependencySetNode(document, talendLibCoordinateMap, "lib", "${artifact.artifactId}.${artifact.extension}",
-                    false);
+                    false, false);
             // add 3rd party libs <dependencySet>
-            setupDependencySetNode(document, _3rdDepLibMap, "lib", null, false);
+            setupDependencySetNode(document, _3rdDepLibMap, "lib", null, false, false);
             // add jobs
             setupDependencySetNode(document, jobCoordinateMap, "${talend.job.name}",
-                    "${artifact.build.finalName}.${artifact.extension}", true);
+                    "${artifact.build.finalName}.${artifact.extension}", true, false);
             // add duplicate dependencies if exists
             setupFileNode(document, duplicateLibs);
 
@@ -816,7 +819,7 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
     }
 
     protected void setupDependencySetNode(Document document, Map<String, Dependency> libIncludes, String outputDir,
-            String fileNameMapping, boolean useProjectArtifact) {
+            String fileNameMapping, boolean useProjectArtifact, boolean unpack) {
         if (libIncludes.isEmpty()) {
             return;
         }
@@ -827,9 +830,11 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
         Node dependencySetNode = document.createElement("dependencySet");
         dependencySetsNode.appendChild(dependencySetNode);
 
-        Node outputDirNode = document.createElement("outputDirectory");
-        outputDirNode.setTextContent(outputDir);
-        dependencySetNode.appendChild(outputDirNode);
+        if (StringUtils.isNotBlank(outputDir)) {
+            Node outputDirNode = document.createElement("outputDirectory");
+            outputDirNode.setTextContent(outputDir);
+            dependencySetNode.appendChild(outputDirNode);
+        }
 
         Node includesNode = document.createElement("includes");
         dependencySetNode.appendChild(includesNode);
@@ -850,6 +855,12 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
         useProjectArtifactNode.setTextContent(Boolean.toString(useProjectArtifact));
         dependencySetNode.appendChild(useProjectArtifactNode);
 
+        if (unpack) {
+            Node unpackNode = document.createElement("unpack");
+            unpackNode.setTextContent(Boolean.TRUE.toString());
+            dependencySetNode.appendChild(unpackNode);
+        }
+
     }
 
     private void setupFileNode(Document document, Map<String, Set<Dependency>> duplicateDependencies) {
@@ -890,4 +901,40 @@ public class CreateMavenJobPom extends AbstractMavenProcessorPom {
         }
     }
 
+    protected Plugin addSkipDockerMavenPlugin() {
+        Plugin plugin = new Plugin();
+
+        plugin.setGroupId("io.fabric8");
+        plugin.setArtifactId("fabric8-maven-plugin");
+        plugin.setVersion("4.0.0");
+
+        Xpp3Dom skip = new Xpp3Dom("skip");
+        // skip.setValue("${docker.skip}");
+        skip.setValue("true");
+
+        Xpp3Dom configuration = new Xpp3Dom("configuration");
+        configuration.addChild(skip);
+
+        List<PluginExecution> pluginExecutions = new ArrayList<PluginExecution>();
+        PluginExecution pluginExecutionStart = new PluginExecution();
+        pluginExecutionStart.setId("start");
+        pluginExecutionStart.setPhase("none");
+        pluginExecutionStart.setConfiguration(configuration);
+
+        pluginExecutions.add(pluginExecutionStart);
+
+        PluginExecution pluginExecutionPushImage = new PluginExecution();
+        pluginExecutionPushImage.setId("push-image");
+        pluginExecutionPushImage.setPhase("none");
+        pluginExecutionPushImage.setConfiguration(configuration);
+
+        pluginExecutions.add(pluginExecutionPushImage);
+
+        plugin.setExecutions(pluginExecutions);
+        plugin.setConfiguration(configuration);
+
+        return plugin;
+
+    }
+
 }

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

@@ -33,11 +33,18 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.exception.PersistenceException;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.IESBService;
 import org.talend.core.PluginChecker;
 import org.talend.core.model.process.JobInfo;
+import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.relationship.Relation;
 import org.talend.core.model.relationship.RelationshipItemBuilder;
+import org.talend.core.model.repository.ERepositoryObjectType;
+import org.talend.core.model.repository.IRepositoryViewObject;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.runtime.maven.MavenConstants;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
 import org.talend.core.runtime.process.TalendProcessArgumentConstant;
@@ -50,6 +57,7 @@ import org.talend.designer.maven.tools.AggregatorPomsHelper;
 import org.talend.designer.maven.utils.PomIdsHelper;
 import org.talend.designer.maven.utils.PomUtil;
 import org.talend.designer.runprocess.IProcessor;
+import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.utils.io.FilesUtils;
 import org.w3c.dom.Document;
 
@@ -108,8 +116,9 @@ public class CreateMavenStandardJobOSGiPom extends CreateMavenJobPom {
     @Override
     protected Model createModel() {
         Model model = super.createModel();
-
+        
         boolean isServiceOperation = isServiceOperation(getJobProcessor().getProperty());
+
         List<Profile> profiles = model.getProfiles();
 
         for (Profile profile : profiles) {
@@ -141,12 +150,23 @@ public class CreateMavenStandardJobOSGiPom extends CreateMavenJobPom {
         }
         model.setName(model.getName() + " Bundle");
         model.addProperty("talend.job.finalName", "${talend.job.name}-bundle-${project.version}");
+        Build build = model.getBuild();
+        
+        IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
+
+        if (isServiceOperation || service.isRESTService((ProcessItem) getJobProcessor().getProperty().getItem())
+                || isRouteOperation(getJobProcessor().getProperty())) {
+            build.addPlugin(addSkipDockerMavenPlugin());
+        }
+        
         if (isServiceOperation) {
             model.addProperty("cloud.publisher.skip", "true");
-            Build build = model.getBuild();
+            
+            build = model.getBuild();
 
             List<Plugin> removePlugins = new ArrayList<Plugin>();
             if (build != null) {
+
                 List<Plugin> plugins = build.getPlugins();
                 for (Plugin p : plugins) {
                     if (p.getArtifactId().equals("maven-deploy-plugin")) {
@@ -227,8 +247,8 @@ public class CreateMavenStandardJobOSGiPom extends CreateMavenJobPom {
         try {
             Document document = PomUtil.loadAssemblyFile(null, assemblyFile);
             // add jobs
-            setupDependencySetNode(document, jobCoordinateMap, "${talend.job.name}",
-                    "${artifact.build.finalName}.${artifact.extension}", true);
+            setupDependencySetNode(document, jobCoordinateMap, null, "${artifact.build.finalName}.${artifact.extension}", true,
+                    true);
             PomUtil.saveAssemblyFile(assemblyFile, document);
         } catch (Exception e) {
             ExceptionHandler.process(e);
@@ -260,14 +280,63 @@ public class CreateMavenStandardJobOSGiPom extends CreateMavenJobPom {
      * @return
      */
     public boolean isServiceOperation(Property property) {
-        List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(property.getId(),
-                property.getVersion(), RelationshipItemBuilder.JOB_RELATION);
+        List<IRepositoryViewObject> serviceRepoList = null;
 
-        for (Relation relation : relations) {
-            if (RelationshipItemBuilder.SERVICES_RELATION.equals(relation.getType())) {
-                return true;
+        boolean isDataServiceOperation = false;
+
+        IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
+
+        try {
+            IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
+            serviceRepoList = factory.getAll(ERepositoryObjectType.valueOf(ERepositoryObjectType.class, "SERVICES"));
+
+            for (IRepositoryViewObject serviceItem : serviceRepoList) {
+                if (service != null) {
+                    List<String> jobIds = service.getSerivceRelatedJobIds(serviceItem.getProperty().getItem());
+                    if (jobIds.contains(property.getId())) {
+                        isDataServiceOperation = true;
+                        break;
+                    }
+                }
             }
+
+        } catch (PersistenceException e) {
+            ExceptionHandler.process(e);
         }
-        return false;
+
+        return isDataServiceOperation;
+    }
+
+    public boolean isRouteOperation(Property property) {
+        List<IRepositoryViewObject> routeRepoList = null;
+
+        boolean isRouteOperation = false;
+
+        IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
+
+        try {
+            IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
+            routeRepoList = factory.getAll(ERepositoryObjectType.valueOf(ERepositoryObjectType.class, "ROUTE"));
+
+            for (IRepositoryViewObject routeItem : routeRepoList) {
+                if (service != null) {
+
+                    List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(routeItem.getId(),
+                            routeItem.getVersion(), RelationshipItemBuilder.JOB_RELATION);
+                    for (Relation relation : relations) {
+                        if (relation.getType() == RelationshipItemBuilder.JOB_RELATION) {
+                            if (relation.getId().equals(property.getId())) {
+                                isRouteOperation = true;
+                            }
+                        }
+                    }
+                }
+            }
+
+        } catch (PersistenceException e) {
+            ExceptionHandler.process(e);
+        }
+
+        return isRouteOperation;
     }
 }

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomIdsHelper.java

@@ -260,6 +260,12 @@ public class PomIdsHelper {
         return manager.getValue(MavenConstants.POM_FILTER);
     }
 
+    public static boolean useProfileModule() {
+        String projectTechName = ProjectManager.getInstance().getCurrentProject().getTechnicalLabel();
+        ProjectPreferenceManager manager = getPreferenceManager(projectTechName);
+        return manager.getBoolean(MavenConstants.USE_PROFILE_MODULE);
+    }
+
     private static String getGroupId(String projectTechName, String baseName, Property property) {
         if (projectTechName == null) {
             projectTechName = ProjectManager.getInstance().getCurrentProject().getTechnicalLabel();

main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomUtil.java

@@ -511,6 +511,10 @@ public class PomUtil {
         return repoPath + "/" + artifactPath; //$NON-NLS-1$
     }
 
+    public static String getLocalRepositoryPath() {
+        return MavenPlugin.getMaven().getLocalRepositoryPath();
+    }
+
     /**
      * Get absolute path for installed artifact
      *
@@ -543,7 +547,7 @@ public class PomUtil {
 
             File resolve = null;
             try {
-                resolve = TalendMavenResolver.getMavenResolver().resolve(localMavenUri);
+                resolve = TalendMavenResolver.resolve(localMavenUri);
             } catch (IOException | RuntimeException e) {
                 resolve = null;
             }
@@ -1127,4 +1131,20 @@ public class PomUtil {
                     || pathname.getName().equals("m2e-lastUpdated.properties"); //$NON-NLS-1$
         }
     };
+
+    public static boolean checkIfJobDependencyExist(IFile parentJobPom, Property property) throws Exception {
+        boolean found = false;
+        Model model = MavenPlugin.getMavenModelManager().readMavenModel(parentJobPom);
+        String groupId = PomIdsHelper.getJobGroupId(property);
+        String artifactId = PomIdsHelper.getJobArtifactId(property);
+        String version = PomIdsHelper.getJobVersion(property);
+        for (Dependency dependency : model.getDependencies()) {
+            if (dependency.getGroupId().equals(groupId) && dependency.getArtifactId().equals(artifactId)
+                    && dependency.getVersion().equals(version)) {
+                found = true;
+                break;
+            }
+        }
+        return found;
+    }
 }

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

@@ -6,7 +6,7 @@
               context="plugin:org.talend.libraries.jdbc.as400"
               language="java"
               message="Needed for AS400 jdbc plugin"
-              name="jt400_V5R3.jar" mvn_uri="mvn:org.talend.libraries/jt400_V5R3/6.0.0" 
+              name="jt400-9.8.jar" mvn_uri="mvn:net.sf.jt400/jt400/9.8/jar" 
               required="true">
         </libraryNeeded>
     </extension>

main/plugins/org.talend.libraries.jdbc.exasol/pom.xml

@@ -45,9 +45,9 @@
                     <configuration>
                         <artifactItems>
                         	<artifactItem>
-                                <groupId>org.talend.libraries</groupId>
+                                <groupId>org.talend.components.lib</groupId>
                                 <artifactId>talend-db-exasol</artifactId>
-                                <version>2.1.2</version>
+                                <version>2.1.4</version>
                                 <type>jar</type>
                                 <overWrite>true</overWrite>
                                 <outputDirectory>${libs.dir}</outputDirectory>

main/plugins/org.talend.libraries.mdm.webservice.ce/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/mdm_webservice_tomcat.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

main/plugins/org.talend.libraries.mdm.webservice.ce/.project

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.talend.libraries.mdm.webservice.ce</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

main/plugins/org.talend.libraries.mdm.webservice.ce/META-INF/MANIFEST.MF

@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: webservice.ce
-Bundle-SymbolicName: org.talend.libraries.mdm.webservice.ce
-Bundle-Version: 7.3.1.qualifier
-Bundle-ClassPath: lib/mdm_webservice_tomcat.jar
-Bundle-Vendor: Talend
-Fragment-Host: org.talend.libraries.mdm
-Export-Package: org.talend.mdm.webservice

main/plugins/org.talend.libraries.mdm.webservice.ce/build.properties

@@ -1,2 +0,0 @@
-bin.includes = META-INF/,\
-               lib/mdm_webservice_tomcat.jar

main/plugins/org.talend.libraries.mdm.webservice.ce/pom.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.3.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.libraries.mdm.webservice.ce</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.8</version>
-        <executions>
-          <execution>
-            <id>copy-webservice-jar</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>lib</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.talend.mdm</groupId>
-                  <artifactId>org.talend.mdm.webservice</artifactId>
-                  <classifier>ce</classifier>
-                  <version>${project.version}</version>
-                  <overWrite>true</overWrite>
-                  <destFileName>mdm_webservice_tomcat.jar</destFileName>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

main/plugins/org.talend.librariesmanager.ui/src/main/java/org/talend/librariesmanager/ui/dialogs/ConfigModuleDialog.java

@@ -116,6 +116,10 @@ public class ConfigModuleDialog extends TitleAreaDialog implements IConfigModule
     private String defaultURIValue = "";
 
     private Set<String> jarsAvailable;
+    
+    private boolean useCustom = false;
+    
+    private String customURI = null;
 
     /**
      * DOC wchen InstallModuleDialog constructor comment.
@@ -553,11 +557,13 @@ public class ConfigModuleDialog extends TitleAreaDialog implements IConfigModule
                 layoutWarningComposite(false, defaultUriTxt.getText());
                 if (useCustomBtn.getSelection()) {
                     customUriText.setEnabled(true);
+                    useCustom = true;
                     if ("".equals(customUriText.getText())) {
                         customUriText.setText(ModuleMavenURIUtils.MVNURI_TEMPLET);
                     }
                 } else {
                     customUriText.setEnabled(false);
+                    useCustom = false;
                 }
                 checkFieldsError();
             }
@@ -807,7 +813,6 @@ public class ConfigModuleDialog extends TitleAreaDialog implements IConfigModule
     @Override
     protected void okPressed() {
         String originalURI = null;
-        String customURI = null;
         originalURI = defaultUriTxt.getText().trim();
         defaultURI = originalURI;
         if (useCustomBtn.getSelection()) {
@@ -889,6 +894,9 @@ public class ConfigModuleDialog extends TitleAreaDialog implements IConfigModule
      */
     @Override
     public String getMavenURI() {
+    	if (useCustom && customURI != null) {
+    		return customURI;
+    	}
         return defaultURI;
     }
 

main/plugins/org.talend.librariesmanager.ui/src/main/java/org/talend/librariesmanager/ui/startup/ShareMavenArtifactsOnStartup.java

@@ -121,7 +121,7 @@ public class ShareMavenArtifactsOnStartup extends ShareLibrareisHelper {
                 MavenUrlHelper.MVN_PROTOCOL + MavenConstants.LOCAL_RESOLUTION_URL + MavenUrlHelper.REPO_SEPERATOR);
         File file = null;
         try {
-            file = TalendMavenResolver.getMavenResolver().resolve(localMvnUrl);
+            file = TalendMavenResolver.resolve(localMvnUrl);
         } catch (IOException | RuntimeException e) {
             ExceptionHandler.process(e);
         }

main/plugins/org.talend.librariesmanager.ui/src/main/java/org/talend/librariesmanager/utils/nexus/NexusDownloadHelperWithProgress.java

@@ -98,23 +98,7 @@ public class NexusDownloadHelperWithProgress extends DownloadHelperWithProgress
     private File resolveJar(ArtifactRepositoryBean customNexusServer, String decryptedMvnUri) throws Exception {
         ILibraryManagerService libManager = (ILibraryManagerService) GlobalServiceRegister.getDefault()
                 .getService(ILibraryManagerService.class);
-        File resolved = null;
-        try {
-            resolved = libManager.resolveJar(customNexusServer, decryptedMvnUri);
-        } catch (Exception e) {
-            // hide the user/password in the error
-            String regex = "\\://(.+)\\:(.+)@";
-            String message = e.getMessage();
-            message = message.replaceAll(regex, "://");
-            Exception cause = null;
-            if (e.getCause() != null) {
-                String causeMessage = e.getCause().getMessage();
-                causeMessage = causeMessage.replaceAll(regex, "://");
-                cause = new Exception(causeMessage);
-            }
-            throw new Exception(message, cause);
-        }
-        return resolved;
+        return libManager.resolveJar(customNexusServer, decryptedMvnUri);
     }
 
     /*

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

@@ -5,6 +5,8 @@
 // ============================================================================
 package routines;
 
+import routines.system.RandomUtils;
+
 public class Mathematical {
 
     /**
@@ -381,7 +383,7 @@ public class Mathematical {
      *
      */
     public static double RND(double a) {
-        return Math.random() * a;
+        return RandomUtils.random() * a;
     }
 
     /**

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

@@ -6,10 +6,13 @@
 package routines;
 
 import java.math.BigDecimal;
+import java.util.concurrent.ConcurrentHashMap;
+
+import routines.system.RandomUtils;
 
 public class Numeric {
 
-    private static final java.util.Map<String, Integer> seq_Hash = new java.util.HashMap<String, Integer>();
+    private static final java.util.Map<String, Integer> seq_Hash = new ConcurrentHashMap<>();
 
     /**
      * return an incremented numeric id
@@ -30,13 +33,8 @@ public class Numeric {
      *
      */
     public static Integer sequence(String seqName, int startValue, int step) {
-        if (seq_Hash.containsKey(seqName)) {
-            seq_Hash.put(seqName, seq_Hash.get(seqName) + step);
-            return seq_Hash.get(seqName);
-        } else {
-            seq_Hash.put(seqName, startValue);
-            return startValue;
-        }
+        return seq_Hash.compute(seqName,
+                (String k,  Integer v) -> v == null ? startValue : v + step);
     }
 
     /**
@@ -68,9 +66,7 @@ public class Numeric {
      */
 
     public static void removeSequence(String seqName) {
-        if (seq_Hash.containsKey(seqName)) {
-            seq_Hash.remove(seqName);
-        }
+        seq_Hash.remove(seqName);
     }
 
     /**
@@ -94,7 +90,7 @@ public class Numeric {
         if (max < min) {
             throw new RuntimeException("Max value should be bigger than min value");
         }
-        return ((Long) Math.round(min - 0.5 + (Math.random() * (max - min + 1)))).intValue();
+        return ((Long) Math.round(min - 0.5 + (RandomUtils.random() * (max - min + 1)))).intValue();
     }
 
     /**

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

@@ -5,6 +5,8 @@
 // ============================================================================
 package routines;
 
+import routines.system.RandomUtils;
+
 public class TalendDataGenerator {
 
     /**
@@ -18,7 +20,7 @@ public class TalendDataGenerator {
         String[] list = { "Abraham", "Andrew", "Benjamin", "Bill", "Calvin", "Chester", "Dwight", "Franklin", "George", "Gerald", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
                 "Grover", "Harry", "Herbert", "James", "Jimmy", "John", "Lyndon", "Martin", "Millard", "Richard", "Ronald", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$
                 "Rutherford", "Theodore", "Thomas", "Ulysses", "Warren", "William", "Woodrow", "Zachary" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-        Integer random = 0 + ((Long) Math.round(Math.random() * (list.length - 1 - 0))).intValue();
+        Integer random = 0 + ((Long) Math.round(RandomUtils.random() * (list.length - 1 - 0))).intValue();
         return list[random];
     }
 
@@ -35,7 +37,7 @@ public class TalendDataGenerator {
                 "Madison", "Monroe", "Carter", "Adams", "Kennedy", "Quincy", "Adams", "Tyler", "Johnson", "Van Buren", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
                 "Fillmore", "Nixon", "Reagan", "Hayes", "Roosevelt", "Jefferson", "Grant", "Harding", "Harrison", "Taft", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
                 "McKinley", "Wilson", "Taylor" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        Integer random = 0 + ((Long) Math.round(Math.random() * (list.length - 1 - 0))).intValue();
+        Integer random = 0 + ((Long) Math.round(RandomUtils.random() * (list.length - 1 - 0))).intValue();
         return list[random];
     }
 
@@ -60,7 +62,7 @@ public class TalendDataGenerator {
                 "San Simeon", "San Ysidro Blvd", "Santa Ana Freeway", "Santa Monica Road", "Santa Rosa North", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
                 "Santa Rosa South", "South Highway", "South Roosevelt Drive", "Steele Lane", "Tanger Blvd", "Timberlane Drive", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
                 "Tully Road East", "Via Real", "W. Russell St.", "Westside Freeway", "Woodson Rd." }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        Integer random = 0 + ((Long) Math.round(Math.random() * (list.length - 1 - 0))).intValue();
+        Integer random = 0 + ((Long) Math.round(RandomUtils.random() * (list.length - 1 - 0))).intValue();
         return list[random];
     }
 
@@ -78,7 +80,7 @@ public class TalendDataGenerator {
                 "Saint Paul", "Jackson", "Jefferson City", "Helena", "Lincoln", "Carson City", "Concord", "Trenton", "Santa Fe", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
                 "Albany", "Columbus", "Oklahoma City", "Salem", "Harrisburg", "Providence", "Nashville", "Austin", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
                 "Salt Lake City", "Montpelier", "Richmond", "Charleston", "Olympia", "Madison", "Cheyenne" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
-        Integer random = 0 + ((Long) Math.round(Math.random() * (list.length - 1 - 0))).intValue();
+        Integer random = 0 + ((Long) Math.round(RandomUtils.random() * (list.length - 1 - 0))).intValue();
         return list[random];
     }
 
@@ -96,7 +98,7 @@ public class TalendDataGenerator {
                 "Michigan", "Minnesota", "Mississippi", "Missouri", "Montana", "Nebraska", "Nevada", "New Hampshire", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
                 "New Jersey", "New Mexico", "New York", "Ohio", "Oklahoma", "Oregon", "Pennsylvania", "Rhode Island", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
                 "Tennessee", "Texas", "Utah", "Vermont", "Virginia", "West Virginia", "Washington", "Wisconsin", "Wyoming" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-        Integer random = 0 + ((Long) Math.round(Math.random() * (list.length - 1 - 0))).intValue();
+        Integer random = 0 + ((Long) Math.round(RandomUtils.random() * (list.length - 1 - 0))).intValue();
         return list[random];
     }
 
@@ -111,7 +113,7 @@ public class TalendDataGenerator {
         String[] list = { "AL", "AK", "AZ", "AR", "CA", "NC", "SC", "CO", "CT", "ND", "SD", "DE", "FL", "GA", "HI", "ID", "IL", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$ //$NON-NLS-15$ //$NON-NLS-16$ //$NON-NLS-17$
                 "IN", "IA", "KS", "KY", "LA", "ME", "MD", "MA", "MI", "MN", "MS", "MO", "MT", "NE", "NV", "NH", "NJ", "NM", "NY", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$ //$NON-NLS-15$ //$NON-NLS-16$ //$NON-NLS-17$ //$NON-NLS-18$ //$NON-NLS-19$
                 "OH", "OK", "OR", "PA", "RI", "TN", "TX", "UT", "VT", "VA", "WV", "WA", "WI", "WY" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$
-        Integer random = 0 + ((Long) Math.round(Math.random() * (list.length - 1 - 0))).intValue();
+        Integer random = 0 + ((Long) Math.round(RandomUtils.random() * (list.length - 1 - 0))).intValue();
         return list[random];
     }
 }

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

@@ -19,6 +19,7 @@ import java.util.TimeZone;
 
 import routines.system.FastDateParser;
 import routines.system.LocaleProvider;
+import routines.system.RandomUtils;
 import routines.system.TalendTimestampWithTZ;
 
 public class TalendDate {
@@ -1147,7 +1148,7 @@ public class TalendDate {
         maxCal.set(Calendar.DAY_OF_MONTH, maxDay);
 
         long random = minCal.getTimeInMillis()
-                + (long) ((maxCal.getTimeInMillis() - minCal.getTimeInMillis() + 1) * Math.random());
+                + (long) ((maxCal.getTimeInMillis() - minCal.getTimeInMillis() + 1) * RandomUtils.random());
         return new Date(random);
     }
 

main/plugins/org.talend.librariesmanager/resources/java/routines/system/JobStructureCatcherUtils.java

@@ -129,7 +129,7 @@ public class JobStructureCatcherUtils {
 		this.job_version = jobVersion;
 	}
 
-	public void addMessage(String component_id, String component_name, Map<String, String> component_parameters,
+	private void addMessage(String component_id, String component_name, Map<String, String> component_parameters,
 			List<Map<String, String>> component_schema, String input_connectors, String output_connectors,
 			Map<String, String> connector_name_2_connector_schema, boolean current_connector_as_input,
 			String current_connector_type, String current_connector, String currrent_row_content, long row_count,
@@ -149,7 +149,7 @@ public class JobStructureCatcherUtils {
 				current_connector_type, current_connector, null, 0, total_row_number, start_time, end_time, null);
 	}
 
-	public void addComponentMessage(String component_id, String component_name) {
+	public void addCM(String component_id, String component_name) {
 		this.addMessage(component_id, component_name, null, null, null, null, null, false, null, null,
 				null, 0, 0, 0, 0, null);
 	}

main/plugins/org.talend.librariesmanager/resources/java/routines/system/RandomUtils.java

@@ -0,0 +1,15 @@
+package routines.system;
+
+import java.security.SecureRandom;
+
+public class RandomUtils {
+
+	//lazy init, but no meaning now as only one method
+	private static final class RandomNumberGeneratorHolder {
+		static final SecureRandom randomNumberGenerator = new SecureRandom();
+	}
+
+	public static double random() {
+		return RandomNumberGeneratorHolder.randomNumberGenerator.nextDouble();
+	}
+}

main/plugins/org.talend.librariesmanager/resources/java/routines/system/RunStat.java

@@ -20,6 +20,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class RunStat implements Runnable {
 
@@ -51,7 +52,7 @@ public class RunStat implements Runnable {
 
     public static String TYPE1_CONNECTION = "1";
 
-    public class StatBean {
+    private class StatBean {
 
         private String itemId;
 
@@ -333,7 +334,7 @@ public class RunStat implements Runnable {
 
     private List<String> keysList4Meter = new LinkedList<String>();
 
-    public synchronized StatBean logStatOnConnection(String connectionId, int mode, int nbLine) {
+    public synchronized StatBean log(String connectionId, int mode, int nbLine) {
         StatBean bean;
         String key = connectionId;
         if (connectionId.contains(".")) {
@@ -386,7 +387,178 @@ public class RunStat implements Runnable {
 
         return bean;
     }
+    
+    public synchronized boolean log(Map<String, Object> resourceMap, String iterateId, String connectionUniqueName, int mode, int nbLine, 
+    		JobStructureCatcherUtils jscu, String sourceNodeId, String sourceNodeComponent, String targetNodeId, String targetNodeComponent, String lineType) {
+    	if(resourceMap.get("inIterateVComp") == null || !((Boolean)resourceMap.get("inIterateVComp"))) {
+	    	StatBean bean = log(connectionUniqueName, mode, nbLine);
+	    	jscu.addConnectionMessage(
+	    		sourceNodeId, 
+	    		sourceNodeComponent, 
+			    false,
+			    lineType,
+			    connectionUniqueName+iterateId,
+			    bean.getNbLine(),
+			    bean.getStartTime(),
+			    bean.getEndTime()
+			);
+			
+	 		jscu.addConnectionMessage(
+				targetNodeId, 
+				targetNodeComponent, 
+			    true,
+			    "input",
+			    connectionUniqueName+iterateId,
+			    bean.getNbLine(),
+			    bean.getStartTime(),
+			    bean.getEndTime()
+			);
+	 		
+	 		return true;
+    	} else {
+    		return false;
+    	}
+    }
 
+    /**
+     * work for avoiding the 65535 issue
+     */
+    public synchronized void updateStat(Map<String, Object> resourceMap, String iterateId, int mode, int nbLine, String... connectionUniqueNames) {
+    	if(resourceMap.get("inIterateVComp") == null || !((Boolean)resourceMap.get("inIterateVComp"))){
+	    	for(String connectionUniqueName : connectionUniqueNames) {
+	    		updateStatOnConnection(connectionUniqueName+iterateId, mode, nbLine);
+	    	}
+    	}
+    }
+    
+    /**
+     * work for avoiding the 65535 issue
+     */
+    public synchronized boolean updateStatAndLog(boolean execStat, boolean enableLogStash, Map<String, Object> resourceMap, String iterateId, String connectionUniqueName, int mode, int nbLine, 
+    		JobStructureCatcherUtils jscu, String sourceNodeId, String sourceNodeComponent, String targetNodeId, String targetNodeComponent, String lineType) {
+    	if(execStat) {
+    		updateStat(resourceMap, iterateId, mode, nbLine, connectionUniqueName);
+    	}
+    	
+    	if(enableLogStash) {
+    		return log(resourceMap, iterateId, connectionUniqueName, mode, nbLine, 
+    	    		jscu, sourceNodeId, sourceNodeComponent, targetNodeId, targetNodeComponent, lineType);
+    	}
+    	
+    	
+    	return false;
+    }
+    
+    /**
+     * work for avoiding the 65535 issue
+     */
+    public synchronized void updateStatOnConnection(Map<String, Object> resourceMap, String iterateId, int mode, int nbLine, String... connectionUniqueNames) {
+    	if(resourceMap.get("inIterateVComp") == null){
+	    	for(String connectionUniqueName : connectionUniqueNames) {
+	    		updateStatOnConnection(connectionUniqueName+iterateId, mode, nbLine);
+	    	}
+    	}
+    }
+    
+    /**
+     * work for avoiding the 65535 issue
+     */
+    public synchronized void log(Map<String, Object> resourceMap, String iterateId, int mode, int nbLine, String... connectionUniqueNames) {
+    	if(resourceMap.get("inIterateVComp") == null){
+	    	for(String connectionUniqueName : connectionUniqueNames) {
+	    		log(connectionUniqueName+iterateId, mode, nbLine);
+	    	}
+    	}
+    }
+    
+    /**
+     * work for avoiding the 65535 issue
+     */
+    public synchronized void updateStatAndLog(boolean execStat, boolean enableLogStash, Map<String, Object> resourceMap, String iterateId, int mode, int nbLine, String... connectionUniqueNames) {
+    	if(execStat) {
+    		updateStatOnConnection(resourceMap, iterateId, mode, nbLine, connectionUniqueNames);
+    	}
+    	
+    	if(enableLogStash) {
+    		log(resourceMap, iterateId, mode, nbLine, connectionUniqueNames);
+    	}
+    }
+    
+    /**
+     * work for avoiding the 65535 issue
+     */
+    public synchronized void updateStatOnConnection(String iterateId, int mode, int nbLine, String... connectionUniqueNames) {
+    	for(String connectionUniqueName : connectionUniqueNames) {
+    		updateStatOnConnection(connectionUniqueName+iterateId, mode, nbLine);
+    	}
+    }
+    
+    /**
+     * work for avoiding the 65535 issue
+     */
+    public synchronized void log(String iterateId, int mode, int nbLine, String... connectionUniqueNames) {
+    	for(String connectionUniqueName : connectionUniqueNames) {
+    		log(connectionUniqueName+iterateId, mode, nbLine);
+    	}
+    }
+    
+    /**
+     * work for avoiding the 65535 issue
+     */
+    public synchronized void updateStatAndLog(boolean execStat, boolean enableLogStash, String iterateId, int mode, int nbLine, String... connectionUniqueNames) {
+    	if(execStat) {
+    		updateStatOnConnection(iterateId, mode, nbLine, connectionUniqueNames);
+    	}
+    	
+    	if(enableLogStash) {
+    		log(iterateId, mode, nbLine, connectionUniqueNames);
+    	}
+    }
+    
+    /**
+     * work for avoiding the 65535 issue
+     */
+    public synchronized void updateStatOnConnectionAndLog(Map<String, Object> globalMap, int iterateLoop, String iterateId, boolean execStat, boolean enableLogStash, int nbLine, String... connectionUniqueNames) {
+    	for(String connectionUniqueName : connectionUniqueNames) {
+	    	ConcurrentHashMap<Object, Object> concurrentHashMap = (ConcurrentHashMap) globalMap.get("concurrentHashMap");
+			concurrentHashMap.putIfAbsent(connectionUniqueName + iterateLoop,new java.util.concurrent.atomic.AtomicInteger(0));
+			java.util.concurrent.atomic.AtomicInteger stats = (java.util.concurrent.atomic.AtomicInteger) concurrentHashMap.get(connectionUniqueName + iterateLoop);
+			
+			int step = stats.incrementAndGet()<=1?0:1;
+			
+			if(execStat) {
+				updateStatOnConnection(connectionUniqueName+iterateId, step, nbLine);
+			}
+			
+			if(enableLogStash) {
+				log(connectionUniqueName+iterateId, step, nbLine);
+			}
+    	}
+    }
+    
+    /**
+     * work for avoiding the 65535 issue
+     */
+    public synchronized void updateStatOnConnectionAndLog(Map<String, Object> resourceMap, Map<String, Object> globalMap, int iterateLoop, String iterateId, boolean execStat, boolean enableLogStash, int nbLine, String... connectionUniqueNames) {
+    	for(String connectionUniqueName : connectionUniqueNames) {
+    		if(resourceMap.get("inIterateVComp") == null) {
+		    	ConcurrentHashMap<Object, Object> concurrentHashMap = (ConcurrentHashMap) globalMap.get("concurrentHashMap");
+				concurrentHashMap.putIfAbsent(connectionUniqueName + iterateLoop,new java.util.concurrent.atomic.AtomicInteger(0));
+				java.util.concurrent.atomic.AtomicInteger stats = (java.util.concurrent.atomic.AtomicInteger) concurrentHashMap.get(connectionUniqueName + iterateLoop);
+				
+				int step = stats.incrementAndGet()<=1?0:1;
+				
+				if(execStat) {
+					updateStatOnConnection(connectionUniqueName+iterateId, step, nbLine);
+				}
+				
+				if(enableLogStash) {
+					log(connectionUniqueName+iterateId, step, nbLine);
+				}
+    		}
+    	}
+    }
+    
     public synchronized void updateStatOnConnection(String connectionId, int mode, int nbLine) {
         StatBean bean;
         String key = connectionId;

main/plugins/org.talend.librariesmanager/resources/java/sqltemplates/Snowflake/SnowflakeCreateSourceTable.sqltemplate

@@ -0,0 +1,41 @@
+<%
+EXTRACT(__SCHEMA__);
+String fieldsCreated = "";
+boolean flagCreated=false;
+
+for(int i=0; i < __SCHEMA__.length; i++){
+ if(flagCreated){
+	 fieldsCreated += ",";
+ }else{
+	 flagCreated=true;
+ }
+ 	if( __SCHEMA_DBTYPE__[i].equals("VARCHAR") || __SCHEMA_DBTYPE__[i].equals("VARCHAR2") || __SCHEMA_DBTYPE__[i].equals("CHAR") || __SCHEMA_DBTYPE__[i].equals("BYTE") || __SCHEMA_DBTYPE__[i].equals("VARBYTE")){
+ 		fieldsCreated += (__SCHEMA_NAME__[i] + " " + __SCHEMA_DBTYPE__[i] +" ("+ __SCHEMA_LENGTH__[i] +") ");
+ 	} else if(__SCHEMA_DBTYPE__[i].equals("NUMBER") || __SCHEMA_DBTYPE__[i].equals("DECIMAL")){
+ 		fieldsCreated += (__SCHEMA_NAME__[i] + " " + __SCHEMA_DBTYPE__[i] +" ("+ __SCHEMA_LENGTH__[i] +","+ __SCHEMA_PRECISION__[i] +") ");
+ 	} else {
+ 		fieldsCreated += (__SCHEMA_NAME__[i] + " " + __SCHEMA_DBTYPE__[i]);
+    }
+ 	if(__SCHEMA_NULLABLE__[i].equals("false")){
+ 		fieldsCreated += " NOT NULL";
+ 	}
+}
+String primary = "";
+for(int j=0; j < __SCHEMA__.length; j++){
+	if(__SCHEMA_ISKEY__[j].equals("true") && __SCHEMA_NULLABLE__[j].equals("false")){
+		if(primary.startsWith(" , PRIMARY KEY")) {
+			primary += ","+__SCHEMA_NAME__[j];
+		} else {
+			primary += " , PRIMARY KEY ("+__SCHEMA_NAME__[j];
+		}
+	}
+}
+if(!primary.equals("")){
+	fieldsCreated += primary+")";
+}
+%>
+
+CREATE TABLE <%= __TABLE_NAME__ %>
+(
+<%= fieldsCreated %>
+);

main/plugins/org.talend.librariesmanager/resources/java/sqltemplates/Snowflake/SnowflakeCreateTargetTable.sqltemplate

@@ -0,0 +1,41 @@
+<%
+EXTRACT(__SCHEMA_TARGET__);
+String fieldsCreated = "";
+boolean flagCreated=false;
+
+for(int i=0; i < __SCHEMA_TARGET__.length; i++){
+ if(flagCreated){
+	 fieldsCreated += ",";
+ }else{
+	 flagCreated=true;
+ }
+ 	if( __SCHEMA_TARGET_DBTYPE__[i].equals("VARCHAR") || __SCHEMA_TARGET_DBTYPE__[i].equals("VARCHAR2") || __SCHEMA_TARGET_DBTYPE__[i].equals("CHAR") || __SCHEMA_TARGET_DBTYPE__[i].equals("BYTE") || __SCHEMA_TARGET_DBTYPE__[i].equals("VARBYTE")){
+ 		fieldsCreated += (__SCHEMA_TARGET_NAME__[i] + " " + __SCHEMA_TARGET_DBTYPE__[i] +" ("+ __SCHEMA_TARGET_LENGTH__[i] +") ");
+ 	} else if(__SCHEMA_TARGET_DBTYPE__[i].equals("NUMBER") || __SCHEMA_TARGET_DBTYPE__[i].equals("DECIMAL")){
+ 		fieldsCreated += (__SCHEMA_TARGET_NAME__[i] + " " + __SCHEMA_TARGET_DBTYPE__[i] +" ("+ __SCHEMA_TARGET_LENGTH__[i] +","+ __SCHEMA_TARGET_PRECISION__[i] +") ");
+ 	} else {
+ 		fieldsCreated += (__SCHEMA_TARGET_NAME__[i] + " " + __SCHEMA_TARGET_DBTYPE__[i]);
+    }
+ 	if(__SCHEMA_TARGET_NULLABLE__[i].equals("false")){
+ 		fieldsCreated += " NOT NULL";
+ 	}
+}
+String primary = "";
+for(int j=0; j < __SCHEMA_TARGET__.length; j++){
+	if(__SCHEMA_TARGET_ISKEY__[j].equals("true") && __SCHEMA_TARGET_NULLABLE__[j].equals("false")){
+		if(primary.startsWith(" , PRIMARY KEY")) {
+			primary += ","+__SCHEMA_TARGET_NAME__[j];
+		} else {
+			primary += " , PRIMARY KEY ("+__SCHEMA_TARGET_NAME__[j];
+		}
+	}
+}
+if(!primary.equals("")){
+	fieldsCreated += primary+")";
+}
+%>
+
+CREATE TABLE <%= __TABLE_NAME_TARGET__ %>
+(
+<%= fieldsCreated %>
+);

main/plugins/org.talend.librariesmanager/resources/java/sqltemplates/Snowflake/SnowflakeDropSourceTable.sqltemplate

@@ -0,0 +1,2 @@
+-- DROP SOURCE TABLE
+DROP TABLE <%= __TABLE_NAME__ %>;

main/plugins/org.talend.librariesmanager/resources/java/sqltemplates/Snowflake/SnowflakeDropTargetTable.sqltemplate

@@ -0,0 +1,2 @@
+-- DROP TARGET TABLE
+DROP TABLE <%=__TABLE_NAME_TARGET__%>;

main/plugins/org.talend.librariesmanager/resources/java/sqltemplates/Snowflake/SnowflakeMerge.sqltemplate

@@ -0,0 +1,101 @@
+-- This pattern generates a merge statement for Snowflake
+--(c) 2019 Talend Inc.
+<%
+	EXTRACT(__MERGE_ON__);
+	EXTRACT(__UPDATE_MAPPING__);
+	EXTRACT(__ADDITIONAL_UPDATE_COLUMNS__);
+	EXTRACT(__INSERT_MAPPING__);
+	EXTRACT(__ADDITIONAL_INSERT_COLUMNS__);
+	String dbType = "__DBTYPE__";
+	boolean hasUpdateClause = __USE_UPDATE__;
+	boolean hasAddtionalUpdateColumns = __SPECIFY_ADDITIONAL_UPDATE_COLUMNS__;
+	boolean hasUpdateWhereClause = __SPECIFY_UPDATE_WHERE_CLAUSE__;
+	boolean hasInsertClause = __USE_INSERT__;
+	boolean hasAdditionalInsertColumns = __SPECIFY_ADDITIONAL_INSERT_COLUMNS__;
+	boolean hasInsertWhereClause = __SPECIFY_INSERT_WHERE_CLAUSE__;
+
+	boolean flag = false;
+	String mergeOnStr = "";
+	for(int i=0; i < __MERGE_ON_SRC_COLUMN__.length; i++){
+		if (flag) {
+			mergeOnStr += " AND ";
+		} else {
+			flag = true;
+		}
+		mergeOnStr += (__TARGET_TABLE__ + "." + __MERGE_ON_TRG_COLUMN__[i] + " = " + __SOURCE_TABLE__ + "." + __MERGE_ON_SRC_COLUMN__[i]);
+	}
+
+	String updateStr = "";
+	String updateWhereStr = "";
+	flag = false;
+	if (hasUpdateClause) {
+		for(int i=0; i < __UPDATE_MAPPING_SRC_COLUMN__.length; i++) {
+			if (flag) {
+				updateStr += ",";
+			} else {
+				flag = true;
+			}
+			updateStr += (__TARGET_TABLE__ + "." + __UPDATE_MAPPING_TRG_COLUMN__[i] + " = " + __SOURCE_TABLE__ + "." + __UPDATE_MAPPING_SRC_COLUMN__[i]);
+		}
+		if (hasAddtionalUpdateColumns) {
+			for(int i=0; i < __ADDITIONAL_UPDATE_COLUMNS_TRG_COLUMN_VALUE__.length; i++) {
+				if (flag) {
+					updateStr += ",";
+				} else {
+					flag = true;
+				}
+				updateStr += (__TARGET_TABLE__ + "." + __ADDITIONAL_UPDATE_COLUMNS_TRG_COLUMN_NAME__[i] + " = " + __ADDITIONAL_UPDATE_COLUMNS_TRG_COLUMN_VALUE__[i]);
+			}
+		}
+		if (hasUpdateWhereClause) {
+			updateWhereStr = " " + __UPDATE_WHERE_CLAUSE__ + " ";
+		}
+	}
+
+	String insertColumnsStr = "";
+	String insertValuesStr = "";
+	String insertWhereStr = "";
+	String insertStr = "";
+	flag = false;
+	if (hasInsertClause) {
+		for(int i=0; i < __INSERT_MAPPING_TRG_COLUMN__.length; i++) {
+			if (flag) {
+				insertColumnsStr += ",";
+				insertValuesStr += ",";
+			} else {
+				flag = true;
+			}
+			insertColumnsStr += (__TARGET_TABLE__ + "." + __INSERT_MAPPING_TRG_COLUMN__[i]);
+			insertValuesStr += (__SOURCE_TABLE__ + "." + __INSERT_MAPPING_SRC_COLUMN__[i]);
+		}
+		if (hasAdditionalInsertColumns) {
+			for(int i=0; i < __ADDITIONAL_INSERT_COLUMNS_TRG_COLUMN_NAME__.length; i++) {
+				if (flag) {
+					insertColumnsStr += ",";
+					insertValuesStr += ",";
+				} else {
+					flag = true;
+				}
+				insertColumnsStr += (__TARGET_TABLE__ + "." + __ADDITIONAL_INSERT_COLUMNS_TRG_COLUMN_NAME__[i]);
+				insertValuesStr += (__ADDITIONAL_INSERT_COLUMNS_TRG_COLUMN_VALUE__[i]);
+			}
+		}
+		if (hasInsertWhereClause) {
+			insertWhereStr = " " + __INSERT_WHERE_CLAUSE__ + " ";
+		}
+
+		insertStr = "(" + insertColumnsStr + ") VALUES (" + insertValuesStr + ")";
+	}
+
+	String mergeString = "";
+
+	if (hasInsertClause || hasUpdateClause) {
+		mergeString = "MERGE INTO " + __TARGET_TABLE__ + " USING " + __SOURCE_TABLE__ +
+					  " ON (" + mergeOnStr + ")" +
+					  (hasUpdateClause ? (" WHEN MATCHED "     + (hasUpdateWhereClause ? ("AND " + updateWhereStr) : "") + " THEN UPDATE SET " + updateStr) : "") +
+					  (hasInsertClause ? (" WHEN NOT MATCHED " + (hasInsertWhereClause ? ("AND " + insertWhereStr) : "") + " THEN INSERT "     + insertStr) : "");
+	} else {
+		mergeString = "DELETE FROM " + __TARGET_TABLE__ + " WHERE 1=0";
+	}
+%>
+<%=mergeString%>;

main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/service/LocalLibraryManager.java

@@ -46,7 +46,6 @@ import org.eclipse.core.runtime.preferences.ConfigurationScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.emf.common.util.EMap;
-import org.ops4j.pax.url.mvn.MavenResolver;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
@@ -971,7 +970,7 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
             localMavenUri = mvnUriStatusKey.replace("mvn:", "mvn:" + MavenConstants.LOCAL_RESOLUTION_URL + "!"); //$NON-NLS-1$ //$NON-NLS-2$
         }
         try {
-            File resolvedJar = TalendMavenResolver.getMavenResolver().resolve(localMavenUri);
+            File resolvedJar = TalendMavenResolver.resolve(localMavenUri);
             if (resolvedJar != null) {
                 try {
                     updatePomFileForJar(mvnUriStatusKey);
@@ -993,7 +992,6 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
 
     private void updatePomFileForJar(String mvnUri) throws Exception {
         try {
-            MavenResolver mavenResolver = TalendMavenResolver.getMavenResolver();
             MavenArtifact ma = MavenUrlHelper.parseMvnUrl(mvnUri);
             if (ma != null) {
                 String repositoryUrl = ma.getRepositoryUrl();
@@ -1015,14 +1013,14 @@ public class LocalLibraryManager implements ILibraryManagerService, IChangedLibr
                     File pomFile = null;
                     Exception pomEx = null;
                     try {
-                        pomFile = mavenResolver.resolve(MavenUrlHelper.generateMvnUrl(pomMa));
+                        pomFile = TalendMavenResolver.resolve(MavenUrlHelper.generateMvnUrl(pomMa));
                     } catch (Exception e) {
                         pomEx = e;
                     }
                     if (pomFile == null && classifier != null && !classifier.trim().isEmpty()) {
                         pomMa.setClassifier(classifier);
                         try {
-                            pomFile = mavenResolver.resolve(MavenUrlHelper.generateMvnUrl(pomMa));
+                            pomFile = TalendMavenResolver.resolve(MavenUrlHelper.generateMvnUrl(pomMa));
                         } catch (Exception e) {
                             // ignore
                         }

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

@@ -1672,7 +1672,7 @@ public final class ConnectionContextHelper {
                     }
                 }
                 for (String var : neededVars) {
-                    if (context.getContextParameter(var) != null) {
+                    if (context.containsSameParameterIgnoreCase(var)) {
                         continue;
                     }
                     ContextParameterType param = ContextUtils.getContextParameterTypeByName(type, var);

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/wizard/AbstractForm.java

@@ -36,7 +36,6 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.swt.formtools.Form;
@@ -282,6 +281,10 @@ public abstract class AbstractForm extends Composite {
         this.listener = listener;
     }
 
+    public ICheckListener getListener() {
+        return listener;
+    }
+
     /**
      * update Status of the Wizard OR of the label Status.
      *
@@ -634,4 +637,8 @@ public abstract class AbstractForm extends Composite {
             }
         }
     }
+
+    public ConnectionItem getConnectionItem() {
+        return this.connectionItem;
+    }
 }

main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/wizard/metadata/xml/utils/TreeUtil.java

@@ -19,20 +19,26 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.xerces.xs.XSModel;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.xsd.XSDImport;
 import org.eclipse.xsd.XSDSchema;
+import org.eclipse.xsd.XSDSchemaContent;
 import org.osgi.framework.Bundle;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.runtime.xml.XmlUtil;
@@ -849,6 +855,61 @@ public class TreeUtil {
         return schema;
     }
 
+    /**
+     * There maybe some import reference schema for one main schema, check if they are exist or not DOC jding Comment
+     * method "getNotExistImportSchema".
+     * 
+     * @return
+     */
+    public static Set<String> getNotExistImportSchema(String schemaFileName, XSDSchema xsdSchema) {
+        Set<String> importRefSchemaNotExist = new HashSet<String>();
+        checkImportSchemaExist(importRefSchemaNotExist, schemaFileName, xsdSchema);
+        return importRefSchemaNotExist;
+    }
+
+    private static void checkImportSchemaExist(Set<String> importRefSchemaNotExist, String schemaFileName, XSDSchema xsdSchema) {
+        EList<XSDSchemaContent> contents = xsdSchema.getContents();
+        for (XSDSchemaContent xsdSchemaContent : contents) {
+            if (xsdSchemaContent instanceof XSDImport) {
+                XSDImport xsdImport = (XSDImport) xsdSchemaContent;
+                if (StringUtils.isEmpty(xsdImport.getSchemaLocation())) {
+                    continue;
+                }
+                String schemaLocation = xsdImport.getSchemaLocation();
+                File importFile = new File(schemaLocation);
+                String existedFile = null;
+                if (importFile.isAbsolute()) {
+                    if (!importFile.exists()) {
+                        importRefSchemaNotExist.add(schemaLocation);
+                    } else {
+                        // check deep import schema
+                        checkImportSchemaExist(importRefSchemaNotExist, schemaLocation, getXSDSchema(schemaLocation));
+                    }
+                } else {
+                    
+                    String parent = new File(schemaFileName).getParent();
+                    File importSchemaFile = new File(parent, schemaLocation);
+                    String canonicalPath = null;
+                    try {
+                        canonicalPath = importSchemaFile.getCanonicalPath();
+                    } catch (IOException e) {
+                        ExceptionHandler.process(e);
+                    }
+
+                    if (canonicalPath != null) {
+                        if (!importSchemaFile.exists()) {
+                            importRefSchemaNotExist.add(canonicalPath);
+                        } else {
+                            // check deep import schema
+                            checkImportSchemaExist(importRefSchemaNotExist, canonicalPath, getXSDSchema(canonicalPath));
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+
     private static IPath getTempPath() {
         Project project = ProjectManager.getInstance().getCurrentProject();
         IProject fsProject = null;

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

@@ -1042,6 +1042,9 @@ public class ExtractMetaDataUtils {
                         }
                     }else{
                         String jarName = librairesManagerService.getJarNameFromMavenuri(driverJarPathArg);
+                        if (jarName == null) {
+                            jarName = driverJarPathArg.split("/")[1] + ".jar";
+                        }
                         if (!new File(getJavaLibPath() + jarName).exists()) {
                             librairesManagerService.retrieve(jarName, getJavaLibPath(), new NullProgressMonitor());
                         }

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

@@ -165,7 +165,7 @@ public class ExtractManager {
             tablesToFilter = new ArrayList<String>();
         }
         try {
-            Set<String> availableTableTypes = getAvailableTableTypes(dbMetaData);
+            Set<String> availableTableTypes = getTableTypes(dbMetaData);
             retrieveTables(dbMetaData, schema, medataTables, availableTableTypes, tablesToFilter, limit);
         } catch (SQLException e) {
             ExceptionHandler.process(e);
@@ -193,7 +193,7 @@ public class ExtractManager {
         ResultSet rsTableTypes = dbMetaData.getTableTypes();
         Set<String> availableTableTypes = new HashSet<String>();
         String[] neededTableTypes = { ETableTypes.TABLETYPE_TABLE.getName(), ETableTypes.TABLETYPE_VIEW.getName(),
-                ETableTypes.TABLETYPE_SYNONYM.getName() };
+                ETableTypes.TABLETYPE_SYNONYM.getName(), ETableTypes.EXTERNAL_TABLE.getName()};
 
         try {
             while (rsTableTypes.next()) {
@@ -213,6 +213,48 @@ public class ExtractManager {
         }
         return availableTableTypes;
     }
+    
+    public Set<String> getTableTypes(DatabaseMetaData dbMetaData) throws SQLException{
+    	ResultSet rsTableTypes = dbMetaData.getTableTypes();
+        Set<String> availableTableTypes = new HashSet<String>();
+        String[] neededTableTypes = { ETableTypes.TABLETYPE_TABLE.getName(), ETableTypes.TABLETYPE_VIEW.getName(),
+                ETableTypes.TABLETYPE_SYNONYM.getName(), ETableTypes.EXTERNAL_TABLE.getName()};
+        try {
+            while (rsTableTypes.next()) {
+                // StringUtils.trimToEmpty(name) is because bug 4547
+                String currentTableType = StringUtils.trimToEmpty(rsTableTypes.getString(ExtractManager.TABLE_TYPE));
+                // Because BASE TABLE which UniJDBCClientResultSet gets is not the support type of
+                // UniJDBCDatabaseMetaData, do this so as to dispose bug 17281.
+                if ("BASE TABLE".equalsIgnoreCase(currentTableType)) { //$NON-NLS-1$
+                    currentTableType = ETableTypes.TABLETYPE_TABLE.getName();
+                }
+                if (ArrayUtils.contains(neededTableTypes, currentTableType)) {
+                    availableTableTypes.add(currentTableType);
+                }
+            }
+        } finally {
+            rsTableTypes.close();// See bug 5029 Avoid "Invalid cursor exception"
+        }
+        
+        if (EDatabaseTypeName.HIVE.getDisplayName().equals(dbType.getDbType())) {
+        	availableTableTypes.add(ETableTypes.MANAGED_TABLE.getName());
+        	availableTableTypes.add(ETableTypes.INDEX_TABLE.getName());
+        	availableTableTypes.add(ETableTypes.VIRTUAL_VIEW.getName());
+        } else if (EDatabaseTypeName.SAPHana.getDisplayName().equals(dbType.getDbType())) {
+        	availableTableTypes.add(ETableTypes.TABLETYPE_CALCULATION_VIEW.getName());
+        } else if (EDatabaseTypeName.MYSQL.getDisplayName().equals(dbType.getDbType())) {
+        	availableTableTypes.add(ETableTypes.SYSTEM_TABLE.getName());
+        	availableTableTypes.add(ETableTypes.SYSTEM_VIEW.getName());
+        }else if (EDatabaseTypeName.AS400.getDisplayName().equals(dbType.getDbType())) {
+        	availableTableTypes.add(ETableTypes.TABLETYPE_TABLE.getName());
+            availableTableTypes.add(ETableTypes.EXTERNAL_TABLE.getName());
+            availableTableTypes.add(ETableTypes.TABLETYPE_VIEW.getName());
+            availableTableTypes.add(ETableTypes.TABLETYPE_SYNONYM.getName());
+        }else if (MetadataConnectionUtils.isOracle(dbMetaData)) {
+        	availableTableTypes.add(ETableTypes.TABLETYPE_ALL_SYNONYM.getName());
+        }
+        return availableTableTypes;
+    }
 
     public String getSchema(IMetadataConnection metadataConnection) {
         return metadataConnection != null ? metadataConnection.getSchema() : null;

main/plugins/org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/model/DBConnectionFillerImpl.java

@@ -1739,6 +1739,8 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl<DatabaseConnectio
                                 // obviously
                                 // the sql
                                 // data type it is null and results in a NPE
+                            } else if (typeName.toLowerCase().equals("datetime2")) { //$NON-NLS-1$
+                                dataType = 93;
                             }
                         }
 

main/plugins/org.talend.model/META-INF/MANIFEST.MF

@@ -2,12 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.talend.model;singleton:=true
+Automatic-Module-Name: org.talend.model
 Bundle-Version: 7.3.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.talend.core.model;uses:="org.osgi.framework,org.eclipse.core.runtime",
- org.talend.core.model.component_cache;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.talend.core.model;
+  uses:="org.osgi.framework,
+   org.eclipse.core.runtime",
+ org.talend.core.model.component_cache;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util",
  org.talend.core.model.component_cache.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -24,7 +30,9 @@ Export-Package: org.talend.core.model;uses:="org.osgi.framework,org.eclipse.core
    org.eclipse.emf.ecore.resource,
    org.eclipse.emf.ecore.xmi.impl,
    org.talend.core.model.component_cache",
- org.talend.core.model.expression;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
+ org.talend.core.model.expression;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util",
  org.talend.core.model.expression.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -72,7 +80,9 @@ Export-Package: org.talend.core.model;uses:="org.osgi.framework,org.eclipse.core
    org.talend.designer.core.model.utils.emf.talendfile,
    org.talend.core.model.metadata.builder.connection,
    org.eclipse.gmf.runtime.notation",
- org.talend.core.model.properties.helper;uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecore.resource.impl",
+ org.talend.core.model.properties.helper;
+  uses:="org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.resource.impl",
  org.talend.core.model.properties.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -90,9 +100,16 @@ Export-Package: org.talend.core.model;uses:="org.osgi.framework,org.eclipse.core
    org.talend.core.model.properties,
    org.eclipse.emf.common.notify,
    org.eclipse.emf.common.notify.impl",
- org.talend.core.model.resources;uses:="org.eclipse.emf.ecore,org.talend.core.model.properties",
- org.talend.cwm.constants;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
- org.talend.cwm.constants.impl;uses:="org.eclipse.emf.ecore,org.eclipse.emf.ecore.impl,org.talend.cwm.constants",
+ org.talend.core.model.resources;
+  uses:="org.eclipse.emf.ecore,
+   org.talend.core.model.properties",
+ org.talend.cwm.constants;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util",
+ org.talend.cwm.constants.impl;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.ecore.impl,
+   org.talend.cwm.constants",
  org.talend.cwm.helper;
   uses:="org.eclipse.emf.ecore,
    orgomg.cwm.foundation.businessinformation,
@@ -140,7 +157,9 @@ Export-Package: org.talend.core.model;uses:="org.osgi.framework,org.eclipse.core
    org.eclipse.emf.common.notify.impl,
    org.talend.core.model.metadata.builder.connection,
    org.talend.cwm.relational",
- org.talend.cwm.softwaredeployment;uses:="org.eclipse.emf.ecore,orgomg.cwm.foundation.softwaredeployment",
+ org.talend.cwm.softwaredeployment;
+  uses:="org.eclipse.emf.ecore,
+   orgomg.cwm.foundation.softwaredeployment",
  org.talend.cwm.softwaredeployment.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -153,7 +172,10 @@ Export-Package: org.talend.core.model;uses:="org.osgi.framework,org.eclipse.core
    org.eclipse.emf.common.notify,
    org.eclipse.emf.common.notify.impl,
    org.talend.cwm.softwaredeployment",
- org.talend.cwm.xml;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util,orgomg.cwm.resource.xml",
+ org.talend.cwm.xml;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util,
+   orgomg.cwm.resource.xml",
  org.talend.cwm.xml.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -168,7 +190,9 @@ Export-Package: org.talend.core.model;uses:="org.osgi.framework,org.eclipse.core
    org.eclipse.emf.common.notify.impl,
    orgomg.cwm.resource.xml,
    org.talend.cwm.xml",
- org.talend.designer.business.model.business;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
+ org.talend.designer.business.model.business;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util",
  org.talend.designer.business.model.business.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -180,7 +204,10 @@ Export-Package: org.talend.core.model;uses:="org.osgi.framework,org.eclipse.core
    org.talend.designer.business.model.business,
    org.eclipse.emf.common.notify,
    org.eclipse.emf.common.notify.impl",
- org.talend.designer.core.model.utils.emf.component;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
+ org.talend.designer.core.model.utils.emf.component;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util",
  org.talend.designer.core.model.utils.emf.component.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -199,7 +226,10 @@ Export-Package: org.talend.core.model;uses:="org.osgi.framework,org.eclipse.core
    org.eclipse.emf.ecore.resource,
    org.eclipse.emf.ecore.util,
    org.talend.designer.core.model.utils.emf.component",
- org.talend.designer.core.model.utils.emf.talendfile;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util,org.eclipse.emf.ecore.util",
+ org.talend.designer.core.model.utils.emf.talendfile;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util,
+   org.eclipse.emf.ecore.util",
  org.talend.designer.core.model.utils.emf.talendfile.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -218,7 +248,10 @@ Export-Package: org.talend.core.model;uses:="org.osgi.framework,org.eclipse.core
    org.eclipse.emf.common.notify,
    org.eclipse.emf.common.notify.impl,
    org.eclipse.emf.ecore.util",
- org.talend.designer.joblet.model;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util,org.talend.designer.core.model.utils.emf.talendfile",
+ org.talend.designer.joblet.model;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util,
+   org.talend.designer.core.model.utils.emf.talendfile",
  org.talend.designer.joblet.model.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,
@@ -237,14 +270,18 @@ Export-Package: org.talend.core.model;uses:="org.osgi.framework,org.eclipse.core
    org.eclipse.emf.ecore.resource,
    org.eclipse.emf.common.notify,
    org.eclipse.emf.common.notify.impl",
- org.talend.model.bridge;uses:="org.talend.core.model.properties,org.eclipse.core.resources",
+ org.talend.model.bridge;
+  uses:="org.talend.core.model.properties,
+   org.eclipse.core.resources",
  org.talend.model.emf;
   uses:="org.eclipse.emf.common.util,
    org.talend.commons.runtime.model.emf,
    org.eclipse.emf.ecore.resource,
    org.eclipse.emf.ecore.xmi.impl,
    org.eclipse.emf.ecore.xmi",
- org.talend.model.recyclebin;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
+ org.talend.model.recyclebin;
+  uses:="org.eclipse.emf.ecore,
+   org.eclipse.emf.common.util",
  org.talend.model.recyclebin.impl;
   uses:="org.eclipse.emf.ecore,
    org.eclipse.emf.ecore.impl,

main/plugins/org.talend.model/model/metadata.ecore

@@ -725,6 +725,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="Proxypassword" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="CustomEncode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="UseFileNameEncoding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Timeout" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BRMSConnection" eSuperTypes="#//Connection">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlField" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

main/plugins/org.talend.model/model/metadata.genmodel

@@ -477,6 +477,7 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//FTPConnection/Proxypassword"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//FTPConnection/CustomEncode"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//FTPConnection/UseFileNameEncoding"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//FTPConnection/Timeout"/>
     </genClasses>
     <genClasses ecoreClass="metadata.ecore#//BRMSConnection">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//BRMSConnection/xmlField"/>

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/AbstractMetadataObject.java

@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties <em>Properties</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getId <em>Id</em>}</li>
@@ -29,7 +30,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#isSynchronised <em>Synchronised</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#isDivergency <em>Divergency</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAbstractMetadataObject()
  * @model abstract="true"
@@ -57,6 +57,7 @@ public interface AbstractMetadataObject extends ModelElement {
      * @model default="" dataType="org.talend.core.model.metadata.builder.connection.Map" required="true"
      * @generated
      */
+    @Deprecated
     HashMap getProperties();
 
     /**
@@ -64,8 +65,10 @@ public interface AbstractMetadataObject extends ModelElement {
      * <!-- begin-user-doc --> <!-- end-user-doc -->
      * @param value the new value of the '<em>Properties</em>' attribute.
      * @see #getProperties()
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      */
+    @Deprecated
     void setProperties(HashMap value);
 
     /**

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/AdditionalConnectionProperty.java

@@ -11,11 +11,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty#getPropertyName <em>Property Name</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getAdditionalConnectionProperty()
  * @model

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/BRMSConnection.java

@@ -15,6 +15,7 @@ import java.util.ArrayList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getXmlField <em>Xml Field</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getUrlName <em>Url Name</em>}</li>
@@ -26,7 +27,6 @@ import java.util.ArrayList;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getLoop <em>Loop</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.BRMSConnection#getPackage <em>Package</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getBRMSConnection()
  * @model

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/CDCConnection.java

@@ -20,11 +20,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.CDCConnection#getConnection <em>Connection</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.CDCConnection#getCdcTypes <em>Cdc Types</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCConnection()
  * @model

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/CDCType.java

@@ -14,13 +14,13 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.CDCType#getLinkDB <em>Link DB</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.CDCType#getSubscribers <em>Subscribers</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.CDCType#getCdcConnection <em>Cdc Connection</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.CDCType#getJournalName <em>Journal Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getCDCType()
  * @model

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Concept.java

@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.Concept#getLoopExpression <em>Loop Expression</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.Concept#getLoopLimit <em>Loop Limit</em>}</li>
@@ -27,7 +28,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.talend.core.model.metadata.builder.connection.Concept#getConceptType <em>Concept Type</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.Concept#getXPathPrefix <em>XPath Prefix</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConcept()
  * @model

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/ConceptTarget.java

@@ -14,12 +14,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getSchema <em>Schema</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getTargetName <em>Target Name</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConceptTarget#getRelativeLoopExpression <em>Relative Loop Expression</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConceptTarget()
  * @model

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/ConditionType.java

@@ -14,13 +14,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConditionType#getInputColumn <em>Input Column</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConditionType#getFunction <em>Function</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConditionType#getOperator <em>Operator</em>}</li>
  *   <li>{@link org.talend.core.model.metadata.builder.connection.ConditionType#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getConditionType()
  * @model

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/ConnectionPackage.java

@@ -233,9 +233,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int ABSTRACT_METADATA_OBJECT__PROPERTIES = CorePackage.MODEL_ELEMENT_FEATURE_COUNT + 0;
 
     /**
@@ -471,9 +473,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int METADATA__PROPERTIES = ABSTRACT_METADATA_OBJECT__PROPERTIES;
 
     /**
@@ -717,9 +721,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int CONNECTION__PROPERTIES = ABSTRACT_METADATA_OBJECT__PROPERTIES;
 
     /**
@@ -1103,9 +1109,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int METADATA_COLUMN__PROPERTIES = ABSTRACT_METADATA_OBJECT__PROPERTIES;
 
     /**
@@ -1342,9 +1350,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Default Value</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDefaultValue() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int METADATA_COLUMN__DEFAULT_VALUE = ABSTRACT_METADATA_OBJECT_FEATURE_COUNT + 22;
 
     /**
@@ -1382,9 +1392,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Original Field</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getOriginalField() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int METADATA_COLUMN__ORIGINAL_FIELD = ABSTRACT_METADATA_OBJECT_FEATURE_COUNT + 27;
 
     /**
@@ -1615,9 +1627,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int METADATA_TABLE__PROPERTIES = ABSTRACT_METADATA_OBJECT__PROPERTIES;
 
     /**
@@ -1816,9 +1830,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Source Name</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getSourceName() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int METADATA_TABLE__SOURCE_NAME = ABSTRACT_METADATA_OBJECT_FEATURE_COUNT + 17;
 
     /**
@@ -1856,9 +1872,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Connection</b></em>' reference.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getConnection() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int METADATA_TABLE__CONNECTION = ABSTRACT_METADATA_OBJECT_FEATURE_COUNT + 22;
 
     /**
@@ -2055,9 +2073,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int FILE_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -2606,9 +2626,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int DELIMITED_FILE_CONNECTION__PROPERTIES = FILE_CONNECTION__PROPERTIES;
 
     /**
@@ -3174,9 +3196,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int POSITIONAL_FILE_CONNECTION__PROPERTIES = FILE_CONNECTION__PROPERTIES;
 
     /**
@@ -3725,9 +3749,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int EBCDIC_CONNECTION__PROPERTIES = FILE_CONNECTION__PROPERTIES;
 
     /**
@@ -4319,9 +4345,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int MDM_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -4795,9 +4823,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int DATABASE_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -5393,9 +5423,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAP_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -5917,9 +5949,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAP_FUNCTION_UNIT__PROPERTIES = ABSTRACT_METADATA_OBJECT__PROPERTIES;
 
     /**
@@ -6253,9 +6287,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAPI_DOC_UNIT__PROPERTIES = ABSTRACT_METADATA_OBJECT__PROPERTIES;
 
     /**
@@ -6548,9 +6584,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAP_FUNCTION_PARAMETER_COLUMN__PROPERTIES = ABSTRACT_METADATA_OBJECT__PROPERTIES;
 
     /**
@@ -6836,9 +6874,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAP_FUNCTION_PARAMETER_TABLE__PROPERTIES = ABSTRACT_METADATA_OBJECT__PROPERTIES;
 
     /**
@@ -7083,9 +7123,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int INPUT_SAP_FUNCTION_PARAMETER_TABLE__PROPERTIES = SAP_FUNCTION_PARAMETER_TABLE__PROPERTIES;
 
     /**
@@ -7339,9 +7381,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int OUTPUT_SAP_FUNCTION_PARAMETER_TABLE__PROPERTIES = SAP_FUNCTION_PARAMETER_TABLE__PROPERTIES;
 
     /**
@@ -7595,9 +7639,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int REGEXP_FILE_CONNECTION__PROPERTIES = FILE_CONNECTION__PROPERTIES;
 
     /**
@@ -8155,9 +8201,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int XML_FILE_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -8732,9 +8780,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int QUERY__PROPERTIES = ABSTRACT_METADATA_OBJECT__PROPERTIES;
 
     /**
@@ -8994,9 +9044,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int LDIF_FILE_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -9420,9 +9472,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int FILE_EXCEL_CONNECTION__PROPERTIES = FILE_CONNECTION__PROPERTIES;
 
     /**
@@ -10110,9 +10164,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int GENERIC_SCHEMA_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -10513,9 +10569,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int LDAP_SCHEMA_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -11086,9 +11144,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int WSDL_SCHEMA_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -11606,9 +11666,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SALESFORCE_SCHEMA_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -12230,9 +12292,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int CDC_TYPE__PROPERTIES = ABSTRACT_METADATA_OBJECT__PROPERTIES;
 
     /**
@@ -12500,9 +12564,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SUBSCRIBER_TABLE__PROPERTIES = RelationalPackage.TD_TABLE__PROPERTIES;
 
     /**
@@ -12701,9 +12767,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Source Name</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getSourceName() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SUBSCRIBER_TABLE__SOURCE_NAME = RelationalPackage.TD_TABLE__SOURCE_NAME;
 
     /**
@@ -12741,9 +12809,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Connection</b></em>' reference.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getConnection() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SUBSCRIBER_TABLE__CONNECTION = RelationalPackage.TD_TABLE__CONNECTION;
 
     /**
@@ -13006,9 +13076,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAP_TEST_INPUT_PARAMETER_TABLE__PROPERTIES = SAP_FUNCTION_PARAMETER_TABLE__PROPERTIES;
 
     /**
@@ -13262,9 +13334,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int CONCEPT__PROPERTIES = RelationalPackage.TD_TABLE__PROPERTIES;
 
     /**
@@ -13463,9 +13537,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Source Name</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getSourceName() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int CONCEPT__SOURCE_NAME = RelationalPackage.TD_TABLE__SOURCE_NAME;
 
     /**
@@ -13503,9 +13579,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Connection</b></em>' reference.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getConnection() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int CONCEPT__CONNECTION = RelationalPackage.TD_TABLE__CONNECTION;
 
     /**
@@ -13882,9 +13960,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int HL7_CONNECTION__PROPERTIES = FILE_CONNECTION__PROPERTIES;
 
     /**
@@ -14469,9 +14549,11 @@ public interface ConnectionPackage extends EPackage {
     /**
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int HEADER_FOOTER_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -15306,9 +15388,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int FTP_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -15698,6 +15782,15 @@ public interface ConnectionPackage extends EPackage {
      */
     int FTP_CONNECTION__USE_FILE_NAME_ENCODING = CONNECTION_FEATURE_COUNT + 19;
 
+    /**
+     * The feature id for the '<em><b>Timeout</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    int FTP_CONNECTION__TIMEOUT = CONNECTION_FEATURE_COUNT + 20;
+
     /**
      * The number of structural features of the '<em>FTP Connection</em>' class.
      * <!-- begin-user-doc -->
@@ -15705,7 +15798,7 @@ public interface ConnectionPackage extends EPackage {
      * @generated
      * @ordered
      */
-    int FTP_CONNECTION_FEATURE_COUNT = CONNECTION_FEATURE_COUNT + 20;
+    int FTP_CONNECTION_FEATURE_COUNT = CONNECTION_FEATURE_COUNT + 21;
 
     /**
      * The meta object id for the '{@link org.talend.core.model.metadata.builder.connection.impl.BRMSConnectionImpl <em>BRMS Connection</em>}' class.
@@ -15892,9 +15985,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int BRMS_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -16389,9 +16484,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int VALIDATION_RULES_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -17021,9 +17118,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int EDIFACT_CONNECTION__PROPERTIES = CONNECTION__PROPERTIES;
 
     /**
@@ -17454,9 +17553,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int EDIFACT_COLUMN__PROPERTIES = METADATA_COLUMN__PROPERTIES;
 
     /**
@@ -17715,9 +17816,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Default Value</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDefaultValue() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int EDIFACT_COLUMN__DEFAULT_VALUE = METADATA_COLUMN__DEFAULT_VALUE;
 
     /**
@@ -17760,9 +17863,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Original Field</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getOriginalField() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int EDIFACT_COLUMN__ORIGINAL_FIELD = METADATA_COLUMN__ORIGINAL_FIELD;
 
     /**
@@ -18022,9 +18127,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SALESFORCE_MODULE_UNIT__PROPERTIES = ABSTRACT_METADATA_OBJECT__PROPERTIES;
 
     /**
@@ -18358,9 +18465,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAP_TABLE__PROPERTIES = METADATA_TABLE__PROPERTIES;
 
     /**
@@ -18574,9 +18683,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Source Name</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getSourceName() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAP_TABLE__SOURCE_NAME = METADATA_TABLE__SOURCE_NAME;
 
     /**
@@ -18619,9 +18730,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Connection</b></em>' reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getConnection() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAP_TABLE__CONNECTION = METADATA_TABLE__CONNECTION;
 
     /**
@@ -18826,9 +18939,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAP_TABLE_FIELD__PROPERTIES = METADATA_COLUMN__PROPERTIES;
 
     /**
@@ -19087,9 +19202,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Default Value</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDefaultValue() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAP_TABLE_FIELD__DEFAULT_VALUE = METADATA_COLUMN__DEFAULT_VALUE;
 
     /**
@@ -19132,9 +19249,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Original Field</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getOriginalField() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAP_TABLE_FIELD__ORIGINAL_FIELD = METADATA_COLUMN__ORIGINAL_FIELD;
 
     /**
@@ -19559,9 +19678,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAPBW_TABLE__PROPERTIES = SAP_TABLE__PROPERTIES;
 
     /**
@@ -19775,9 +19896,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Source Name</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getSourceName() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAPBW_TABLE__SOURCE_NAME = SAP_TABLE__SOURCE_NAME;
 
     /**
@@ -19820,9 +19943,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Connection</b></em>' reference.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getConnection() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAPBW_TABLE__CONNECTION = SAP_TABLE__CONNECTION;
 
     /**
@@ -20082,9 +20207,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Properties</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAPBW_TABLE_FIELD__PROPERTIES = SAP_TABLE_FIELD__PROPERTIES;
 
     /**
@@ -20343,9 +20470,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Default Value</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDefaultValue() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAPBW_TABLE_FIELD__DEFAULT_VALUE = SAP_TABLE_FIELD__DEFAULT_VALUE;
 
     /**
@@ -20388,9 +20517,11 @@ public interface ConnectionPackage extends EPackage {
      * The feature id for the '<em><b>Original Field</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getOriginalField() model documentation} for details.
      * @generated
      * @ordered
      */
+    @Deprecated
     int SAPBW_TABLE_FIELD__ORIGINAL_FIELD = SAP_TABLE_FIELD__ORIGINAL_FIELD;
 
     /**
@@ -20712,8 +20843,10 @@ public interface ConnectionPackage extends EPackage {
      * @return the meta object for the attribute '<em>Default Value</em>'.
      * @see org.talend.core.model.metadata.builder.connection.MetadataColumn#getDefaultValue()
      * @see #getMetadataColumn()
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDefaultValue() model documentation} for details.
      * @generated
      */
+    @Deprecated
     EAttribute getMetadataColumn_DefaultValue();
 
     /**
@@ -20767,8 +20900,10 @@ public interface ConnectionPackage extends EPackage {
      * @return the meta object for the attribute '<em>Original Field</em>'.
      * @see org.talend.core.model.metadata.builder.connection.MetadataColumn#getOriginalField()
      * @see #getMetadataColumn()
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getOriginalField() model documentation} for details.
      * @generated
      */
+    @Deprecated
     EAttribute getMetadataColumn_OriginalField();
 
     /**
@@ -20841,8 +20976,10 @@ public interface ConnectionPackage extends EPackage {
      * @return the meta object for the attribute '<em>Properties</em>'.
      * @see org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties()
      * @see #getAbstractMetadataObject()
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
      * @generated
      */
+    @Deprecated
     EAttribute getAbstractMetadataObject_Properties();
 
     /**
@@ -20928,6 +21065,7 @@ public interface ConnectionPackage extends EPackage {
      * @see #getMetadataTable()
      * @generated
      */
+    @Deprecated
     EAttribute getMetadataTable_SourceName();
 
     /**
@@ -20984,6 +21122,7 @@ public interface ConnectionPackage extends EPackage {
      * @see #getMetadataTable()
      * @generated
      */
+    @Deprecated
     EReference getMetadataTable_Connection();
 
     /**
@@ -24418,6 +24557,17 @@ public interface ConnectionPackage extends EPackage {
      */
     EAttribute getFTPConnection_UseFileNameEncoding();
 
+    /**
+     * Returns the meta object for the attribute '{@link org.talend.core.model.metadata.builder.connection.FTPConnection#getTimeout <em>Timeout</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Timeout</em>'.
+     * @see org.talend.core.model.metadata.builder.connection.FTPConnection#getTimeout()
+     * @see #getFTPConnection()
+     * @generated
+     */
+    EAttribute getFTPConnection_Timeout();
+
     /**
      * Returns the meta object for class '{@link org.talend.core.model.metadata.builder.connection.BRMSConnection <em>BRMS Connection</em>}'.
      * <!-- begin-user-doc -->
@@ -24752,6 +24902,7 @@ public interface ConnectionPackage extends EPackage {
      * @see java.util.Map.Entry
      * @model keyDataType="org.eclipse.emf.ecore.EString"
      *        valueDataType="org.eclipse.emf.ecore.EString"
+     *        annotation="MapEntry"
      * @generated
      */
     EClass getAdditionalProperties();
@@ -25498,8 +25649,10 @@ public interface ConnectionPackage extends EPackage {
          * The meta object literal for the '<em><b>Default Value</b></em>' attribute feature.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
+         * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDefaultValue() model documentation} for details.
          * @generated
          */
+        @Deprecated
         EAttribute METADATA_COLUMN__DEFAULT_VALUE = eINSTANCE.getMetadataColumn_DefaultValue();
 
         /**
@@ -25538,8 +25691,10 @@ public interface ConnectionPackage extends EPackage {
          * The meta object literal for the '<em><b>Original Field</b></em>' attribute feature.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
+         * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getOriginalField() model documentation} for details.
          * @generated
          */
+        @Deprecated
         EAttribute METADATA_COLUMN__ORIGINAL_FIELD = eINSTANCE.getMetadataColumn_OriginalField();
 
         /**
@@ -25595,8 +25750,10 @@ public interface ConnectionPackage extends EPackage {
          * The meta object literal for the '<em><b>Properties</b></em>' attribute feature.
          * <!-- begin-user-doc --> <!--
          * end-user-doc -->
+         * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
          * @generated
          */
+        @Deprecated
         EAttribute ABSTRACT_METADATA_OBJECT__PROPERTIES = eINSTANCE.getAbstractMetadataObject_Properties();
 
         /**
@@ -25660,8 +25817,10 @@ public interface ConnectionPackage extends EPackage {
          * The meta object literal for the '<em><b>Source Name</b></em>' attribute feature.
          * <!-- begin-user-doc --> <!--
          * end-user-doc -->
+         * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getSourceName() model documentation} for details.
          * @generated
          */
+        @Deprecated
         EAttribute METADATA_TABLE__SOURCE_NAME = eINSTANCE.getMetadataTable_SourceName();
 
         /**
@@ -25700,8 +25859,10 @@ public interface ConnectionPackage extends EPackage {
          * The meta object literal for the '<em><b>Connection</b></em>' reference feature.
          * <!-- begin-user-doc --> <!--
          * end-user-doc -->
+         * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getConnection() model documentation} for details.
          * @generated
          */
+        @Deprecated
         EReference METADATA_TABLE__CONNECTION = eINSTANCE.getMetadataTable_Connection();
 
         /**
@@ -28338,6 +28499,14 @@ public interface ConnectionPackage extends EPackage {
          */
         EAttribute FTP_CONNECTION__USE_FILE_NAME_ENCODING = eINSTANCE.getFTPConnection_UseFileNameEncoding();
 
+        /**
+         * The meta object literal for the '<em><b>Timeout</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        EAttribute FTP_CONNECTION__TIMEOUT = eINSTANCE.getFTPConnection_Timeout();
+
         /**
          * The meta object literal for the '{@link org.talend.core.model.metadata.builder.connection.impl.BRMSConnectionImpl <em>BRMS Connection</em>}' class.
          * <!-- begin-user-doc -->

main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/DatabaseConnection.java

@@ -750,7 +750,7 @@ public interface DatabaseConnection extends Connection {
      * <!-- end-user-doc -->
      * @return the value of the '<em>Parameters</em>' map.
      * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getDatabaseConnection_Parameters()
-     * @model mapType="org.talend.core.model.metadata.builder.connection.AdditionalProperties<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
+     * @model mapType="org.talend.core.model.metadata.builder.connection.AdditionalProperties&lt;org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString&gt;"
      * @generated
      */
     EMap<String, String> getParameters();