TUP-3862:There aways error after switch to Mediation

with context username and password values Null

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

@@ -93,13 +93,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="slf4j.api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.talend.daikon"
          download-size="0"
@@ -107,4 +100,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.slf4j.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

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

@@ -48,68 +48,57 @@
             <version>1.0</version>
             <scope>system</scope>
             <systemPath>${basedir}/fakejdbc_driver.jar</systemPath>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.birt.runtime</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
             <version>3.10.2.v20150203-1939</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.birt.runtime</groupId>
             <artifactId>org.eclipse.core.runtime</artifactId>
             <version>3.10.0.v20140318-2214</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.birt.runtime</groupId>
             <artifactId>org.eclipse.emf.common</artifactId>
             <version>2.10.1.v20140901-1043</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.birt.runtime</groupId>
             <artifactId>org.eclipse.emf.ecore</artifactId>
             <version>2.10.1.v20140901-1043</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.birt.runtime</groupId>
             <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
             <version>2.10.1.v20140901-1043</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.birt.runtime</groupId>
             <artifactId>org.eclipse.equinox.common</artifactId>
             <version>3.6.200.v20130402-1505</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.birt.runtime</groupId>
             <artifactId>org.eclipse.equinox.registry</artifactId>
             <version>3.5.400.v20140428-1507</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.eclipse.birt.runtime</groupId>
             <artifactId>org.eclipse.equinox.app</artifactId>
             <version>1.3.200.v20130910-1609</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
             <version>2.11.0</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.16</version>
             <type>bundle</type>
-            <optional>true</optional>
         </dependency>
     </dependencies>
 
@@ -121,11 +110,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <includes>
-                        <include>org/talend/commons/utils/threading/lockerbykey/*.java</include>
-                    </includes>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -136,8 +122,8 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Embed-Dependency>artifactId=fakejdbc;inline=true</Embed-Dependency>
                     </instructions>
-                    <classifier>minimal</classifier>
                 </configuration>
             </plugin>
         </plugins>

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

@@ -16,6 +16,7 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -40,33 +41,18 @@ import org.talend.core.PluginChecker;
 import org.talend.core.database.EDatabaseTypeName;
 import org.talend.core.model.genhtml.IHTMLDocConstants;
 import org.talend.core.model.metadata.MetadataManager;
-import org.talend.core.model.metadata.builder.connection.BRMSConnection;
 import org.talend.core.model.metadata.builder.connection.Connection;
 import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
-import org.talend.core.model.metadata.builder.connection.DelimitedFileConnection;
-import org.talend.core.model.metadata.builder.connection.EDIFACTConnection;
-import org.talend.core.model.metadata.builder.connection.EbcdicConnection;
-import org.talend.core.model.metadata.builder.connection.FTPConnection;
-import org.talend.core.model.metadata.builder.connection.FileExcelConnection;
-import org.talend.core.model.metadata.builder.connection.GenericSchemaConnection;
-import org.talend.core.model.metadata.builder.connection.HL7Connection;
-import org.talend.core.model.metadata.builder.connection.LDAPSchemaConnection;
-import org.talend.core.model.metadata.builder.connection.LdifFileConnection;
-import org.talend.core.model.metadata.builder.connection.MDMConnection;
 import org.talend.core.model.metadata.builder.connection.MetadataColumn;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
-import org.talend.core.model.metadata.builder.connection.PositionalFileConnection;
 import org.talend.core.model.metadata.builder.connection.QueriesConnection;
 import org.talend.core.model.metadata.builder.connection.Query;
-import org.talend.core.model.metadata.builder.connection.RegexpFileConnection;
 import org.talend.core.model.metadata.builder.connection.SAPConnection;
 import org.talend.core.model.metadata.builder.connection.SAPFunctionUnit;
 import org.talend.core.model.metadata.builder.connection.SAPIDocUnit;
 import org.talend.core.model.metadata.builder.connection.SalesforceModuleUnit;
 import org.talend.core.model.metadata.builder.connection.SalesforceSchemaConnection;
 import org.talend.core.model.metadata.builder.connection.ValidationRulesConnection;
-import org.talend.core.model.metadata.builder.connection.WSDLSchemaConnection;
-import org.talend.core.model.metadata.builder.connection.XmlFileConnection;
 import org.talend.core.model.process.Problem;
 import org.talend.core.model.process.Problem.ProblemStatus;
 import org.talend.core.model.properties.ConnectionItem;
@@ -101,6 +87,7 @@ import org.talend.core.repository.model.repositoryObject.SAPFunctionRepositoryOb
 import org.talend.core.repository.model.repositoryObject.SAPIDocRepositoryObject;
 import org.talend.core.repository.model.repositoryObject.SalesforceModuleRepositoryObject;
 import org.talend.core.repository.recyclebin.RecycleBinManager;
+import org.talend.core.runtime.services.IGenericWizardService;
 import org.talend.core.ui.ICDCProviderService;
 import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.core.ui.branding.IBrandingService;
@@ -147,6 +134,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     private Map<String, RepositoryNode> repositoryNodeMap = new HashMap<String, RepositoryNode>();
 
+    private Map<String, RepositoryNode> genericNodesMap = new HashMap<>();
+
     private String currentPerspective; // set the current perspective
 
     private List<FolderItem> delFolderItems = new ArrayList<FolderItem>();
@@ -269,6 +258,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         }
         // *init the repository node from extension
         initExtensionRepositoryNodes(curParentNode);
+        // init the repository nodes from component service
+        initNodesFromComponentSerivice(metadataNode);
         // delete the hidden nodes
         deleteHiddenNodes(nodes);
 
@@ -388,6 +379,22 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         }
     }
 
+    private void initNodesFromComponentSerivice(RepositoryNode curParentNode) {
+        IGenericWizardService wizardService = null;
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
+            wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
+        }
+        if (wizardService != null) {
+            List<RepositoryNode> nodes = wizardService.createNodesFromComponentService(curParentNode);
+            for (RepositoryNode repNode : nodes) {
+                ERepositoryObjectType repType = (ERepositoryObjectType) repNode.getProperties(EProperties.CONTENT_TYPE);
+                if (repType != null) {
+                    genericNodesMap.put(repType.getType(), repNode);
+                }
+            }
+        }
+    }
+
     private void initExtensionRepositoryNodes(final IRepositoryNode curParentNode) {
         Map<ERepositoryObjectType, RepositoryNode> repositoryNodeExtensionMap = new HashMap<ERepositoryObjectType, RepositoryNode>();
 
@@ -921,7 +928,19 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                 }
             }
 
-            for (MetadataTable table : ConnectionHelper.getTables(connection)) {
+            Set<MetadataTable> tables = null;
+            IGenericWizardService wizardService = null;
+            if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
+                wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault()
+                        .getService(IGenericWizardService.class);
+            }
+            if (wizardService != null && wizardService.isGenericItem(item)) {
+                List<MetadataTable> metadataTables = wizardService.getMetadataTables(connection);
+                tables = new HashSet<>(metadataTables);
+            } else {
+                tables = ConnectionHelper.getTables(connection);
+            }
+            for (MetadataTable table : tables) {
                 if (SubItemHelper.isDeleted(table)) {
                     RepositoryNode tableNode = createMetatableNode(currentParentNode,
                             new RepositoryViewObject(item.getProperty()), table, ERepositoryObjectType.METADATA_CON_TABLE);
@@ -1298,50 +1317,39 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         if (type == ERepositoryObjectType.METADATA_CONNECTIONS && isAvaliableInTOS) {
             connection = dbMetadataConnection;
         } else if (type == ERepositoryObjectType.METADATA_SAPCONNECTIONS) {
-            connection = (SAPConnection) ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_DELIMITED) {
-            connection = (DelimitedFileConnection) ((ConnectionItem) repositoryObject.getProperty().getItem())
-                .getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_POSITIONAL) {
-            connection = (PositionalFileConnection) ((ConnectionItem) repositoryObject.getProperty().getItem())
-                .getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_REGEXP) {
-            connection = (RegexpFileConnection) ((ConnectionItem) repositoryObject.getProperty().getItem())
-                .getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_XML) {
-            connection = (XmlFileConnection) ((ConnectionItem) repositoryObject.getProperty().getItem())
-                .getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_EXCEL) {
-            connection = (FileExcelConnection) ((ConnectionItem) repositoryObject.getProperty().getItem())
-                .getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_LDIF) {
-            connection = (LdifFileConnection) ((ConnectionItem) repositoryObject.getProperty().getItem())
-                .getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_LDAP_SCHEMA) {
-            connection = (LDAPSchemaConnection) ((ConnectionItem) repositoryObject.getProperty().getItem())
-                .getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_GENERIC_SCHEMA) {
-            connection = (GenericSchemaConnection) ((ConnectionItem) repositoryObject.getProperty().getItem())
-                .getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_WSDL_SCHEMA) {
-            connection = (WSDLSchemaConnection) ((ConnectionItem) repositoryObject.getProperty().getItem())
-                .getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_SALESFORCE_SCHEMA) {
-            connection = (SalesforceSchemaConnection) ((ConnectionItem) repositoryObject.getProperty().getItem())
-                .getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_EBCDIC) {
-            connection = (EbcdicConnection) ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_HL7) {
-            connection = (HL7Connection) ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_FTP) {
-            connection = (FTPConnection) ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_FILE_BRMS) {
-            connection = (BRMSConnection) ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_MDMCONNECTION) {
-            connection = (MDMConnection) ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         } else if (type == ERepositoryObjectType.METADATA_EDIFACT) {
-            connection = (EDIFACTConnection) ((ConnectionItem) repositoryObject.getProperty().getItem())
-                .getConnection();
+            connection = ((ConnectionItem) repositoryObject.getProperty().getItem()).getConnection();
         }
         if (null != connection) {
             createTables(node, repositoryObject, connection, validationRules);
@@ -1841,6 +1849,11 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         return rootTypeNode;
     }
 
+    @Override
+    public Map<String, RepositoryNode> getGenericTopNodesMap() {
+        return genericNodesMap;
+    }
+
     @Override
     public final void initNode(final IRepositoryNode rootTypeNode) {
         SafeRunner.run(new ISafeRunnable() {

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/repositoryObject/MetadataTableRepositoryObject.java

@@ -13,12 +13,14 @@
 package org.talend.core.repository.model.repositoryObject;
 
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
 import org.eclipse.emf.common.util.EList;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.metadata.MetadataSchemaType;
 import org.talend.core.model.metadata.MetadataTable;
 import org.talend.core.model.metadata.builder.connection.AbstractMetadataObject;
@@ -34,12 +36,12 @@ import org.talend.core.model.properties.User;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.ISubRepositoryObject;
+import org.talend.core.runtime.services.IGenericWizardService;
 import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.helper.SubItemHelper;
 import org.talend.cwm.helper.SwitchHelpers;
 import org.talend.cwm.relational.TdTable;
 import org.talend.repository.model.IRepositoryNode;
-
 import orgomg.cwm.objectmodel.core.ModelElement;
 import orgomg.cwm.objectmodel.core.Package;
 
@@ -173,7 +175,13 @@ public class MetadataTableRepositoryObject extends MetadataTable implements ISub
 
         Set tables = null;
 
-        if (table.eContainer() instanceof SAPFunctionUnit) {
+        IGenericWizardService wizardService = null;
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
+            wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
+        }
+        if (wizardService != null && wizardService.isGenericItem(item)) {
+            tables = new HashSet<>(wizardService.getMetadataTables(connection));
+        } else if (table.eContainer() instanceof SAPFunctionUnit) {
             SAPFunctionUnit funUnit = (SAPFunctionUnit) table.eContainer();
             tables = ConnectionHelper.getTables(connection, funUnit);
         } else {

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

@@ -154,8 +154,18 @@ public class CopyObjectAction {
         // for bug 0005454: Copy paste with keyboard in the repository view doesn't work.
         if (targetNode.getType() == ENodeType.REPOSITORY_ELEMENT || targetNode.getType() == ENodeType.SIMPLE_FOLDER
                 || targetNode.getType() == ENodeType.SYSTEM_FOLDER) {
-            return ((ERepositoryObjectType) targetNode.getProperties(EProperties.CONTENT_TYPE)) == objectToCopy
-                    .getRepositoryObjectType();
+            ERepositoryObjectType targetType = ((ERepositoryObjectType) targetNode.getProperties(EProperties.CONTENT_TYPE));
+            ERepositoryObjectType sourceType = objectToCopy.getRepositoryObjectType();
+            if (sourceType.equals(ERepositoryObjectType.PROCESS_STORM)) {
+                return targetType.equals(ERepositoryObjectType.PROCESS) || targetType.equals(ERepositoryObjectType.PROCESS_STORM)
+                        || targetType.equals(ERepositoryObjectType.PROCESS_MR);
+            }
+            if (sourceType.equals(ERepositoryObjectType.PROCESS_MR)) {
+                return targetType.equals(ERepositoryObjectType.PROCESS_STORM)
+                        || targetType.equals(ERepositoryObjectType.PROCESS_MR);
+            }
+
+            return targetType.equals(sourceType);
         }
         return false;
     }

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

@@ -109,7 +109,8 @@ Require-Bundle: org.eclipse.jdt.core,
  org.talend.libraries.csv,
  org.talend.commons.runtime;visibility:=reexport,
  org.talend.commons.ui,
- org.ops4j.pax.url.mvn
+ org.ops4j.pax.url.mvn,
+ org.talend.components.api
 Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,

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

@@ -75,9 +75,9 @@ public enum EDatabaseVersion4Drivers {
     MYSQL_4(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 4", "MYSQL_4", "mysql-connector-java-3.1.14-bin.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MARIADB(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MariaDB", "MARIADB", "mariadb-java-client-1.1.7.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     // add for 9594
-    MSSQL(new DbVersion4Drivers(EDatabaseTypeName.MSSQL, "jtds-1.3.1.jar")), //$NON-NLS-1$
+    MSSQL(new DbVersion4Drivers(EDatabaseTypeName.MSSQL, "jtds-1.3.1-patch.jar")), //$NON-NLS-1$
     MSSQL_2012(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
-            "Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1-patch.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     VERTICA_7(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.0.x", "VERTICA_7_0_X", "vertica-jdbc-7.0.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     VERTICA_6_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 6.1.x", "VERTICA_6_1_X", "vertica-jdk5-6.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/components/EComponentType.java

@@ -23,6 +23,7 @@ public enum EComponentType {
     JOB_METTER,
     JOB_STATS,
     EMF,
+    GENERIC,
     JOB_CONTEXT_LOAD,
     JOBLET,
     JOBLET_INPUT_OUTPUT,

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

@@ -122,10 +122,10 @@ public class ModuleNeeded {
      *
      */
     public enum ELibraryInstallStatus {
-        UNKNOWN,
-        INSTALLED,
-        UNUSED,
-        NOT_INSTALLED;
+                                       UNKNOWN,
+                                       INSTALLED,
+                                       UNUSED,
+                                       NOT_INSTALLED;
     }
 
     /**
@@ -151,6 +151,21 @@ public class ModuleNeeded {
         this(context, moduleName, informationMsg, required, installURL, requiredIf, mavenUrl, ELibraryInstallStatus.UNKNOWN);
     }
 
+    /**
+     * creates ModuleNeeded from its maven uri. the modeule name is the artifact_ID + "." + artifact_type
+     * 
+     * @param context
+     * @param informationMsg
+     * @param required
+     * @param mvnUri
+     */
+    public ModuleNeeded(String context, String informationMsg, boolean required, String mvnUri) {
+        this(context, null, informationMsg, required, null, null, mvnUri, ELibraryInstallStatus.UNKNOWN);
+        MavenArtifact mavenArtifact = MavenUrlHelper.parseMvnUrl(mvnUri);
+        setModuleName(mavenArtifact.getArtifactId() + "." + mavenArtifact.getType());
+
+    }
+
     public ModuleNeeded(String context, String moduleName, String informationMsg, boolean required, List<String> installURL,
             String requiredIf, String mavenUrl, ELibraryInstallStatus status) {
         super();
@@ -266,8 +281,8 @@ public class ModuleNeeded {
         } else {
             // compute the status of the lib.
             // first use the Library manager service
-            ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault().getService(
-                    ILibraryManagerService.class);
+            ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
+                    .getService(ILibraryManagerService.class);
             Set<String> existLibraries = libManagerService.list();
             if (existLibraries.contains(getModuleName())) {
                 status = ELibraryInstallStatus.INSTALLED;
@@ -573,5 +588,4 @@ public class ModuleNeeded {
     public void setMavenUri(String mavenUri) {
         this.mavenUri = mavenUri;
     }
-
 }

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

@@ -16,6 +16,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -67,6 +68,7 @@ import org.talend.core.model.routines.IRoutinesService;
 import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.i18n.Messages;
+import org.talend.core.runtime.services.IGenericWizardService;
 import org.talend.core.utils.KeywordsValidator;
 import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.designer.core.model.utils.emf.talendfile.ColumnType;
@@ -725,7 +727,18 @@ public final class MetadataToolHelper {
                     return getMetadataTableFromSAPFunction((SAPConnection) connection, metaRepositoryId);
                 }
             }
-            Set tables = ConnectionHelper.getTables(connection);
+            Set<MetadataTable> tables = null;
+            IGenericWizardService wizardService = null;
+            if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
+                wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault()
+                        .getService(IGenericWizardService.class);
+            }
+            if (wizardService != null && wizardService.isGenericConnection(connection)) {
+                List<MetadataTable> metadataTables = wizardService.getMetadataTables(connection);
+                tables = new HashSet<>(metadataTables);
+            } else {
+                tables = ConnectionHelper.getTables(connection);
+            }
             for (Object tableObj : tables) {
                 MetadataTable table = (MetadataTable) tableObj;
                 if (table.getLabel().equals(tableName)) {
@@ -1300,7 +1313,7 @@ public final class MetadataToolHelper {
 
     }
 
-    private static IMetadataTable convert(MetadataTable old) {
+    public static IMetadataTable convert(MetadataTable old) {
         ICoreService coreService = (ICoreService) GlobalServiceRegister.getDefault().getService(ICoreService.class);
         IMetadataTable result = new org.talend.core.model.metadata.MetadataTable();
         result.setComment(old.getComment());

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

@@ -18,6 +18,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.StringTokenizer;
 
+import org.talend.components.api.properties.ComponentProperties;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IMultipleComponentManager;
 import org.talend.core.model.components.IODataComponent;
@@ -36,6 +37,8 @@ public abstract class AbstractNode implements INode {
 
     private String componentName;
 
+    private ComponentProperties componentProperties;
+    
     List<? extends IElementParameter> elementParameters;
 
     private List<? extends IConnection> outgoingConnections = new ArrayList<IConnection>();
@@ -1248,4 +1251,14 @@ public abstract class AbstractNode implements INode {
     public void setForceReadOnly(boolean readOnly) {
 
     }
+
+    public void setComponentProperties(ComponentProperties props) {
+    	componentProperties = props;
+    }
+    
+    public ComponentProperties getComponentProperties() {
+    	return componentProperties;
+    }
+
+
 }

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

@@ -162,8 +162,15 @@ public enum EConnectionType implements IConnectionCategory, IDraw2dGraphics {
                    new Integer(LINE_SOLID),
                    new RGB(230, 100, 0)),
 
-    STARTS(21, "STARTS", EConnectionCategory.OTHER, CONDITION | DEPENDENCY | UNIQUE_NAME, "Starts", Messages
-            .getString("EConnectionType.startsMenu"), new Integer(LINE_SOLID), new RGB(0, 0, 150)),
+    STARTS(21, "STARTS", EConnectionCategory.OTHER, CONDITION | DEPENDENCY | UNIQUE_NAME, "Starts", Messages//$NON-NLS-1$ //$NON-NLS-2$
+            .getString("EConnectionType.startsMenu"), new Integer(LINE_SOLID), new RGB(0, 0, 150)), //$NON-NLS-1$ 
+
+    REJECT(0, "REJECT", //$NON-NLS-1$
+           EConnectionCategory.MAIN,
+           MAIN | DATA | FLOW | CUSTOM_NAME | UNIQUE_NAME,
+           "Reject", Messages.getString("EConnectionType.RejectMenu"), //$NON-NLS-1$ //$NON-NLS-2$
+           new Integer(LINE_SOLID),
+           new RGB(230, 100, 0)),
 
     TABLE_REF(22, "TABLE_REF", //$NON-NLS-1$
               // EConnectionCategory.OTHER,

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

@@ -19,80 +19,85 @@ package org.talend.core.model.process;
  * 
  */
 public enum EParameterFieldType {
-    TEXT,
-    PASSWORD,
-    MEMO_SQL,
-    MEMO_PERL,
-    MEMO_JAVA,
-    MEMO_IMPORT,
-    MEMO_MESSAGE,
-    CLOSED_LIST,
-    OPENED_LIST,
-    CHECK,
-    RADIO,
-    MEMO,
-    SCHEMA_TYPE,
-    SCHEMA_XPATH_QUERYS,
-    QUERYSTORE_TYPE,
-    GUESS_SCHEMA,
-    PROPERTY_TYPE,
-    EXTERNAL,
-    FILE,
-    VERSION,
-    TABLE,
-    DIRECTORY,
-    PROCESS_TYPE,
-    IMAGE,
-    COLUMN_LIST,
-    CONNECTION_LIST,
-    PREV_COLUMN_LIST,
-    CONTEXT_PARAM_NAME_LIST,
-    LOOKUP_COLUMN_LIST,
-    TECHNICAL, // means field not displayed directly
-    ENCODING_TYPE,
-    COMPONENT_LIST,
-    MAPPING_TYPE,
-    COLOR,
-    DBTABLE,
-    DATE,
-    DBTYPE_LIST,
-    LABEL,
-    AS400_CHECK,
-    MODULE_LIST,
-    COMMAND,
-    PALO_DIM_SELECTION,
-    WSDL2JAVA,
-    GENERATEGRAMMARCONTROLLER,
-    GENERATE_SURVIVORSHIP_RULES_CONTROLLER, // sizhaoliu TDQ-3356
-    ICON_SELECTION,
-    RULE_TYPE, // hywang add for feature 6484
-    TNS_EDITOR,
-    BROWSE_REPORTS, // bzhou add for feature 9745
-    REFRESH_REPORTS, // xqliu add for TDQ-8198
-    JAVA_COMMAND,
-    VALIDATION_RULE_TYPE,
-    DCSCHEMA, // Datacert custom EparameterFieldType for DCSchemaController
-    TREE_TABLE, // hcyi TDI-17115
-    SURVIVOR_RELATION, // sizhaoliu TDQ-3724
+                                 TEXT,
+                                 PASSWORD,
+                                 MEMO_SQL,
+                                 MEMO_PERL,
+                                 MEMO_JAVA,
+                                 MEMO_IMPORT,
+                                 MEMO_MESSAGE,
+                                 CLOSED_LIST,
+                                 OPENED_LIST,
+                                 CHECK,
+                                 RADIO,
+                                 MEMO,
+                                 SCHEMA_TYPE,
+                                 SCHEMA_XPATH_QUERYS,
+                                 QUERYSTORE_TYPE,
+                                 GUESS_SCHEMA,
+                                 PROPERTY_TYPE,
+                                 EXTERNAL,
+                                 FILE,
+                                 VERSION,
+                                 TABLE,
+                                 DIRECTORY,
+                                 PROCESS_TYPE,
+                                 IMAGE,
+                                 COLUMN_LIST,
+                                 CONNECTION_LIST,
+                                 PREV_COLUMN_LIST,
+                                 CONTEXT_PARAM_NAME_LIST,
+                                 LOOKUP_COLUMN_LIST,
+                                 TECHNICAL, // means field not displayed directly
+                                 ENCODING_TYPE,
+                                 COMPONENT_LIST,
+                                 MAPPING_TYPE,
+                                 COLOR,
+                                 DBTABLE,
+                                 DATE,
+                                 DBTYPE_LIST,
+                                 LABEL,
+                                 AS400_CHECK,
+                                 MODULE_LIST,
+                                 COMMAND,
+                                 PALO_DIM_SELECTION,
+                                 WSDL2JAVA,
+                                 GENERATEGRAMMARCONTROLLER,
+                                 GENERATE_SURVIVORSHIP_RULES_CONTROLLER, // sizhaoliu TDQ-3356
+                                 ICON_SELECTION,
+                                 RULE_TYPE, // hywang add for feature 6484
+                                 TNS_EDITOR,
+                                 BROWSE_REPORTS, // bzhou add for feature 9745
+                                 REFRESH_REPORTS, // xqliu add for TDQ-8198
+                                 JAVA_COMMAND,
+                                 VALIDATION_RULE_TYPE,
+                                 DCSCHEMA, // Datacert custom EparameterFieldType for DCSchemaController
+                                 TREE_TABLE, // hcyi TDI-17115
+                                 SURVIVOR_RELATION, // sizhaoliu TDQ-3724
 
-    ROUTE_RESOURCE_TYPE, // Xiaopeng Li TESB-6226
-    ROUTE_COMPONENT_TYPE,
-    ROUTE_INPUT_PROCESS_TYPE, // like PROCESS_TYPE, but contains a tRouteInput inside
+                                 ROUTE_RESOURCE_TYPE, // Xiaopeng Li TESB-6226
+                                 ROUTE_COMPONENT_TYPE,
+                                 ROUTE_INPUT_PROCESS_TYPE, // like PROCESS_TYPE, but contains a tRouteInput inside
 
-    REST_RESPONSE_SCHEMA_TYPE, // Used to specify the response body type
+                                 REST_RESPONSE_SCHEMA_TYPE, // Used to specify the response body type
 
-    FILE_HADOOP, // ycbai add for feature TDI-22111
-    DIRECTORY_HADOOP, // ycbai add for feature TDI-22111
-    BOTH_HADOOP, // ycbai add for feature TDI-22111
-    HADOOP_JARS_DIALOG,
-    HMAP_PATH, // wchen added for TDM
-    MATCH_RULE_IMEX_CONTROLLER, // sizhaoliu TDQ-7910
-    TABLE_BY_ROW,
-    SAP_SCHEMA_TYPE,
-    HADOOP_DISTRIBUTION,
-    HADOOP_LIBRARIES,
-    DATA_PREP_ID, // wchen added for TDI-33791
-    FETCH_SCHEMA // TDI-33791
+                                 FILE_HADOOP, // ycbai add for feature TDI-22111
+                                 DIRECTORY_HADOOP, // ycbai add for feature TDI-22111
+                                 BOTH_HADOOP, // ycbai add for feature TDI-22111
+                                 HADOOP_JARS_DIALOG,
+                                 HMAP_PATH, // wchen added for TDM
+                                 MATCH_RULE_IMEX_CONTROLLER, // sizhaoliu TDQ-7910
+                                 TABLE_BY_ROW,
+                                 SAP_SCHEMA_TYPE,
+                                 HADOOP_DISTRIBUTION,
+                                 HADOOP_LIBRARIES,
+                                 DATA_PREP_ID, // wchen added for TDI-33791
+                                 FETCH_SCHEMA, // TDI-33791
+
+                                 BUTTON, // ycbai added for generic wizard
+                                 NAME_SELECTION_AREA, // ycbai added for generic wizard
+                                 NAME_SELECTION_REFERENCE, // ycbai added for generic wizard
+                                 COMPONENT_REFERENCE, // ycbai added for generic wizard
 
     ;
 

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

@@ -228,4 +228,8 @@ public interface IElementParameter {
     public void setLog4JEnabled(boolean enable);
 
     public boolean isLog4JEnabled();
+
+    public boolean isSerialized();
+
+    public void setSerialized(boolean isSerialized);
 }

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

@@ -16,6 +16,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.talend.components.api.properties.ComponentProperties;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IODataComponent;
 import org.talend.core.model.general.ModuleNeeded;
@@ -300,4 +301,8 @@ public interface INode extends IElement {
     public List<ModuleNeeded> getModulesNeeded();
 
     public boolean isSubtreeStart();
+    
+    public void setComponentProperties(ComponentProperties props);
+    
+    public ComponentProperties getComponentProperties();
 }

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

@@ -144,7 +144,7 @@ public abstract class RepositoryUpdateManager {
 
     private boolean isDetectAndUpdate = false;
 
-    private static boolean isAddColumn = false;
+    protected static boolean isAddColumn = false;
 
     static {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRepositoryService.class)) {
@@ -1687,7 +1687,7 @@ public abstract class RepositoryUpdateManager {
 
     }
 
-    private static boolean isAddColumn(IMetadataTable tableFromMetadata, IMetadataTable tableFromProcess) {
+    protected static boolean isAddColumn(IMetadataTable tableFromMetadata, IMetadataTable tableFromProcess) {
         boolean isHaveAddColumn = false;
         for (IMetadataColumn columnFromMetadata : tableFromMetadata.getListColumns(true)) {
             boolean flag = false;
@@ -1973,7 +1973,7 @@ public abstract class RepositoryUpdateManager {
         return updateSchema(metadataTable, connItem, null, show, onlySimpleShow);
     }
 
-    private static boolean updateSchema(final Object table, ConnectionItem connItem, Map<String, String> schemaRenamedMap,
+    protected static boolean updateSchema(final Object table, ConnectionItem connItem, Map<String, String> schemaRenamedMap,
             boolean show, boolean onlySimpleShow) {
         IProxyRepositoryFactory factory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
         List<IRepositoryViewObject> updateList = new ArrayList<IRepositoryViewObject>();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/repository/RepositoryComponentManager.java

@@ -30,6 +30,7 @@ import org.osgi.framework.Bundle;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.database.EDatabaseTypeName;
+import org.talend.core.model.components.EComponentType;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IComponentsService;
 import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
@@ -357,6 +358,9 @@ public final class RepositoryComponentManager {
             if (component.isTechnical()) {
                 continue;
             }
+            if (EComponentType.GENERIC.equals(component.getComponentType())) {
+                continue;
+            }
             for (RepositoryComponentDndFilterSetting dndFilter : getDndFilterSettings()) {
                 IRepositoryComponentDndFilter filter = dndFilter.getFilter();
                 if (filter == null) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/services/IGenericWizardService.java

@@ -0,0 +1,96 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.runtime.services;
+
+import java.util.List;
+
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.talend.core.IService;
+import org.talend.core.model.metadata.builder.connection.Connection;
+import org.talend.core.model.metadata.builder.connection.MetadataTable;
+import org.talend.core.model.process.EComponentCategory;
+import org.talend.core.model.process.Element;
+import org.talend.core.model.properties.Item;
+import org.talend.core.model.repository.ERepositoryObjectType;
+import org.talend.repository.model.RepositoryNode;
+
+/**
+ * created by ycbai on 2015年9月10日 Detailled comment
+ *
+ */
+public interface IGenericWizardService extends IService {
+
+    /**
+     * Create repository nodes by component service.
+     * 
+     * @param curParentNode
+     */
+    public List<RepositoryNode> createNodesFromComponentService(RepositoryNode curParentNode);
+
+    /**
+     * Get all the names of generic type.
+     * 
+     * @return
+     */
+    public List<String> getGenericTypeNames();
+
+    /**
+     * 
+     * Estimate whether <code>repObjType</code> is a generic type or not.
+     * 
+     * @param repObjType
+     * @return
+     */
+    public boolean isGenericType(ERepositoryObjectType repObjType);
+
+    public boolean isGenericItem(Item item);
+
+    public boolean isGenericConnection(Connection connection);
+
+    /**
+     * Get node image by node type name.
+     * 
+     * @param typeName
+     * @return
+     */
+    public Image getNodeImage(String typeName);
+
+    /**
+     * Get wizard image by node type name.
+     * 
+     * @param typeName
+     * @return
+     */
+    public Image getWiardImage(String typeName);
+
+    /**
+     *
+     * Get metadata tables from connection
+     * 
+     * @param connection
+     * @return
+     */
+    public List<MetadataTable> getMetadataTables(Connection connection);
+
+    /**
+     * Get the dynamic composite
+     *
+     * @param composite
+     * @param sectionCategory
+     * @param isCompactView
+     * @return
+     */
+    public Composite creatDynamicComposite(Composite composite, Element element, EComponentCategory sectionCategory,
+            boolean isCompactView);
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/ITestContainerProviderService.java

@@ -105,7 +105,7 @@ public interface ITestContainerProviderService extends IService {
     public IRepositoryEditorInput createTestCaseEditorInput(ProcessItem junitItem, boolean load, String originalJobID,
             List<INode> testNodes, Boolean lastVersion, Boolean readonly) throws PersistenceException;
 
-    public ProcessType loadSVNTestContainer(Item item, IProcess2 loadedProcess, Property loadProperty);
+    public ProcessType loadRemoteTestContainer(Item item, IProcess2 loadedProcess, Property loadProperty);
 
     public ERepositoryObjectType getTestCaseObjectType();
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/repository/UpdateRepositoryUtils.java

@@ -31,10 +31,12 @@ import org.talend.core.model.metadata.builder.connection.SAPConnection;
 import org.talend.core.model.metadata.builder.connection.SAPFunctionUnit;
 import org.talend.core.model.properties.ConnectionItem;
 import org.talend.core.model.properties.Item;
+import org.talend.core.model.properties.Property;
 import org.talend.core.model.properties.SAPConnectionItem;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.utils.UpdateRepositoryHelper;
 import org.talend.core.runtime.CoreRuntimePlugin;
+import org.talend.core.runtime.services.IGenericWizardService;
 import org.talend.core.service.IMetadataManagmentService;
 import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.repository.model.IProxyRepositoryFactory;
@@ -313,6 +315,31 @@ public final class UpdateRepositoryUtils {
                         return tables;
                     }
                 }
+                // Generic
+                IGenericWizardService wizardService = null;
+                if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
+                    wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault().getService(
+                            IGenericWizardService.class);
+                }
+                if (wizardService != null) {
+                    Property property = ((ConnectionItem) item).getProperty();
+                    if (property != null && property.getId() != null) {
+                        try {
+                            IRepositoryViewObject repObject = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory()
+                                    .getLastVersion(ProjectManager.getInstance().getCurrentProject(), property.getId());
+                            if (repObject != null && wizardService.isGenericType(repObject.getRepositoryObjectType())) {
+                                List<MetadataTable> metadataTables = wizardService.getMetadataTables(connection);
+                                EList<MetadataTable> tables = new BasicEList<MetadataTable>();
+                                if (metadataTables != null) {
+                                    tables.addAll(metadataTables);
+                                    return tables;
+                                }
+                            }
+                        } catch (PersistenceException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
                 final Set<MetadataTable> tableset = ConnectionHelper.getTables(connection);
                 if (tableset != null) {
                     EList<MetadataTable> tables = new BasicEList<MetadataTable>();

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

@@ -44,6 +44,7 @@ import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.utils.RepositoryManagerHelper;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.i18n.Messages;
+import org.talend.core.runtime.services.IGenericWizardService;
 import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.repository.ProjectManager;
 import org.talend.repository.model.IRepositoryNode.ENodeType;
@@ -627,6 +628,13 @@ public class RepositoryNodeUtilities {
     private static RepositoryNode getSchemeFromConnection(RepositoryNode connection, String tableName,
             ERepositoryObjectType repType) {
         ERepositoryObjectType type = connection.getObject().getRepositoryObjectType();
+        IGenericWizardService wizardService = null;
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
+            wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
+        }
+        if (wizardService != null && wizardService.isGenericType(type)) {
+            return getGenericSchemaNode(connection, tableName);
+        }
         if (repType == ERepositoryObjectType.METADATA_CON_QUERY) {
             for (IRepositoryNode node : connection.getChildren()) {
                 if (Messages.getString("RepositoryContentProvider.repositoryLabel.Queries").equals(node.getLabel())) { //$NON-NLS-1$
@@ -662,6 +670,22 @@ public class RepositoryNodeUtilities {
         return null;
     }
 
+    private static RepositoryNode getGenericSchemaNode(RepositoryNode parentNode, String tableName) {
+        RepositoryNode node = null;
+        Object type = parentNode.getProperties(EProperties.CONTENT_TYPE);
+        Object label = parentNode.getProperties(EProperties.LABEL);
+        if (ERepositoryObjectType.METADATA_CON_TABLE.equals(type) && tableName.equals(label)) {
+            node = parentNode;
+        }
+        for (IRepositoryNode child : parentNode.getChildren()) {
+            RepositoryNode sNode = getGenericSchemaNode((RepositoryNode) child, tableName);
+            if (sNode != null) {
+                node = sNode;
+            }
+        }
+        return node;
+    }
+
     /**
      * 
      * ggu Comment method "getParentRepositoryNodeFromSelection".

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

@@ -13,6 +13,7 @@
 package org.talend.repository.model.nodes;
 
 import java.util.List;
+import java.util.Map;
 
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.repository.model.IRepositoryNode;
@@ -33,6 +34,8 @@ public interface IProjectRepositoryNode {
 
     public RepositoryNode getRootRepositoryNode(ERepositoryObjectType type, boolean tryInit);
 
+    public Map<String, RepositoryNode> getGenericTopNodesMap();
+
     public void dispose();
 
     public void initNode(final IRepositoryNode rootTypeNode);

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

@@ -34,10 +34,12 @@ Import-Package: org.eclipse.jdt.internal.ui.workingsets
 Export-Package: org.talend.core.ui,
  org.talend.core.ui.actions,
  org.talend.core.ui.advanced.composite,
+ org.talend.core.ui.check,
  org.talend.core.ui.component,
  org.talend.core.ui.component.preference,
  org.talend.core.ui.component.preference.provider,
  org.talend.core.ui.component.settings,
+ org.talend.core.ui.composite,
  org.talend.core.ui.context,
  org.talend.core.ui.context.action,
  org.talend.core.ui.context.cmd,

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/check/Checker.java

@@ -0,0 +1,61 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.ui.check;
+
+import org.eclipse.core.runtime.IStatus;
+
+/**
+ * 
+ * created by ycbai on 2015年10月9日 Detailled comment
+ *
+ */
+public class Checker implements IChecker {
+
+    private ICheckListener listener;
+
+    private int statusLevel = IStatus.OK;
+
+    private String status;
+
+    @Override
+    public void setListener(ICheckListener listener) {
+        this.listener = listener;
+    }
+
+    @Override
+    public void updateStatus(int level, final String statusLabelText) {
+        this.statusLevel = level;
+        if (statusLabelText != null) {
+            this.status = statusLabelText;
+        }
+        if (listener != null) {
+            listener.checkPerformed(this);
+        }
+    }
+
+    @Override
+    public boolean isStatusOnError() {
+        return this.statusLevel == IStatus.ERROR;
+    }
+
+    @Override
+    public String getStatus() {
+        return this.status;
+    }
+
+    @Override
+    public int getStatusLevel() {
+        return this.statusLevel;
+    }
+
+}

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/check/ICheckListener.java

@@ -0,0 +1,24 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.ui.check;
+
+/**
+ * 
+ * created by ycbai on 2015年9月30日 Detailled comment
+ *
+ */
+public interface ICheckListener {
+
+    public void checkPerformed(IChecker source);
+
+}

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/check/IChecker.java

@@ -0,0 +1,32 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.ui.check;
+
+/**
+ * 
+ * created by ycbai on 2015年10月9日 Detailled comment
+ *
+ */
+public interface IChecker {
+
+    public void setListener(ICheckListener listener);
+
+    public void updateStatus(int level, final String statusLabelText);
+
+    public boolean isStatusOnError();
+
+    public String getStatus();
+
+    public int getStatusLevel();
+
+}

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/composite/ElementsSelectionComposite.java

@@ -0,0 +1,145 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.ui.composite;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTreeViewer;
+import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.talend.core.ui.advanced.composite.FilteredCheckboxTree;
+import org.talend.core.ui.advanced.composite.PatternFilter;
+
+/**
+ * created by ycbai on 2015年10月8日 Detailled comment
+ *
+ */
+public class ElementsSelectionComposite<T> extends Composite {
+
+    private boolean multipleSelection = true;
+
+    private CheckboxTreeViewer viewer;
+
+    public ElementsSelectionComposite(Composite parent) {
+        this(parent, true);
+    }
+
+    public ElementsSelectionComposite(Composite parent, boolean multipleSelection) {
+        super(parent, SWT.NONE);
+        this.multipleSelection = multipleSelection;
+        GridLayout gridLayout = new GridLayout();
+        gridLayout.marginWidth = 0;
+        gridLayout.marginHeight = 0;
+        setLayout(gridLayout);
+        createControl();
+    }
+
+    private void createControl() {
+        int styles = SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL;
+        if (multipleSelection) {
+            styles = styles | SWT.MULTI;
+        }
+        FilteredCheckboxTree filteredCheckboxTree = new FilteredCheckboxTree(this, styles, new PatternFilter());
+        viewer = filteredCheckboxTree.getViewer();
+        viewer.setContentProvider(getContentProvider());
+        viewer.setLabelProvider(getLabelProvider());
+        viewer.addCheckStateListener(new ICheckStateListener() {
+
+            @Override
+            public void checkStateChanged(CheckStateChangedEvent event) {
+                doSelectionChanged();
+            }
+        });
+    }
+
+    protected void doSelectionChanged() {
+        // Do nothing by default.
+    }
+
+    protected IContentProvider getContentProvider() {
+        return new ITreeContentProvider() {
+
+            @Override
+            public Object[] getChildren(Object parentElement) {
+                return null;
+            }
+
+            @Override
+            public Object[] getElements(Object inputElement) {
+                if (inputElement instanceof List) {
+                    return ((List) inputElement).toArray();
+                }
+                return new Object[] { inputElement };
+            }
+
+            @Override
+            public boolean hasChildren(Object element) {
+                return false;
+            }
+
+            @Override
+            public Object getParent(Object element) {
+                return null;
+            }
+
+            @Override
+            public void dispose() {
+            }
+
+            @Override
+            public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+            }
+
+        };
+    }
+
+    protected IBaseLabelProvider getLabelProvider() {
+        return new LabelProvider() {
+
+            @Override
+            public String getText(Object obj) {
+                return obj.toString();
+            }
+
+            @Override
+            public Image getImage(Object obj) {
+                return null;
+            }
+        };
+    }
+
+    public void setViewerData(List<T> nls) {
+        viewer.setInput(nls);
+    }
+
+    public List<T> getSelectedElements() {
+        List<T> nls = new ArrayList<>();
+        Object[] checkedElements = viewer.getCheckedElements();
+        for (Object obj : checkedElements) {
+            T nl = (T) obj;
+            nls.add(nl);
+        }
+        return nls;
+    }
+
+}

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

@@ -147,6 +147,7 @@ PerlDynamicProposalUtil.autoConvert=\ would be automatically converted to {0}->[
 ProcessorUtilities.finalizeBuild=Finalize build... 
 ProcessorUtilities.generatingJob=Generating job... 
 ProcessorUtilities.loadingJob=Loading job... 
+ProcessorUtilities.nullProcess=The testCase process is null.
 RelationshipItemBuilder.buildingIndex=Building index...
 RelationshipItemBuilder.forItem=for item 
 RepositoryObject.NotImplemented=not implemented

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

@@ -31,21 +31,21 @@ import org.talend.core.model.properties.Item;
  */
 public class ObjectElementParameter implements IElementParameter {
 
-    private String   name;
+    private String name;
 
-    private Object   value;
+    private Object value;
 
     private String[] listItemsDisplayCodeName;
 
-    private boolean  contextMode;
+    private boolean contextMode;
 
-    private RGB      color;
+    private RGB color;
 
-    private RGB      backgroundColor;
+    private RGB backgroundColor;
 
-    private boolean  raw;
+    private boolean raw;
 
-    private boolean  enable = true;
+    private boolean enable = true;
 
     /**
      * Constructs a new TextElementParameter.
@@ -1026,4 +1026,24 @@ public class ObjectElementParameter implements IElementParameter {
         this.enable = enable;
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.core.model.process.IElementParameter#isSerialized()
+     */
+    @Override
+    public boolean isSerialized() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.core.model.process.IElementParameter#setSerialized(boolean)
+     */
+    @Override
+    public void setSerialized(boolean isSerialized) {
+        // TODO Auto-generated method stub
+    }
 }

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

@@ -25,6 +25,7 @@ import java.util.Set;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
@@ -92,6 +93,8 @@ import org.talend.repository.model.IRepositoryService;
  */
 public class ProcessorUtilities {
 
+    private static Logger log = Logger.getLogger(ProcessorUtilities.class);
+
     public static final int GENERATE_MAIN_ONLY = TalendProcessOptionConstants.GENERATE_MAIN_ONLY;
 
     public static final int GENERATE_WITH_FIRST_CHILD = TalendProcessOptionConstants.GENERATE_WITH_FIRST_CHILD;
@@ -1571,12 +1574,19 @@ public class ProcessorUtilities {
                 && GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
             ITestContainerProviderService testContainerService = (ITestContainerProviderService) GlobalServiceRegister
                     .getDefault().getService(ITestContainerProviderService.class);
-            List<ProcessItem> testsItems = testContainerService.getAllTestContainers(parentJobInfo.getProcessItem());
-            for (ProcessItem testItem : testsItems) {
-                JobInfo jobInfo = new JobInfo(testItem, testItem.getProcess().getDefaultContext());
-                jobInfo.setTestContainer(true);
-                jobInfos.add(jobInfo);
-                jobInfo.setFatherJobInfo(parentJobInfo);
+            if (testContainerService != null) {
+                List<ProcessItem> testsItems = testContainerService.getAllTestContainers(parentJobInfo.getProcessItem());
+                for (ProcessItem testItem : testsItems) {
+                    ProcessType testProcess = testContainerService.getTestContainerProcess(testItem);
+                    if (testProcess == null) {
+                        log.warn(Messages.getString("ProcessorUtilities.nullProcess")); //$NON-NLS-1$
+                        continue;
+                    }
+                    JobInfo jobInfo = new JobInfo(testItem, testProcess.getDefaultContext());
+                    jobInfo.setTestContainer(true);
+                    jobInfos.add(jobInfo);
+                    jobInfo.setFatherJobInfo(parentJobInfo);
+                }
             }
         }
         return jobInfos;
@@ -1650,7 +1660,7 @@ public class ProcessorUtilities {
             if (jobInfo.getJobId().equals(processId)) {
                 if (contextName != null && !contextName.equals("") && !jobInfo.getContextName().equals(contextName)) {
                     continue;
-                }   
+                }
                 if (version != null && !version.equals(jobInfo.getJobVersion())) {
                     continue;
                 }

main/plugins/org.talend.designer.maven.ui/src/main/java/org/talend/designer/maven/ui/setting/preference/M2eUserSettingForTalendLoginTask.java

@@ -105,6 +105,8 @@ public class M2eUserSettingForTalendLoginTask extends AbstractLoginTask {
         final boolean isSet = prefSetting.getBoolean(MAVEN_SETTING_HAVE_SET, false);
         final boolean isLocalRepository = isLocalRepository();
 
+        boolean forceUpdate = !isSet && !isLocalRepository;
+
         final Path configPath = new Path(Platform.getConfigurationLocation().getURL().getPath());
         final File studioUserSettingsFile = configPath.append(
                 IProjectSettingTemplateConstants.MAVEN_USER_SETTING_TEMPLATE_FILE_NAME).toFile();
@@ -167,7 +169,8 @@ public class M2eUserSettingForTalendLoginTask extends AbstractLoginTask {
                 if (updateProfileSettings(monitor, maven, settings, configPath, studioUserSettingsFile)) {
                     modified = true;
                 }
-                if (modified) { // save changes
+
+                if (modified || forceUpdate) { // save changes
                     maven.writeSettings(settings, new FileOutputStream(studioUserSettingsFile));
                     // after update reload
                     maven.reloadSettings();
@@ -247,14 +250,14 @@ public class M2eUserSettingForTalendLoginTask extends AbstractLoginTask {
         if (monitor.isCanceled()) {
             return false;
         }
+        final String m2Repo = ".m2/repository"; //$NON-NLS-1$
         // default one
-        String localRepoPath = System.getProperty("user.home") + "/.m2/repository"; //$NON-NLS-1$
+        IPath localRepoPath = new Path(System.getProperty("user.home")).append(m2Repo); //$NON-NLS-1$
         // if local, always use config one
-        if (isLocalRepository() || !enableAccessM2Repository(monitor, localRepoPath)) {
+        if (isLocalRepository() || !enableAccessM2Repository(monitor, localRepoPath.toString())) {
             // need change the repo setting
-            IPath m2RepoPath = configPath.append(".m2/repository"); //$NON-NLS-1$
-            localRepoPath = m2RepoPath.toString();
-            File studioDefaultRepoFolder = m2RepoPath.toFile();
+            localRepoPath = configPath.append(m2Repo);
+            File studioDefaultRepoFolder = localRepoPath.toFile();
             if (!studioDefaultRepoFolder.exists()) {
                 studioDefaultRepoFolder.mkdirs();
             }
@@ -262,9 +265,9 @@ public class M2eUserSettingForTalendLoginTask extends AbstractLoginTask {
         }
         // make sure the setting file can be changed.
         if (userSettingsFile.exists() && userSettingsFile.canRead() && userSettingsFile.canWrite()
-                && !localRepoPath.equals(settings.getLocalRepository())) {
+                && !localRepoPath.toString().equals(settings.getLocalRepository())) {
             // modify the setting file for "localRepository"
-            settings.setLocalRepository(localRepoPath);
+            settings.setLocalRepository(localRepoPath.toString());
             maven.reloadSettings();
             // should same as MavenSettingsPreferencePage.updateSettings update index?
             try {

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

@@ -187,7 +187,7 @@ public class PomUtil {
      * 
      * @return
      */
-    public static Dependency createDependency(String groupId, String artifactId, String version, String type) {
+    public static Dependency createDependency(String groupId, String artifactId, String version, String type, String classifier) {
         if (artifactId == null) {
             return null;
         }
@@ -196,10 +196,15 @@ public class PomUtil {
         dependency.setArtifactId(artifactId);
         dependency.setVersion(version == null ? MavenConstants.DEFAULT_LIB_VERSION : version);
         dependency.setType(type == null ? TalendMavenConstants.PACKAGING_JAR : type);
+        dependency.setClassifier(classifier);
 
         return dependency;
     }
 
+    public static Dependency createDependency(String groupId, String artifactId, String version, String type) {
+        return createDependency(groupId, artifactId, version, type, null);
+    }
+
     public static Dependency createModuleDependency(String str) {
         if (str == null) {
             return null;
@@ -211,7 +216,8 @@ public class PomUtil {
 
         MavenArtifact artifact = MavenUrlHelper.parseMvnUrl(mvnUrl);
         if (artifact != null) {
-            return createDependency(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType());
+            return createDependency(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType(),
+                    artifact.getClassifier());
         }
         return null;
     }

main/plugins/org.talend.libraries.jdbc.jtds.jars/.classpath

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/jtds-1.3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jtds-1.3.1-patch.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

main/plugins/org.talend.libraries.jdbc.jtds/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: Jtds Plug-in
 Bundle-SymbolicName: org.talend.libraries.jdbc.jtds;singleton:=true
 Bundle-Version: 6.1.1.qualifier
 Bundle-Vendor: .Talend SA.
-Bundle-ClassPath: lib/jtds-1.3.1.jar,
+Bundle-ClassPath: lib/jtds-1.3.1-patch.jar,
  .
 Export-Package: net.sourceforge.jtds.jdbc,
  net.sourceforge.jtds.jdbc.cache,

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

@@ -6,7 +6,7 @@
             context="plugin:org.talend.libraries.jdbc.jtds"
             language="java"
             message="Needed for jtds jdbc plugin"
-            name="jtds-1.3.1.jar" mvn_uri="mvn:org.talend.libraries/jtds-1.3.1/6.0.0" 
+            name="jtds-1.3.1-patch.jar" mvn_uri="mvn:org.talend.libraries/jtds-1.3.1-patch/6.1.1" 
             required="true">
       </libraryNeeded>
    </extension>

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

@@ -27,7 +27,7 @@
                 <resource>
                   <directory>${basedir}/../org.talend.libraries.jdbc.jtds.jars/lib</directory>
 					<includes> 
-						<include>jtds-1.3.1.jar</include> 
+						<include>jtds-1.3.1-patch.jar</include> 
 					</includes>
                   <filtering>false</filtering>
                 </resource>

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

@@ -11,6 +11,7 @@
         </libraryNeeded>
         <libraryNeeded
               context="plugin:org.talend.libraries.jdbc.mysql"
+              id="mariadb-java-client-1.1.7.jar"
               language="java"
               message="Needed for Mysql jdbc plugin"
               mvn_uri="mvn:org.talend.libraries/mariadb-java-client-1.1.7/6.0.0"

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

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-core-3.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-soap-3.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-databinding-jaxb-3.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxws-3.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-simple-3.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-transports-http-3.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-security-3.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-wsdl-3.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-bindings-soap-3.1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-core-3.1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-databinding-jaxb-3.1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-jaxws-3.1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-frontend-simple-3.1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-transports-http-3.1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-ws-security-3.1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cxf-rt-wsdl-3.1.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jaxb-core-2.2.11.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2.11.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/neethi-3.0.3.jar"/>

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

@@ -6,14 +6,14 @@ Bundle-Version: 6.1.1.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
  lib/commons-discovery-0.2.jar,
- lib/cxf-core-3.1.1.jar,
- lib/cxf-rt-bindings-soap-3.1.1.jar,
- lib/cxf-rt-databinding-jaxb-3.1.1.jar,
- lib/cxf-rt-frontend-jaxws-3.1.1.jar,
- lib/cxf-rt-frontend-simple-3.1.1.jar,
- lib/cxf-rt-transports-http-3.1.1.jar,
- lib/cxf-rt-ws-security-3.1.1.jar,
- lib/cxf-rt-wsdl-3.1.1.jar,
+ lib/cxf-core-3.1.4.jar,
+ lib/cxf-rt-bindings-soap-3.1.4.jar,
+ lib/cxf-rt-databinding-jaxb-3.1.4.jar,
+ lib/cxf-rt-frontend-jaxws-3.1.4.jar,
+ lib/cxf-rt-frontend-simple-3.1.4.jar,
+ lib/cxf-rt-transports-http-3.1.4.jar,
+ lib/cxf-rt-ws-security-3.1.4.jar,
+ lib/cxf-rt-wsdl-3.1.4.jar,
  lib/jaxb-core-2.2.11.jar,
  lib/jaxb-impl-2.2.11.jar,
  lib/neethi-3.0.3.jar,

main/plugins/org.talend.libraries.mdm/plugin.xml

@@ -5,59 +5,59 @@
          point="org.talend.core.runtime.librariesNeeded">
       <libraryNeeded
             context="plugin:org.talend.libraries.mdm"
-            mvn_uri="mvn:org.talend.libraries/cxf-core-3.1.1/6.0.0"
-            name="cxf-core-3.1.1.jar"
+            mvn_uri="mvn:org.talend.libraries/cxf-core-3.1.4/6.1.0"
+            name="cxf-core-3.1.4.jar"
             required="true"
-            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-core-3.1.1.jar">
+            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-core-3.1.4.jar">
       </libraryNeeded>
       <libraryNeeded
             context="plugin:org.talend.libraries.mdm"
-            mvn_uri="mvn:org.talend.libraries/cxf-rt-bindings-soap-3.1.1/6.0.0"
-            name="cxf-rt-bindings-soap-3.1.1.jar"
+            mvn_uri="mvn:org.talend.libraries/cxf-rt-bindings-soap-3.1.4/6.1.0"
+            name="cxf-rt-bindings-soap-3.1.4.jar"
             required="true"
-            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-bindings-soap-3.1.1.jar">
+            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-bindings-soap-3.1.4.jar">
       </libraryNeeded>
      <libraryNeeded
             context="plugin:org.talend.libraries.mdm"
-            mvn_uri="mvn:org.talend.libraries/cxf-rt-databinding-jaxb-3.1.1/6.0.0"
-            name="cxf-rt-databinding-jaxb-3.1.1.jar"
+            mvn_uri="mvn:org.talend.libraries/cxf-rt-databinding-jaxb-3.1.4/6.1.0"
+            name="cxf-rt-databinding-jaxb-3.1.4.jar"
             required="true"
-            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-databinding-jaxb-3.1.1.jar">
+            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-databinding-jaxb-3.1.4.jar">
       </libraryNeeded>
       <libraryNeeded
             context="plugin:org.talend.libraries.mdm"
-            mvn_uri="mvn:org.talend.libraries/cxf-rt-frontend-jaxws-3.1.1/6.0.0"
-            name="cxf-rt-frontend-jaxws-3.1.1.jar"
+            mvn_uri="mvn:org.talend.libraries/cxf-rt-frontend-jaxws-3.1.4/6.1.0"
+            name="cxf-rt-frontend-jaxws-3.1.4.jar"
             required="true"
-            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-frontend-jaxws-3.1.1.jar">
+            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-frontend-jaxws-3.1.4.jar">
       </libraryNeeded>
       <libraryNeeded
             context="plugin:org.talend.libraries.mdm"
-            mvn_uri="mvn:org.talend.libraries/cxf-rt-frontend-simple-3.1.1/6.0.0"
-            name="cxf-rt-frontend-simple-3.1.1.jar"
+            mvn_uri="mvn:org.talend.libraries/cxf-rt-frontend-simple-3.1.4/6.1.0"
+            name="cxf-rt-frontend-simple-3.1.4.jar"
             required="true"
-            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-frontend-simple-3.1.1.jar">
+            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-frontend-simple-3.1.4.jar">
       </libraryNeeded>
       <libraryNeeded
             context="plugin:org.talend.libraries.mdm"
-            mvn_uri="mvn:org.talend.libraries/cxf-rt-transports-http-3.1.1/6.0.0"
-            name="cxf-rt-transports-http-3.1.1.jar"
+            mvn_uri="mvn:org.talend.libraries/cxf-rt-transports-http-3.1.4/6.1.0"
+            name="cxf-rt-transports-http-3.1.4.jar"
             required="true"
-            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-transports-http-3.1.1.jar">
+            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-transports-http-3.1.4.jar">
       </libraryNeeded>
       <libraryNeeded
             context="plugin:org.talend.libraries.mdm"
-            mvn_uri="mvn:org.talend.libraries/cxf-rt-ws-security-3.1.1/6.0.0"
-            name="cxf-rt-ws-security-3.1.1.jar"
+            mvn_uri="mvn:org.talend.libraries/cxf-rt-ws-security-3.1.4/6.1.0"
+            name="cxf-rt-ws-security-3.1.4.jar"
             required="true"
-            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-ws-security-3.1.1.jar">
+            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-ws-security-3.1.4.jar">
       </libraryNeeded>
       <libraryNeeded
             context="plugin:org.talend.libraries.mdm"
-            mvn_uri="mvn:org.talend.libraries/cxf-rt-wsdl-3.1.1/6.0.0"
-            name="cxf-rt-wsdl-3.1.1.jar"
+            mvn_uri="mvn:org.talend.libraries/cxf-rt-wsdl-3.1.4/6.1.0"
+            name="cxf-rt-wsdl-3.1.4.jar"
             required="true"
-            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-wsdl-3.1.1.jar">
+            uripath="platform:/plugin/org.talend.libraries.apache.cxf/lib/cxf-rt-wsdl-3.1.4.jar">
       </libraryNeeded>
       <libraryNeeded
             context="plugin:org.talend.libraries.mdm"
@@ -68,6 +68,7 @@
       </libraryNeeded>
       <libraryNeeded
             context="plugin:org.talend.libraries.mdm"
+            id="jaxb-impl-2.2.11.jar"
             mvn_uri="mvn:org.talend.libraries/jaxb-impl-2.2.11/6.0.0"
             name="jaxb-impl-2.2.11.jar"
             required="true"

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

@@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.talend.core.runtime;visibility:=reexport,
  org.talend.metadata.managment,
  org.apache.log4j,
- org.talend.designer.maven
+ org.talend.designer.maven,
+ org.talend.components.api
 Eclipse-LazyStart: true
 Bundle-ClassPath: .
 Export-Package: org.talend.librariesmanager.emf.librariesindex,

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

@@ -0,0 +1,38 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package routines.system;
+
+import java.util.Date;
+import java.util.Map;
+
+import org.talend.components.api.runtime.ComponentDynamicHolder;
+import org.talend.components.api.runtime.ComponentRuntimeContainer;
+
+public class ComponentRuntimeContainerBase implements ComponentRuntimeContainer {
+
+	@Override
+	public ComponentDynamicHolder createDynamicHolder() {
+		throw new RuntimeException("This must be subclassed");
+	}
+
+	@Override
+	public String formatDate(Date date, String pattern) {
+		return FormatterUtils.format(date, pattern);
+	}
+
+	@Override
+	public Map<String, Object> getGlobalMap() {
+		throw new RuntimeException("This must be subclassed");
+	}
+
+}

main/plugins/org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/model/ModulesNeededProvider.java

@@ -765,9 +765,19 @@ public class ModulesNeededProvider {
 
     public static List<ModuleNeeded> filterOutRequiredModulesForBundle(List<ModuleNeeded> moduleList) {
         List<ModuleNeeded> pluginRequiredModules = new ArrayList<ModuleNeeded>();
+        List<String> requiredModuleNames = new ArrayList<String>();
         for (ModuleNeeded module : moduleList) {
             String context = module.getContext();
-            if (context == null || !context.startsWith(PLUGINS_CONTEXT_KEYWORD)) {
+            if (context != null && !context.startsWith(PLUGINS_CONTEXT_KEYWORD) && module.isRequired()) {
+                requiredModuleNames.add(module.getModuleName());
+            }
+        }
+        for (ModuleNeeded module : moduleList) {
+            if (requiredModuleNames.contains(module.getModuleName())) {
+                continue;
+            }
+            String context = module.getContext();
+            if (context == null || !context.startsWith(PLUGINS_CONTEXT_KEYWORD) || !module.isRequired()) {
                 pluginRequiredModules.add(module);
             }// else ignor
         }

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

@@ -316,7 +316,10 @@ public class LocalLibraryManager implements ILibraryManagerService {
         File jarFile = null;
         boolean needResetModule = false;
         try {
-            jarFile = getJarFile(jarNeeded);
+            jarFile = getJarFile(snapshotMvnUri);
+            if (jarFile == null) {
+                jarFile = getJarFile(jarNeeded);
+            }
             // retreive form custom nexus server automatically
             TalendLibsServerManager manager = TalendLibsServerManager.getInstance();
             final NexusServerBean customNexusServer = manager.getCustomNexusServer();
@@ -751,6 +754,9 @@ public class LocalLibraryManager implements ILibraryManagerService {
 
     @Override
     public String getJarPath(String jarName) {
+        if (jarName == null) {
+            return null;
+        }
         String libPath = null;
         try {
             // maven

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

@@ -335,6 +335,9 @@ public final class ConnectionContextHelper {
             if (param instanceof EHadoopParamName) {
                 varList.add(((EHadoopParamName) param).name());
             }
+            if (param instanceof GenericConnParamName) {
+                varList.add(((GenericConnParamName) param).getName());
+            }
         }
     }
 

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

@@ -0,0 +1,43 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.metadata.managment.ui.utils;
+
+import org.talend.metadata.managment.ui.model.IConnParamName;
+
+/**
+ * created by ycbai on 2015年11月20日 Detailled comment
+ *
+ */
+public class GenericConnParamName implements IConnParamName {
+
+    private String name;
+
+    private String contextVar;
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getContextVar() {
+        return this.contextVar;
+    }
+
+    public void setContextVar(String contextVar) {
+        this.contextVar = contextVar;
+    }
+
+}

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

@@ -410,8 +410,10 @@
             context="plugin:org.talend.metadata.managment"
             language="java"
             message="Needed for plugin org.talend.metadata.managment"
-            name="wsdl4j-1.5.1.jar" mvn_uri="mvn:org.talend.libraries/wsdl4j-1.5.1/6.0.0"
-            required="false">
+            mvn_uri="mvn:org.talend.libraries/wsdl4j-1.5.1/6.0.0"
+            name="wsdl4j-1.5.1.jar"
+            required="false"
+            uripath="platform:/plugin/org.talend.libraries.apache/lib/wsdl4j-1.5.1.jar">
       </libraryNeeded>
             <libraryNeeded
             context="Hive wizard"

main/plugins/org.talend.platform.logging/src/log4j.xml

@@ -23,6 +23,8 @@
 		</layout>
 	</appender>
 
+    <logger name="org.ops4j.pax.url.mvn.internal.config.MavenRepositoryURL" additivity="true"> <level value="error" /> </logger>
+    <logger name="org.ops4j.pax.url.mvn.internal.AetherBasedResolver" additivity="true"> <level value="error" /> </logger>
 	<logger name="org.hibernate" additivity="true"> <level value="error" /> </logger>
 	<logger name="com.mchange" additivity="true"> <level value="warn" /> </logger>
 	<logger name="net.sf.ehcache" additivity="true"> <level value="warn" /> </logger>

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

@@ -16,9 +16,11 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
 import org.talend.commons.ui.runtime.image.ECoreImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.RepositoryNodeProviderRegistryReader;
+import org.talend.core.runtime.services.IGenericWizardService;
 import org.talend.core.ui.images.CoreImageProvider;
 import org.talend.repository.items.importexport.wizard.models.FolderImportNode;
 import org.talend.repository.items.importexport.wizard.models.ImportNode;
@@ -71,7 +73,17 @@ public class ImportItemsViewerLabelProvider extends LabelProvider {
         } else if (element instanceof ERepositoryObjectType) {
             ERepositoryObjectType itemType = (ERepositoryObjectType) element;
             if (itemType != null) {
-                Image image = RepositoryNodeProviderRegistryReader.getInstance().getImage(itemType);
+                Image image = null;
+                IGenericWizardService wizardService = null;
+                if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
+                    wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault().getService(
+                            IGenericWizardService.class);
+                }
+                if (wizardService != null && wizardService.isGenericType(itemType)) {
+                    image = wizardService.getNodeImage(itemType.getType());
+                } else {
+                    image = RepositoryNodeProviderRegistryReader.getInstance().getImage(itemType);
+                }
                 if (image == null) {
                     image = CoreImageProvider.getImage(itemType);
                 }

main/plugins/org.talend.repository.metadata/META-INF/MANIFEST.MF

@@ -54,7 +54,6 @@ Export-Package: org.talend.repository.metadata,
  org.talend.repository.ui.wizards.metadata.connection.files.ldif,
  org.talend.repository.ui.wizards.metadata.connection.files.positional,
  org.talend.repository.ui.wizards.metadata.connection.files.regexp,
- org.talend.repository.ui.wizards.metadata.connection.files.salesforce,
  org.talend.repository.ui.wizards.metadata.connection.files.xml,
  org.talend.repository.ui.wizards.metadata.connection.files.xml.action,
  org.talend.repository.ui.wizards.metadata.connection.files.xml.buttons,

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/metadata/ui/actions/metadata/AbstractCreateTableAction.java

@@ -108,7 +108,6 @@ import org.talend.repository.ui.wizards.metadata.table.files.FileLdifTableWizard
 import org.talend.repository.ui.wizards.metadata.table.files.FilePositionalTableWizard;
 import org.talend.repository.ui.wizards.metadata.table.files.FileRegexpTableWizard;
 import org.talend.repository.ui.wizards.metadata.table.files.FileXmlTableWizard;
-
 import orgomg.cwm.objectmodel.core.Package;
 import orgomg.cwm.resource.record.RecordFactory;
 import orgomg.cwm.resource.record.RecordFile;
@@ -1149,7 +1148,10 @@ public abstract class AbstractCreateTableAction extends AbstractCreateAction {
                 if (node.getParent().isBin() && node.getParent().getObject() == null) {
                     item = (ConnectionItem) node.getObject().getProperty().getItem();
                 } else {
-                    item = (ConnectionItem) node.getParent().getObject().getProperty().getItem();
+                    IRepositoryViewObject repObj = node.getParent().getObject();
+                    if (repObj != null) {
+                        item = (ConnectionItem) repObj.getProperty().getItem();
+                    }
                 }
                 if (item != null) {
                     Connection connection = item.getConnection();

main/plugins/org.talend.repository.view/src/org/talend/repository/viewer/content/SingleTopLevelContentProvider.java

@@ -210,7 +210,7 @@ public abstract class SingleTopLevelContentProvider implements ITreeContentProvi
     public void dispose() {
         // to help garbage collection
         topLevelNodes.clear();
-        topLevelNodes = null;
+        // topLevelNodes = null;
 
     }
 

main/plugins/org.talend.utils/.project

@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

main/plugins/org.talend.utils/pom.xml

@@ -46,19 +46,4 @@
             <version>0.2.0.BUILD-SNAPSHOT</version>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
-                <executions>
-                    <execution>
-                        <id>default-deploy</id>
-                        <phase>deploy</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

test/plugins/org.talend.core.runtime.test/src/org/talend/core/model/utils/TestElementParameter.java

@@ -1145,4 +1145,24 @@ class TestElementParameter implements IElementParameter {
         return false;
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.core.model.process.IElementParameter#isSerialized()
+     */
+    @Override
+    public boolean isSerialized() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.core.model.process.IElementParameter#setSerialized(boolean)
+     */
+    @Override
+    public void setSerialized(boolean isSerialized) {
+        // TODO Auto-generated method stub
+    }
 }

test/plugins/org.talend.designer.maven.test/src/test/java/org/talend/designer/maven/utils/PomUtilTest.java

@@ -22,6 +22,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.model.general.Project;
+import org.talend.core.runtime.maven.MavenConstants;
 import org.talend.repository.ProjectManager;
 import org.talend.utils.io.FilesUtils;
 
@@ -93,7 +94,7 @@ public class PomUtilTest {
         Assert.assertNotNull(moduleDependency);
         Assert.assertEquals("org.talend.libraries", moduleDependency.getGroupId());
         Assert.assertEquals("test", moduleDependency.getArtifactId());
-        Assert.assertEquals("1.0.0", moduleDependency.getVersion());
+        Assert.assertEquals(MavenConstants.DEFAULT_LIB_VERSION, moduleDependency.getVersion());
         Assert.assertEquals("jar", moduleDependency.getType());
 
         moduleDependency = PomUtil.createDependency("org.talend.job", "test", "0.1", "zip");
@@ -104,6 +105,25 @@ public class PomUtilTest {
         Assert.assertEquals("zip", moduleDependency.getType());
     }
 
+    @Test
+    public void testCreateModuleDependencyWithClassifier() {
+        Dependency moduleDependency = PomUtil.createDependency("org.talend.job", "test", "0.1", "zip");
+        Assert.assertNotNull(moduleDependency);
+        Assert.assertEquals("org.talend.job", moduleDependency.getGroupId());
+        Assert.assertEquals("test", moduleDependency.getArtifactId());
+        Assert.assertEquals("0.1", moduleDependency.getVersion());
+        Assert.assertEquals("zip", moduleDependency.getType());
+        Assert.assertNull(moduleDependency.getClassifier());
+
+        moduleDependency = PomUtil.createDependency("org.talend.job", "test", "0.1", "zip", "src");
+        Assert.assertNotNull(moduleDependency);
+        Assert.assertEquals("org.talend.job", moduleDependency.getGroupId());
+        Assert.assertEquals("test", moduleDependency.getArtifactId());
+        Assert.assertEquals("0.1", moduleDependency.getVersion());
+        Assert.assertEquals("zip", moduleDependency.getType());
+        Assert.assertEquals("src", moduleDependency.getClassifier());
+    }
+
     @Test
     public void testGetTemplateFileNull() throws Exception {
         File templateFile = PomUtil.getTemplateFile(null, null, null);