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

Revert "bugfix(TUP-24029):[FTP] Connection wizard add timeout property (#2684 )"
This reverts commit 992e01de37.
2019-09-20 11:13:01 +08:00 · 2019-09-19 18:16:28 +08:00 · 2019-09-19 15:06:30 +08:00 · 2019-09-18 18:34:00 +08:00 · 2019-09-18 18:25:30 +08:00 · 2019-09-18 18:21:22 +08:00
181 changed files with 1649 additions and 1031 deletions
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/JobContext.java
+++ b/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
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java
@@ -2845,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())) {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/IContext.java
+++ b/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);
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/ProcessUtils.java
+++ b/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) {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/maven/MavenConstants.java
+++ b/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
     */
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/codegen/AbstractRoutineSynchronizer.java
+++ b/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);
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/core/IDesignerCoreService.java
+++ b/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);
+
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryConstants.java
+++ b/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$
--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextNebulaGridComposite.java
+++ b/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;
                }
            }
--- a/main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/SelectRepositoryContextDialog.java
+++ b/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;
        }
--- a/main/plugins/org.talend.core/src/main/java/org/talend/core/CoreService.java
+++ b/main/plugins/org.talend.core/src/main/java/org/talend/core/CoreService.java
@@ -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
--- a/main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java
+++ b/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()) {
@@ -1231,14 +1231,24 @@ 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)) {
                    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);
+                    }
+                }
+            }
        } catch (CoreException e) {
            ExceptionHandler.process(e);
        }
--- a/main/plugins/org.talend.designer.maven.ui/src/main/java/messages.properties
+++ b/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
--- a/main/plugins/org.talend.designer.maven.ui/src/main/java/org/talend/designer/maven/ui/setting/project/page/MavenProjectSettingPage.java
+++ b/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;
 	}
--- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/AggregatorPomsHelper.java
+++ b/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);
        }
@@ -710,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() {
@@ -841,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()) {
@@ -851,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
     *
@@ -879,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 =
--- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomIdsHelper.java
+++ b/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();
--- a/main/plugins/org.talend.librariesmanager.ui/src/main/java/org/talend/librariesmanager/ui/dialogs/ConfigModuleDialog.java
+++ b/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;
    }

--- a/main/plugins/org.talend.librariesmanager/resources/java/routines/Mathematical.java
+++ b/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;
    }

    /**
--- a/main/plugins/org.talend.librariesmanager/resources/java/routines/Numeric.java
+++ b/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();
    }

    /**
--- a/main/plugins/org.talend.librariesmanager/resources/java/routines/TalendDataGenerator.java
+++ b/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];
    }
 }
--- a/main/plugins/org.talend.librariesmanager/resources/java/routines/TalendDate.java
+++ b/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);
    }

--- a/main/plugins/org.talend.librariesmanager/resources/java/routines/system/RandomUtils.java
+++ b/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();
+	}
+}
--- a/main/plugins/org.talend.metadata.managment.ui/src/main/java/org/talend/metadata/managment/ui/utils/ConnectionContextHelper.java
+++ b/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);
--- a/main/plugins/org.talend.model/META-INF/MANIFEST.MF
+++ b/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,
--- a/main/plugins/org.talend.model/model/metadata.ecore
+++ b/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"/>
--- a/main/plugins/org.talend.model/model/metadata.genmodel
+++ b/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"/>
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/AbstractMetadataObject.java
+++ b/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);

    /**
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/AdditionalConnectionProperty.java
+++ b/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
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/BRMSConnection.java
+++ b/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
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/CDCConnection.java
+++ b/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
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/CDCType.java
+++ b/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
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Concept.java
+++ b/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
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/ConceptTarget.java
+++ b/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
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/ConditionType.java
+++ b/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
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/ConnectionPackage.java
+++ b/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 -->
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/DatabaseConnection.java
+++ b/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();
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/DelimitedFileConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/DelimitedFileConnection.java
@@ -12,11 +12,11 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.DelimitedFileConnection#getFieldSeparatorType <em>Field Separator Type</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.DelimitedFileConnection#isSplitRecord <em>Split Record</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getDelimitedFileConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/EDIFACTColumn.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/EDIFACTColumn.java
@@ -12,11 +12,11 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.EDIFACTColumn#getEDIColumnName <em>EDI Column Name</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.EDIFACTColumn#getEDIXpath <em>EDI Xpath</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTColumn()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/EDIFACTConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/EDIFACTConnection.java
@@ -14,12 +14,12 @@ import org.eclipse.emf.common.util.EList;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.EDIFACTConnection#getXmlName <em>Xml Name</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.EDIFACTConnection#getFileName <em>File Name</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.EDIFACTConnection#getXmlPath <em>Xml Path</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEDIFACTConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/EbcdicConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/EbcdicConnection.java
@@ -12,6 +12,7 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getMidFile <em>Mid File</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getDataFile <em>Data File</em>}</li>
@@ -19,7 +20,6 @@ package org.talend.core.model.metadata.builder.connection;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getSourceFileStart <em>Source File Start</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.EbcdicConnection#getSourceFileEnd <em>Source File End</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getEbcdicConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Escape.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Escape.java
@@ -90,6 +90,8 @@ public enum Escape implements Enumerator {
     * Returns the '<em><b>Escape</b></em>' literal with the specified literal value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param literal the literal.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static Escape get(String literal) {
@@ -106,6 +108,8 @@ public enum Escape implements Enumerator {
     * Returns the '<em><b>Escape</b></em>' literal with the specified name.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param name the name.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static Escape getByName(String name) {
@@ -122,6 +126,8 @@ public enum Escape implements Enumerator {
     * Returns the '<em><b>Escape</b></em>' literal with the specified integer value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param value the integer value.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static Escape get(int value) {
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/FTPConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/FTPConnection.java
@@ -34,6 +34,7 @@ package org.talend.core.model.metadata.builder.connection;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.FTPConnection#getProxypassword <em>Proxypassword</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.FTPConnection#getCustomEncode <em>Custom Encode</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.FTPConnection#isUseFileNameEncoding <em>Use File Name Encoding</em>}</li>
+ *   <li>{@link org.talend.core.model.metadata.builder.connection.FTPConnection#getTimeout <em>Timeout</em>}</li>
 * </ul>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFTPConnection()
@@ -562,4 +563,30 @@ public interface FTPConnection extends Connection {
     */
    void setUseFileNameEncoding(boolean value);

+    /**
+     * Returns the value of the '<em><b>Timeout</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Timeout</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Timeout</em>' attribute.
+     * @see #setTimeout(long)
+     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFTPConnection_Timeout()
+     * @model
+     * @generated
+     */
+    long getTimeout();
+
+    /**
+     * Sets the value of the '{@link org.talend.core.model.metadata.builder.connection.FTPConnection#getTimeout <em>Timeout</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Timeout</em>' attribute.
+     * @see #getTimeout()
+     * @generated
+     */
+    void setTimeout(long value);
+
 } // FTPConnection
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/FieldSeparator.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/FieldSeparator.java
@@ -231,6 +231,8 @@ public enum FieldSeparator implements Enumerator {
     * Returns the '<em><b>Field Separator</b></em>' literal with the specified literal value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param literal the literal.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static FieldSeparator get(String literal) {
@@ -247,6 +249,8 @@ public enum FieldSeparator implements Enumerator {
     * Returns the '<em><b>Field Separator</b></em>' literal with the specified name.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param name the name.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static FieldSeparator getByName(String name) {
@@ -263,6 +267,8 @@ public enum FieldSeparator implements Enumerator {
     * Returns the '<em><b>Field Separator</b></em>' literal with the specified integer value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param value the integer value.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static FieldSeparator get(int value) {
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/FileConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/FileConnection.java
@@ -12,6 +12,7 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.FileConnection#getServer <em>Server</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.FileConnection#getFilePath <em>File Path</em>}</li>
@@ -34,7 +35,6 @@ package org.talend.core.model.metadata.builder.connection;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.FileConnection#getTextEnclosure <em>Text Enclosure</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.FileConnection#isCsvOption <em>Csv Option</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileConnection()
 * @model abstract="true"
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/FileExcelConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/FileExcelConnection.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.common.util.EList;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getSheetName <em>Sheet Name</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getSheetColumns <em>Sheet Columns</em>}</li>
@@ -27,7 +28,6 @@ import org.eclipse.emf.common.util.EList;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getSheetList <em>Sheet List</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.FileExcelConnection#getGenerationMode <em>Generation Mode</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getFileExcelConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/FileFormat.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/FileFormat.java
@@ -114,6 +114,8 @@ public enum FileFormat implements Enumerator {
     * Returns the '<em><b>File Format</b></em>' literal with the specified literal value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param literal the literal.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static FileFormat get(String literal) {
@@ -130,6 +132,8 @@ public enum FileFormat implements Enumerator {
     * Returns the '<em><b>File Format</b></em>' literal with the specified name.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param name the name.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static FileFormat getByName(String name) {
@@ -146,6 +150,8 @@ public enum FileFormat implements Enumerator {
     * Returns the '<em><b>File Format</b></em>' literal with the specified integer value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param value the integer value.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static FileFormat get(int value) {
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Function.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Function.java
@@ -207,6 +207,8 @@ public enum Function implements Enumerator {
     * Returns the '<em><b>Function</b></em>' literal with the specified literal value.
     * <!-- begin-user-doc --> <!--
     * end-user-doc -->
+     * @param literal the literal.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static Function get(String literal) {
@@ -239,6 +241,8 @@ public enum Function implements Enumerator {
     * Returns the '<em><b>Function</b></em>' literal with the specified integer value.
     * <!-- begin-user-doc --> <!--
     * end-user-doc -->
+     * @param value the integer value.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static Function get(int value) {
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/GenericSchemaConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/GenericSchemaConnection.java
@@ -12,11 +12,11 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.GenericSchemaConnection#isMappingTypeUsed <em>Mapping Type Used</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.GenericSchemaConnection#getMappingTypeId <em>Mapping Type Id</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getGenericSchemaConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/HL7Connection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/HL7Connection.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.HL7Connection#getStartChar <em>Start Char</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7Connection#getEndChar <em>End Char</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7Connection#getRoot <em>Root</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7Connection#getOutputFilePath <em>Output File Path</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7Connection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/HL7FileNode.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/HL7FileNode.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.EObject;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getFilePath <em>File Path</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getOrder <em>Order</em>}</li>
@@ -22,7 +23,6 @@ import org.eclipse.emf.ecore.EObject;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#getRelatedColumn <em>Related Column</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.HL7FileNode#isRepeatable <em>Repeatable</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHL7FileNode()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/HeaderFooterConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/HeaderFooterConnection.java
@@ -12,13 +12,13 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#isIsHeader <em>Is Header</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#getImports <em>Imports</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#getMainCode <em>Main Code</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.HeaderFooterConnection#getLibraries <em>Libraries</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getHeaderFooterConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/InputSAPFunctionParameterTable.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/InputSAPFunctionParameterTable.java
@@ -12,10 +12,10 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.InputSAPFunctionParameterTable#getFunctionUnit <em>Function Unit</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getInputSAPFunctionParameterTable()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/LDAPSchemaConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/LDAPSchemaConnection.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.common.util.EList;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.LDAPSchemaConnection#getHost <em>Host</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.LDAPSchemaConnection#getPort <em>Port</em>}</li>
@@ -39,7 +40,6 @@ import org.eclipse.emf.common.util.EList;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.LDAPSchemaConnection#getReturnAttributes <em>Return Attributes</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.LDAPSchemaConnection#getSelectedDN <em>Selected DN</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getLDAPSchemaConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/LdifFileConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/LdifFileConnection.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.common.util.EList;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#getValue <em>Value</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#getFilePath <em>File Path</em>}</li>
@@ -21,7 +22,6 @@ import org.eclipse.emf.common.util.EList;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#isUseLimit <em>Use Limit</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.LdifFileConnection#getServer <em>Server</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getLdifFileConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/LogicalOperator.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/LogicalOperator.java
@@ -46,7 +46,7 @@ public enum LogicalOperator implements Enumerator {
     * </p>
     * <!-- end-user-doc -->
     * @see #AND
-     * @model name="And" literal="&amp;&amp;"
+     * @model name="And" literal="&amp;amp;&amp;amp;"
     * @generated
     * @ordered
     */
@@ -86,6 +86,8 @@ public enum LogicalOperator implements Enumerator {
     * Returns the '<em><b>Logical Operator</b></em>' literal with the specified literal value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param literal the literal.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static LogicalOperator get(String literal) {
@@ -102,6 +104,8 @@ public enum LogicalOperator implements Enumerator {
     * Returns the '<em><b>Logical Operator</b></em>' literal with the specified name.
     * <!-- begin-user-doc --> <!--
     * end-user-doc -->
+     * @param name the name.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static LogicalOperator getByName(String name) {
@@ -118,6 +122,8 @@ public enum LogicalOperator implements Enumerator {
     * Returns the '<em><b>Logical Operator</b></em>' literal with the specified integer value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param value the integer value.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static LogicalOperator get(int value) {
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MDMConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MDMConnection.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.common.util.EList;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getUsername <em>Username</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getPassword <em>Password</em>}</li>
@@ -27,7 +28,6 @@ import org.eclipse.emf.common.util.EList;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getContext <em>Context</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.MDMConnection#getServerUrl <em>Server Url</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMDMConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MDMConnectionProtocol.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MDMConnectionProtocol.java
@@ -66,6 +66,8 @@ public enum MDMConnectionProtocol implements Enumerator {
     * Returns the '<em><b>MDM Connection Protocol</b></em>' literal with the specified literal value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param literal the literal.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static MDMConnectionProtocol get(String literal) {
@@ -82,6 +84,8 @@ public enum MDMConnectionProtocol implements Enumerator {
     * Returns the '<em><b>MDM Connection Protocol</b></em>' literal with the specified name.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param name the name.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static MDMConnectionProtocol getByName(String name) {
@@ -98,6 +102,8 @@ public enum MDMConnectionProtocol implements Enumerator {
     * Returns the '<em><b>MDM Connection Protocol</b></em>' literal with the specified integer value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param value the integer value.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static MDMConnectionProtocol get(int value) {
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MdmConceptType.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MdmConceptType.java
@@ -116,6 +116,8 @@ public enum MdmConceptType implements Enumerator {
     * Returns the '<em><b>Mdm Concept Type</b></em>' literal with the specified literal value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param literal the literal.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static MdmConceptType get(String literal) {
@@ -132,6 +134,8 @@ public enum MdmConceptType implements Enumerator {
     * Returns the '<em><b>Mdm Concept Type</b></em>' literal with the specified name.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param name the name.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static MdmConceptType getByName(String name) {
@@ -148,6 +152,8 @@ public enum MdmConceptType implements Enumerator {
     * Returns the '<em><b>Mdm Concept Type</b></em>' literal with the specified integer value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param value the integer value.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static MdmConceptType get(int value) {
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Metadata.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Metadata.java
@@ -14,10 +14,10 @@ import org.eclipse.emf.common.util.EList;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.Metadata#getConnections <em>Connections</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadata()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MetadataColumn.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MetadataColumn.java
@@ -18,6 +18,7 @@ import orgomg.cwm.resource.record.Field;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getSourceType <em>Source Type</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDefaultValue <em>Default Value</em>}</li>
@@ -32,7 +33,6 @@ import orgomg.cwm.resource.record.Field;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getRelatedEntity <em>Related Entity</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getRelationshipType <em>Relationship Type</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataColumn()
 * @model
@@ -89,6 +89,7 @@ public interface MetadataColumn extends AbstractMetadataObject, Field {
     * @model default="" transient="true" volatile="true"
     * @generated
     */
+    @Deprecated
    String getDefaultValue();

    /**
@@ -96,8 +97,10 @@ public interface MetadataColumn extends AbstractMetadataObject, Field {
     * <!-- begin-user-doc --> <!-- end-user-doc -->
     * @param value the new value of the '<em>Default Value</em>' attribute.
     * @see #getDefaultValue()
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getDefaultValue() model documentation} for details.
     * @generated
     */
+    @Deprecated
    void setDefaultValue(String value);

    /**
@@ -222,6 +225,7 @@ public interface MetadataColumn extends AbstractMetadataObject, Field {
     * @model default="" transient="true" volatile="true"
     * @generated
     */
+    @Deprecated
    String getOriginalField();

    /**
@@ -229,8 +233,10 @@ public interface MetadataColumn extends AbstractMetadataObject, Field {
     * <!-- begin-user-doc --> <!-- end-user-doc -->
     * @param value the new value of the '<em>Original Field</em>' attribute.
     * @see #getOriginalField()
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataColumn#getOriginalField() model documentation} for details.
     * @generated
     */
+    @Deprecated
    void setOriginalField(String value);

    /**
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MetadataTable.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/MetadataTable.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.common.util.EMap;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataTable#getSourceName <em>Source Name</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataTable#getTableType <em>Table Type</em>}</li>
@@ -26,7 +27,6 @@ import org.eclipse.emf.common.util.EMap;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataTable#getConnection <em>Connection</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.MetadataTable#getAdditionalProperties <em>Additional Properties</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable()
 * @model
@@ -49,6 +49,7 @@ public interface MetadataTable extends AbstractMetadataObject, orgomg.cwm.object
     * @model transient="true" volatile="true"
     * @generated
     */
+    @Deprecated
    String getSourceName();

    /**
@@ -56,8 +57,10 @@ public interface MetadataTable extends AbstractMetadataObject, orgomg.cwm.object
     * <!-- begin-user-doc --> <!-- end-user-doc -->
     * @param value the new value of the '<em>Source Name</em>' attribute.
     * @see #getSourceName()
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.MetadataTable#getSourceName() model documentation} for details.
     * @generated
     */
+    @Deprecated
    void setSourceName(String value);

    /**
@@ -91,6 +94,7 @@ public interface MetadataTable extends AbstractMetadataObject, orgomg.cwm.object
     * @model transient="true" changeable="false" volatile="true"
     * @generated
     */
+    @Deprecated
    Connection getConnection();

    /**
@@ -105,7 +109,7 @@ public interface MetadataTable extends AbstractMetadataObject, orgomg.cwm.object
     * <!-- end-user-doc -->
     * @return the value of the '<em>Additional Properties</em>' map.
     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getMetadataTable_AdditionalProperties()
-     * @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> getAdditionalProperties();
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Operator.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Operator.java
@@ -108,7 +108,7 @@ public enum Operator implements Enumerator {
     * </p>
     * <!-- end-user-doc -->
     * @see #GREATER
-     * @model name="Greater" literal=">"
+     * @model name="Greater" literal="&gt;"
     * @generated
     * @ordered
     */
@@ -123,7 +123,7 @@ public enum Operator implements Enumerator {
     * </p>
     * <!-- end-user-doc -->
     * @see #LOWER
-     * @model name="Lower" literal="<"
+     * @model name="Lower" literal="&lt;"
     * @generated
     * @ordered
     */
@@ -138,7 +138,7 @@ public enum Operator implements Enumerator {
     * </p>
     * <!-- end-user-doc -->
     * @see #GREATER_OR_EQUALS
-     * @model name="Greater_or_equals" literal=">="
+     * @model name="Greater_or_equals" literal="&gt;="
     * @generated
     * @ordered
     */
@@ -153,7 +153,7 @@ public enum Operator implements Enumerator {
     * </p>
     * <!-- end-user-doc -->
     * @see #LOWER_OR_EQUALS
-     * @model name="Lower_or_equals" literal="<="
+     * @model name="Lower_or_equals" literal="&lt;="
     * @generated
     * @ordered
     */
@@ -179,6 +179,8 @@ public enum Operator implements Enumerator {
     * Returns the '<em><b>Operator</b></em>' literal with the specified literal value.
     * <!-- begin-user-doc --> <!--
     * end-user-doc -->
+     * @param literal the literal.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static Operator get(String literal) {
@@ -211,6 +213,8 @@ public enum Operator implements Enumerator {
     * Returns the '<em><b>Operator</b></em>' literal with the specified integer value.
     * <!-- begin-user-doc --> <!--
     * end-user-doc -->
+     * @param value the integer value.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static Operator get(int value) {
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/OutputSAPFunctionParameterTable.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/OutputSAPFunctionParameterTable.java
@@ -12,10 +12,10 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.OutputSAPFunctionParameterTable#getFunctionUnit <em>Function Unit</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getOutputSAPFunctionParameterTable()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/QueriesConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/QueriesConnection.java
@@ -15,11 +15,11 @@ import org.eclipse.emf.ecore.EObject;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.QueriesConnection#getConnection <em>Connection</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.QueriesConnection#getQuery <em>Query</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQueriesConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Query.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/Query.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.Query#getValue <em>Value</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.Query#getQueries <em>Queries</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.Query#isContextMode <em>Context Mode</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getQuery()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/RegexpFileConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/RegexpFileConnection.java
@@ -12,10 +12,10 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.RegexpFileConnection#getFieldSeparatorType <em>Field Separator Type</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getRegexpFileConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/RowSeparator.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/RowSeparator.java
@@ -88,6 +88,8 @@ public enum RowSeparator implements Enumerator {
     * Returns the '<em><b>Row Separator</b></em>' literal with the specified literal value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param literal the literal.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static RowSeparator get(String literal) {
@@ -104,6 +106,8 @@ public enum RowSeparator implements Enumerator {
     * Returns the '<em><b>Row Separator</b></em>' literal with the specified name.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param name the name.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static RowSeparator getByName(String name) {
@@ -120,6 +124,8 @@ public enum RowSeparator implements Enumerator {
     * Returns the '<em><b>Row Separator</b></em>' literal with the specified integer value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param value the integer value.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static RowSeparator get(int value) {
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/RuleType.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/RuleType.java
@@ -116,6 +116,8 @@ public enum RuleType implements Enumerator {
     * Returns the '<em><b>Rule Type</b></em>' literal with the specified literal value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param literal the literal.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static RuleType get(String literal) {
@@ -132,6 +134,8 @@ public enum RuleType implements Enumerator {
     * Returns the '<em><b>Rule Type</b></em>' literal with the specified name.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param name the name.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static RuleType getByName(String name) {
@@ -148,6 +152,8 @@ public enum RuleType implements Enumerator {
     * Returns the '<em><b>Rule Type</b></em>' literal with the specified integer value.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @param value the integer value.
+     * @return the matching enumerator or <code>null</code>.
     * @generated
     */
    public static RuleType get(int value) {
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPBWTable.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPBWTable.java
@@ -11,6 +11,7 @@ import java.util.Date;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getModelType <em>Model Type</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#isActive <em>Active</em>}</li>
@@ -18,7 +19,6 @@ import java.util.Date;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getInfoAreaName <em>Info Area Name</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPBWTable#getInnerIOType <em>Inner IO Type</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTable()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPBWTableField.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPBWTableField.java
@@ -9,10 +9,10 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPBWTableField#getLogicalName <em>Logical Name</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPBWTableField()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPConnection.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.common.util.EMap;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getHost <em>Host</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getUsername <em>Username</em>}</li>
@@ -32,7 +33,6 @@ import org.eclipse.emf.common.util.EMap;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getBWInfoCubes <em>BW Info Cubes</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPConnection#getBWInfoObjects <em>BW Info Objects</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPFunctionParamData.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPFunctionParamData.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.SAPFunctionParamData#getInputRoot <em>Input Root</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParamData#getOutputRoot <em>Output Root</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParamData()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPFunctionParameter.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPFunctionParameter.java
@@ -13,6 +13,7 @@ import org.eclipse.emf.ecore.EObject;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getName <em>Name</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getType <em>Type</em>}</li>
@@ -23,7 +24,6 @@ import org.eclipse.emf.ecore.EObject;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#getChildren <em>Children</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameter#isTableResideInTables <em>Table Reside In Tables</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameter()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPFunctionParameterColumn.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPFunctionParameterColumn.java
@@ -12,6 +12,7 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getParameterType <em>Parameter Type</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getStructureOrTableName <em>Structure Or Table Name</em>}</li>
@@ -20,7 +21,6 @@ package org.talend.core.model.metadata.builder.connection;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getValue <em>Value</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterColumn#getParameterTable <em>Parameter Table</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterColumn()
 * @model
@@ -141,6 +141,7 @@ public interface SAPFunctionParameterColumn extends AbstractMetadataObject {
     * @model descriptionDataType="orgomg.cwm.objectmodel.core.String"
     * @generated
     */
+    @Deprecated
    void setDescription(String description);

    /**
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPFunctionParameterTable.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPFunctionParameterTable.java
@@ -14,10 +14,10 @@ import org.eclipse.emf.common.util.EList;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionParameterTable#getColumns <em>Columns</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionParameterTable()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPFunctionUnit.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPFunctionUnit.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.ecore.EObject;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionUnit#getOutputType <em>Output Type</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionUnit#getOutputTableName <em>Output Table Name</em>}</li>
@@ -28,7 +29,6 @@ import org.eclipse.emf.ecore.EObject;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionUnit#getParamData <em>Param Data</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPFunctionUnit#isAsXmlSchema <em>As Xml Schema</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPFunctionUnit()
 * @model
@@ -97,6 +97,7 @@ public interface SAPFunctionUnit extends AbstractMetadataObject {
     * @model documentDataType="orgomg.cwm.objectmodel.core.String"
     * @generated
     */
+    @Deprecated
    void setDocument(String document);

    /**
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPIDocUnit.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPIDocUnit.java
@@ -12,6 +12,7 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPIDocUnit#getConnection <em>Connection</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPIDocUnit#getProgramId <em>Program Id</em>}</li>
@@ -21,7 +22,6 @@ package org.talend.core.model.metadata.builder.connection;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPIDocUnit#isUseHtmlOutput <em>Use Html Output</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPIDocUnit#getHtmlFile <em>Html File</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPIDocUnit()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPTable.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPTable.java
@@ -12,10 +12,10 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPTable#getTableSearchType <em>Table Search Type</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPTable()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPTableField.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPTableField.java
@@ -14,11 +14,11 @@ import org.eclipse.emf.common.util.EList;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPTableField#getBusinessName <em>Business Name</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPTableField#getRefTable <em>Ref Table</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPTableField()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPTestInputParameterTable.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SAPTestInputParameterTable.java
@@ -12,10 +12,10 @@ package org.talend.core.model.metadata.builder.connection;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SAPTestInputParameterTable#getFunctionUnit <em>Function Unit</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSAPTestInputParameterTable()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SalesforceModuleUnit.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SalesforceModuleUnit.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.SalesforceModuleUnit#getMetadataTable <em>Metadata Table</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SalesforceModuleUnit#getConnection <em>Connection</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SalesforceModuleUnit#getTables <em>Tables</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SalesforceModuleUnit#getModuleName <em>Module Name</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSalesforceModuleUnit()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SalesforceSchemaConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SalesforceSchemaConnection.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.common.util.EList;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SalesforceSchemaConnection#getWebServiceUrl <em>Web Service Url</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SalesforceSchemaConnection#getUserName <em>User Name</em>}</li>
@@ -40,7 +41,6 @@ import org.eclipse.emf.common.util.EList;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SalesforceSchemaConnection#getToken <em>Token</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SalesforceSchemaConnection#getLoginType <em>Login Type</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSalesforceSchemaConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SchemaTarget.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SchemaTarget.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.SchemaTarget#getRelativeXPathQuery <em>Relative XPath Query</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SchemaTarget#getTagName <em>Tag Name</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SchemaTarget#getSchema <em>Schema</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSchemaTarget()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SubscriberTable.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/SubscriberTable.java
@@ -14,10 +14,10 @@ import org.talend.cwm.relational.TdTable;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.SubscriberTable#isSystem <em>System</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getSubscriberTable()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/ValidationRulesConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/ValidationRulesConnection.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.common.util.EMap;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.ValidationRulesConnection#isIsSelect <em>Is Select</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.ValidationRulesConnection#isIsInsert <em>Is Insert</em>}</li>
@@ -33,7 +34,6 @@ import org.eclipse.emf.common.util.EMap;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.ValidationRulesConnection#isIsDisallow <em>Is Disallow</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.ValidationRulesConnection#isIsRejectLink <em>Is Reject Link</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getValidationRulesConnection()
 * @model
@@ -356,7 +356,7 @@ public interface ValidationRulesConnection extends Connection {
     * <!-- end-user-doc -->
     * @return the value of the '<em>Inner Joins</em>' map.
     * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getValidationRulesConnection_InnerJoins()
-     * @model mapType="org.talend.core.model.metadata.builder.connection.InnerJoinMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
+     * @model mapType="org.talend.core.model.metadata.builder.connection.InnerJoinMap&lt;org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString&gt;"
     * @generated
     */
    EMap<String, String> getInnerJoins();
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/WSDLParameter.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/WSDLParameter.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.EObject;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.WSDLParameter#getElement <em>Element</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.WSDLParameter#getSource <em>Source</em>}</li>
@@ -22,7 +23,6 @@ import org.eclipse.emf.ecore.EObject;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.WSDLParameter#getParameterInfo <em>Parameter Info</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.WSDLParameter#getParameterInfoParent <em>Parameter Info Parent</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getWSDLParameter()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/WSDLSchemaConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/WSDLSchemaConnection.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.common.util.EList;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.WSDLSchemaConnection#getWSDL <em>WSDL</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.WSDLSchemaConnection#isNeedAuth <em>Need Auth</em>}</li>
@@ -39,7 +40,6 @@ import org.eclipse.emf.common.util.EList;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.WSDLSchemaConnection#getParameterValue <em>Parameter Value</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.WSDLSchemaConnection#getOutputParameter <em>Output Parameter</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getWSDLSchemaConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/XMLFileNode.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/XMLFileNode.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.EObject;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.XMLFileNode#getXMLPath <em>XML Path</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.XMLFileNode#getRelatedColumn <em>Related Column</em>}</li>
@@ -22,7 +23,6 @@ import org.eclipse.emf.ecore.EObject;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.XMLFileNode#getOrder <em>Order</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.XMLFileNode#getType <em>Type</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getXMLFileNode()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/XmlFileConnection.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/XmlFileConnection.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.common.util.EList;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.XmlFileConnection#getXsdFilePath <em>Xsd File Path</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.XmlFileConnection#getXmlFilePath <em>Xml File Path</em>}</li>
@@ -29,7 +30,6 @@ import org.eclipse.emf.common.util.EList;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.XmlFileConnection#getFileContent <em>File Content</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.XmlFileConnection#getTargetNameSpace <em>Target Name Space</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getXmlFileConnection()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/XmlXPathLoopDescriptor.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/XmlXPathLoopDescriptor.java
@@ -16,13 +16,13 @@ import org.eclipse.emf.ecore.EObject;
 *
 * <p>
 * The following features are supported:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.XmlXPathLoopDescriptor#getLimitBoucle <em>Limit Boucle</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.XmlXPathLoopDescriptor#getAbsoluteXPathQuery <em>Absolute XPath Query</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.XmlXPathLoopDescriptor#getConnection <em>Connection</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.XmlXPathLoopDescriptor#getSchemaTargets <em>Schema Targets</em>}</li>
 * </ul>
- * </p>
 *
 * @see org.talend.core.model.metadata.builder.connection.ConnectionPackage#getXmlXPathLoopDescriptor()
 * @model
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/AbstractMetadataObjectImpl.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/AbstractMetadataObjectImpl.java
@@ -20,6 +20,7 @@ import orgomg.cwm.objectmodel.core.impl.ModelElementImpl;
 * end-user-doc -->
 * <p>
 * The following features are implemented:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.AbstractMetadataObjectImpl#getProperties <em>Properties</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.AbstractMetadataObjectImpl#getId <em>Id</em>}</li>
@@ -29,10 +30,10 @@ import orgomg.cwm.objectmodel.core.impl.ModelElementImpl;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.AbstractMetadataObjectImpl#isSynchronised <em>Synchronised</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.AbstractMetadataObjectImpl#isDivergency <em>Divergency</em>}</li>
 * </ul>
- * </p>
 *
 * @generated
 */
+@SuppressWarnings("deprecation")
 public abstract class AbstractMetadataObjectImpl extends ModelElementImpl implements AbstractMetadataObject {

    /**
@@ -40,11 +41,13 @@ public abstract class AbstractMetadataObjectImpl extends ModelElementImpl implem
     * <!-- begin-user-doc --> <!--
     * end-user-doc -->
     * @see #getProperties()
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
     * @generated
     * @ordered
     */
-    protected static final HashMap PROPERTIES_EDEFAULT = (HashMap) ConnectionFactory.eINSTANCE.createFromString(
-            ConnectionPackage.eINSTANCE.getMap(), ""); //$NON-NLS-1$
+    @Deprecated
+    protected static final HashMap PROPERTIES_EDEFAULT = (HashMap) ConnectionFactory.eINSTANCE
+            .createFromString(ConnectionPackage.eINSTANCE.getMap(), ""); //$NON-NLS-1$

    /**
     * The cached value of the '{@link #getProperties() <em>Properties</em>}' attribute. <!-- begin-user-doc --> <!--
@@ -182,16 +185,20 @@ public abstract class AbstractMetadataObjectImpl extends ModelElementImpl implem

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
     * @generated
     */
+    @Deprecated
    public HashMap getProperties() {
        return properties;
    }

    /**
     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * @deprecated See {@link org.talend.core.model.metadata.builder.connection.AbstractMetadataObject#getProperties() model documentation} for details.
     * @generated
     */
+    @Deprecated
    public void setProperties(HashMap newProperties) {
        HashMap oldProperties = properties;
        properties = newProperties;
@@ -235,8 +242,8 @@ public abstract class AbstractMetadataObjectImpl extends ModelElementImpl implem
        String oldComment = comment;
        comment = newComment;
        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ConnectionPackage.ABSTRACT_METADATA_OBJECT__COMMENT,
-                    oldComment, comment));
+            eNotify(new ENotificationImpl(this, Notification.SET, ConnectionPackage.ABSTRACT_METADATA_OBJECT__COMMENT, oldComment,
+                    comment));
    }

    /**
@@ -442,7 +449,7 @@ public abstract class AbstractMetadataObjectImpl extends ModelElementImpl implem
        if (eIsProxy())
            return super.toString();

-        StringBuffer result = new StringBuffer(super.toString());
+        StringBuilder result = new StringBuilder(super.toString());
        result.append(" (properties: ");
        result.append(properties);
        result.append(", id: ");
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/AdditionalConnectionPropertyImpl.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/AdditionalConnectionPropertyImpl.java
@@ -18,11 +18,11 @@ import org.talend.core.model.metadata.builder.connection.ConnectionPackage;
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.AdditionalConnectionPropertyImpl#getPropertyName <em>Property Name</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.AdditionalConnectionPropertyImpl#getValue <em>Value</em>}</li>
 * </ul>
- * </p>
 *
 * @generated
 */
@@ -105,8 +105,8 @@ public class AdditionalConnectionPropertyImpl extends EObjectImpl implements Add
        String oldPropertyName = propertyName;
        propertyName = newPropertyName;
        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET,
-                    ConnectionPackage.ADDITIONAL_CONNECTION_PROPERTY__PROPERTY_NAME, oldPropertyName, propertyName));
+            eNotify(new ENotificationImpl(this, Notification.SET, ConnectionPackage.ADDITIONAL_CONNECTION_PROPERTY__PROPERTY_NAME,
+                    oldPropertyName, propertyName));
    }

    /**
@@ -209,7 +209,7 @@ public class AdditionalConnectionPropertyImpl extends EObjectImpl implements Add
        if (eIsProxy())
            return super.toString();

-        StringBuffer result = new StringBuffer(super.toString());
+        StringBuilder result = new StringBuilder(super.toString());
        result.append(" (propertyName: ");
        result.append(propertyName);
        result.append(", Value: ");
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/AdditionalPropertiesImpl.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/AdditionalPropertiesImpl.java
@@ -24,11 +24,11 @@ import org.talend.core.model.metadata.builder.connection.ConnectionPackage;
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.AdditionalPropertiesImpl#getTypedKey <em>Key</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.AdditionalPropertiesImpl#getTypedValue <em>Value</em>}</li>
 * </ul>
- * </p>
 *
 * @generated
 */
@@ -132,7 +132,8 @@ public class AdditionalPropertiesImpl extends EObjectImpl implements BasicEMap.E
        String oldValue = value;
        value = newValue;
        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ConnectionPackage.ADDITIONAL_PROPERTIES__VALUE, oldValue, value));
+            eNotify(new ENotificationImpl(this, Notification.SET, ConnectionPackage.ADDITIONAL_PROPERTIES__VALUE, oldValue,
+                    value));
    }

    /**
@@ -213,7 +214,7 @@ public class AdditionalPropertiesImpl extends EObjectImpl implements BasicEMap.E
        if (eIsProxy())
            return super.toString();

-        StringBuffer result = new StringBuffer(super.toString());
+        StringBuilder result = new StringBuilder(super.toString());
        result.append(" (key: ");
        result.append(key);
        result.append(", value: ");
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/BRMSConnectionImpl.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/BRMSConnectionImpl.java
@@ -29,6 +29,7 @@ import org.talend.core.model.metadata.builder.connection.XMLFileNode;
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.BRMSConnectionImpl#getXmlField <em>Xml Field</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.BRMSConnectionImpl#getUrlName <em>Url Name</em>}</li>
@@ -40,7 +41,6 @@ import org.talend.core.model.metadata.builder.connection.XMLFileNode;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.BRMSConnectionImpl#getLoop <em>Loop</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.BRMSConnectionImpl#getPackage <em>Package</em>}</li>
 * </ul>
- * </p>
 *
 * @generated
 */
@@ -556,7 +556,7 @@ public class BRMSConnectionImpl extends ConnectionImpl implements BRMSConnection
        if (eIsProxy())
            return super.toString();

-        StringBuffer result = new StringBuffer(super.toString());
+        StringBuilder result = new StringBuilder(super.toString());
        result.append(" (xmlField: ");
        result.append(xmlField);
        result.append(", urlName: ");
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/CDCConnectionImpl.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/CDCConnectionImpl.java
@@ -33,11 +33,11 @@ import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.CDCConnectionImpl#getConnection <em>Connection</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.CDCConnectionImpl#getCdcTypes <em>Cdc Types</em>}</li>
 * </ul>
- * </p>
 *
 * @generated
 */
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/CDCTypeImpl.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/CDCTypeImpl.java
@@ -25,13 +25,13 @@ import org.talend.core.model.metadata.builder.connection.SubscriberTable;
 * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDC Type</b></em>'. <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.CDCTypeImpl#getLinkDB <em>Link DB</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.CDCTypeImpl#getSubscribers <em>Subscribers</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.CDCTypeImpl#getCdcConnection <em>Cdc Connection</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.CDCTypeImpl#getJournalName <em>Journal Name</em>}</li>
 * </ul>
- * </p>
 *
 * @generated
 */
@@ -314,7 +314,7 @@ public class CDCTypeImpl extends AbstractMetadataObjectImpl implements CDCType {
        if (eIsProxy())
            return super.toString();

-        StringBuffer result = new StringBuffer(super.toString());
+        StringBuilder result = new StringBuilder(super.toString());
        result.append(" (linkDB: ");
        result.append(linkDB);
        result.append(", journalName: ");
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/ConceptImpl.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/ConceptImpl.java
@@ -35,6 +35,7 @@ import org.talend.cwm.relational.impl.TdTableImpl;
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.ConceptImpl#getLoopExpression <em>Loop Expression</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.ConceptImpl#getLoopLimit <em>Loop Limit</em>}</li>
@@ -46,7 +47,6 @@ import org.talend.cwm.relational.impl.TdTableImpl;
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.ConceptImpl#getConceptType <em>Concept Type</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.ConceptImpl#getXPathPrefix <em>XPath Prefix</em>}</li>
 * </ul>
- * </p>
 *
 * @generated
 */
@@ -251,7 +251,8 @@ public class ConceptImpl extends TdTableImpl implements Concept {
        Integer oldLoopLimit = loopLimit;
        loopLimit = newLoopLimit;
        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ConnectionPackage.CONCEPT__LOOP_LIMIT, oldLoopLimit, loopLimit));
+            eNotify(new ENotificationImpl(this, Notification.SET, ConnectionPackage.CONCEPT__LOOP_LIMIT, oldLoopLimit,
+                    loopLimit));
    }

    /**
@@ -557,7 +558,7 @@ public class ConceptImpl extends TdTableImpl implements Concept {
        if (eIsProxy())
            return super.toString();

-        StringBuffer result = new StringBuffer(super.toString());
+        StringBuilder result = new StringBuilder(super.toString());
        result.append(" (LoopExpression: ");
        result.append(loopExpression);
        result.append(", LoopLimit: ");
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/ConceptTargetImpl.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/ConceptTargetImpl.java
@@ -26,12 +26,12 @@ import org.talend.core.model.metadata.builder.connection.ConnectionPackage;
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.ConceptTargetImpl#getSchema <em>Schema</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.ConceptTargetImpl#getTargetName <em>Target Name</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.ConceptTargetImpl#getRelativeLoopExpression <em>Relative Loop Expression</em>}</li>
 * </ul>
- * </p>
 *
 * @generated
 */
@@ -148,7 +148,8 @@ public class ConceptTargetImpl extends EObjectImpl implements ConceptTarget {
            if (msgs != null)
                msgs.dispatch();
        } else if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, ConnectionPackage.CONCEPT_TARGET__SCHEMA, newSchema, newSchema));
+            eNotify(new ENotificationImpl(this, Notification.SET, ConnectionPackage.CONCEPT_TARGET__SCHEMA, newSchema,
+                    newSchema));
    }

    /**
@@ -330,7 +331,7 @@ public class ConceptTargetImpl extends EObjectImpl implements ConceptTarget {
        if (eIsProxy())
            return super.toString();

-        StringBuffer result = new StringBuffer(super.toString());
+        StringBuilder result = new StringBuilder(super.toString());
        result.append(" (targetName: ");
        result.append(targetName);
        result.append(", RelativeLoopExpression: ");
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/ConditionTypeImpl.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/ConditionTypeImpl.java
@@ -24,13 +24,13 @@ import org.talend.core.model.metadata.builder.connection.Operator;
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
+ * </p>
 * <ul>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.ConditionTypeImpl#getInputColumn <em>Input Column</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.ConditionTypeImpl#getFunction <em>Function</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.ConditionTypeImpl#getOperator <em>Operator</em>}</li>
 *   <li>{@link org.talend.core.model.metadata.builder.connection.impl.ConditionTypeImpl#getValue <em>Value</em>}</li>
 * </ul>
- * </p>
 *
 * @generated
 */
@@ -320,7 +320,7 @@ public class ConditionTypeImpl extends EObjectImpl implements ConditionType {
        if (eIsProxy())
            return super.toString();

-        StringBuffer result = new StringBuffer(super.toString());
+        StringBuilder result = new StringBuilder(super.toString());
        result.append(" (inputColumn: ");
        result.append(inputColumn);
        result.append(", function: ");
--- a/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/ConnectionImpl.java
+++ b/main/plugins/org.talend.model/src/main/java/org/talend/core/model/metadata/builder/connection/impl/ConnectionImpl.java
@@ -1172,7 +1172,7 @@ public class ConnectionImpl extends AbstractMetadataObjectImpl implements Connec
        if (eIsProxy())
            return super.toString();

-        StringBuffer result = new StringBuffer(super.toString());
+        StringBuilder result = new StringBuilder(super.toString());
        result.append(" (pathname: ");
        result.append(pathname);
        result.append(", isCaseSensitive: ");
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
hwang	4214d7f282	feature(TUP-24029):[FTP] Connection wizard add timeout property #2684	2019-09-20 11:13:01 +08:00
hwang	bb56131ffb	Revert "bugfix(TUP-24029):[FTP] Connection wizard add timeout property (#2684 )" This reverts commit `992e01de37`.	2019-09-19 18:16:28 +08:00
hwang-talend	64083d1e2e	bugfix(TUP-24563):Specifying a custom MVN URI in a Bean still ends up (#2716 ) bugfix(TUP-24563):Specifying a custom MVN URI in a Bean still ends up turning into a reference to the default 6.0.0-SNAPSHOT version	2019-09-19 15:06:30 +08:00
wang wei	7b21c010e2	fix(TDI-42192): Use SecureRandom in system routines (#2707 )	2019-09-18 18:34:00 +08:00
kjwang	3d08e7a41c	kjwang/Fix TUP-24579 MacOS : unable to access remote project after (#2718 ) applying TPS-3363 https://jira.talendforge.org/browse/TUP-24579	2019-09-18 18:25:30 +08:00
Mike Yan	107c52119a	fix(TESB-26415): beansType is null with pure DI licence (#2724 ) fix(TESB-26415): beansType is null with pure DI licence	2019-09-18 18:21:22 +08:00
hwang-talend	992e01de37	bugfix(TUP-24029):[FTP] Connection wizard add timeout property (#2684 ) bugfix(TUP-24029):[FTP] Connection wizard add timeout property	2019-09-18 17:01:07 +08:00
Zhiwei Xue	5bdc4ceef7	fix(TUP-24310):routines is duplicated in the reactor (#2706 )	2019-09-12 10:33:49 +08:00
SunChaoqun	d2eaeb7b97	TESB-26415:Cannot publish Route with Routelet to snapshots when project (#2702 ) has a ref project defined	2019-09-11 17:14:03 +08:00
hzhao-talendbj	a53ffdfbf4	feat(TUP-24028)Add Azure datacenter part of the studio connection (#2685 )	2019-09-11 17:11:57 +08:00
hzhao-talendbj	dc92855b54	fix(TUP-23555)Unnecessary xmlMappings will be included in a built job (#2699 )	2019-09-09 10:52:49 +08:00
Chao MENG	e8d1ce17d0	fix(TUP-23905): Job disappearing after merging git branches (#2703 ) fix(TUP-23905): Job disappearing after merging git branches https://jira.talendforge.org/browse/TUP-23905	2019-09-09 10:44:37 +08:00
Chao MENG	ba19f14fc9	fix(TUP-23905): Job disappearing after merging git branches (#2700 ) fix(TUP-23905): Job disappearing after merging git branches https://jira.talendforge.org/browse/TUP-23905	2019-09-06 10:12:06 +08:00
Zhiwei Xue	1a73160d6b	fix(TUP-24323):_tdm folder is missing after build thmap job (#2687 )	2019-09-03 10:17:48 +08:00
jiezhang-tlnd	6efbc76223	fix(TUP-24411)Error message: unable to update task config if the Context parameters have same values but different case (#2691 ) * fix(TUP-24411)Error message: unable to update task config if the Context parameters have same values but different case https://jira.talendforge.org/browse/TUP-24411 * fix(TUP-24411)Error message: unable to update task config if the Context parameters have same values but different case. https://jira.talendforge.org/browse/TUP-24411 * fix(TUP-24411)Error message: unable to update task config if the Context parameters have same values but different case * fix(TUP-24411)Error message: unable to update task config if the Context parameters have same values but different case https://jira.talendforge.org/browse/TUP-24411 * fix(TUP-24411)Error message: unable to update task config if the Context parameters have same values but different case https://jira.talendforge.org/browse/TUP-24411 * fix(TUP-24411)Error message: unable to update task config if the Context parameters have same values but different case https://jira.talendforge.org/browse/TUP-24411	2019-09-02 11:28:05 +08:00
Richard Lecomte	2aae24829a	fix : TDI-42776 (#2692 ) * fix : TDI-42776 Numeric sequence is now thread safe	2019-08-30 10:50:32 +02:00