TPS-1637:[5.5.1] add a new fix TUP-6198 for the exasol

execution on iterations within the same subjob(TDI-30996)

org.talend.commons.runtime/src/org/talend/commons/utils/database/AS400DatabaseMetaData.java

@@ -13,39 +13,40 @@
 package org.talend.commons.utils.database;
 
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;  
-import java.util.ArrayList;  
-import java.util.List;  
-import org.apache.commons.lang.StringUtils;
-import java.sql.PreparedStatement; 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
+import org.apache.commons.lang.StringUtils;
 
 /**
  * created by zshen on Apr 12, 2013 Detailled comment
  * 
  */
 public class AS400DatabaseMetaData extends PackageFakeDatabaseMetadata {
-	
-	 private static final String[] TABLE_META = {
-         "TABLE_TYPE", "TABLE_NAME", "SYSTEM_TABLE_NAME", "TABLE_SCHEMA", "SYSTEM_TABLE_SCHEMA" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
 
-	 private String T = "T";//$NON-NLS-1$
-	
-	 private String V = "V";//$NON-NLS-1$
-	
-	 private String S = "S";//$NON-NLS-1$
-	
-	 private String A = "A";//$NON-NLS-1$
-	
-	 private String TABLE = "TABLE"; //$NON-NLS-1$
-	
-	 private String VIEW = "VIEW"; //$NON-NLS-1$
-	
-	 private String SYNONYM = "SYNONYM"; //$NON-NLS-1$
-	
-	 private String ALIAS = "ALIAS"; //$NON-NLS-1$
+    private static final String[] TABLE_META = {
+            "TABLE_TYPE", "TABLE_NAME", "SYSTEM_TABLE_NAME", "TABLE_SCHEMA", "SYSTEM_TABLE_SCHEMA" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+
+    private String T = "T";//$NON-NLS-1$
+
+    private String V = "V";//$NON-NLS-1$
+
+    private String S = "S";//$NON-NLS-1$
+
+    private String A = "A";//$NON-NLS-1$
+
+    private String TABLE = "TABLE"; //$NON-NLS-1$
+
+    private String VIEW = "VIEW"; //$NON-NLS-1$
+
+    private String SYNONYM = "SYNONYM"; //$NON-NLS-1$
+
+    private String ALIAS = "ALIAS"; //$NON-NLS-1$
 
     public AS400DatabaseMetaData(Connection conn) throws SQLException {
         super(conn);
@@ -112,6 +113,7 @@ public class AS400DatabaseMetaData extends PackageFakeDatabaseMetadata {
         ResultSet rs = null;
         PreparedStatement stmt = null;
         List<String[]> list = new ArrayList<String[]>();
+        Set<String> tablesRetrieved = new HashSet<String>();
         try {
             stmt = connection.prepareStatement(sql);
             if (!StringUtils.isEmpty(tableNamePattern)) {
@@ -122,10 +124,11 @@ public class AS400DatabaseMetaData extends PackageFakeDatabaseMetadata {
                 String type = rs.getString("TYPE"); //$NON-NLS-1$
                 String table_name = rs.getString("TABLE_NAME"); //$NON-NLS-1$
                 String system_table_name = rs.getString("SYSTEM_TABLE_NAME"); //$NON-NLS-1$
+                tablesRetrieved.add(system_table_name);
                 String table_schema = rs.getString("TABLE_SCHEMA"); //$NON-NLS-1$
-                String system_table_schema = rs.getString("SYSTEM_TABLE_SCHEMA");
+                String system_table_schema = rs.getString("SYSTEM_TABLE_SCHEMA");//$NON-NLS-1$
 
-                String[] r = new String[] { type, table_name, system_table_name, table_schema, system_table_schema }; //$NON-NLS-1$ //$NON-NLS-2$
+                String[] r = new String[] { type, table_name, system_table_name, table_schema, system_table_schema };
                 list.add(r);
             }
 
@@ -138,11 +141,23 @@ public class AS400DatabaseMetaData extends PackageFakeDatabaseMetadata {
             } catch (Exception e) {
             }
         }
+
+        ResultSet jdbcRset = super.getTables(catalog, schemaPattern, tableNamePattern, types);
+        while (jdbcRset.next()) {
+            String table_name = jdbcRset.getString("TABLE_NAME"); //$NON-NLS-1$
+            if (tablesRetrieved.contains(table_name)) {
+                continue;
+            }
+            String type = jdbcRset.getString("TABLE_TYPE"); //$NON-NLS-1$
+            String table_schema = jdbcRset.getString("TABLE_SCHEM"); //$NON-NLS-1$
+
+            String[] r = new String[] { type, table_name, table_name, table_schema, table_schema };
+            list.add(r);
+        }
         AS400ResultSet tableResultSet = new AS400ResultSet();
         tableResultSet.setMetadata(TABLE_META);
         tableResultSet.setData(list);
         return tableResultSet;
-        // return super.getTables(catalog, schemaPattern, tableNamePattern, types);
     }
 
     private String getTypeNameType(String typeName) {

org.talend.core.runtime/mappings/mapping_Exasol.xml

@@ -8,12 +8,16 @@
 			<dbType type="NUMBER" defaultLength="20" defaultPrecision="10" ignoreLen="false" ignorePre="false"/>
 			<dbType type="INT" ignoreLen="true" ignorePre="true"/>
 			<dbType type="INTEGER" ignoreLen="true" ignorePre="true"/>
+			<dbType type="DECIMAL" ignoreLen="true" ignorePre="true"/>
 			<dbType type="LONG" ignoreLen="true" ignorePre="true"/>
 			<dbType type="FLOAT" ignoreLen="true" ignorePre="true"/>
 			<dbType type="BINARY_FLOAT" ignoreLen="true" ignorePre="true"/>
 			<dbType type="DOUBLE PRECISION" ignoreLen="true" ignorePre="true"/>
 			<dbType type="BINARY_DOUBLE" ignoreLen="true" ignorePre="true"/>
 			<dbType type="DATE" ignoreLen="true" ignorePre="true"/>
+			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true"/>
+            <dbType type="TIMESTAMP WITH LOCAL TIME ZONE" ignoreLen="true" ignorePre="true"/>
+            <dbType type="BOOLEAN" ignoreLen="true" ignorePre="true"/>
 		</dbTypes>
 
 		<language name="java">
@@ -21,6 +25,7 @@
 				<talendType type="id_List">
 				</talendType>
 				<talendType type="id_Boolean">
+				    <dbType type="BOOLEAN" default="true"/>
 				</talendType>
 				<talendType type="id_Byte">						
 				</talendType>
@@ -32,9 +37,11 @@
 				</talendType>
 				<talendType type="id_Date">
 					<dbType type="DATE" default="true"/>
+                    <dbType type="TIMESTAMP"/>
+                    <dbType type="TIMESTAMP WITH LOCAL TIME ZONE"/>
 				</talendType>
 				<talendType type="id_BigDecimal">
-					<dbType type="NUMBER"/>
+					<dbType type="DECIMAL" default="true"/>
 				</talendType>
 				<talendType type="id_Double">
 					<dbType type="DOUBLE PRECISION" default="true"/>
@@ -47,6 +54,7 @@
 				<talendType type="id_Integer">
 					<dbType type="INT" default="true"/>
 					<dbType type="INTEGER"/>
+					<dbType type="DECIMAL"/>
 				</talendType>
 				<talendType type="id_Long">
 					<dbType type="NUMBER" default="true"/>
@@ -95,7 +103,22 @@
 				</dbType>
 				<dbType type="DATE">
 					<talendType type="id_Date" default="true" />				
-				</dbType>																																
+				</dbType>
+				<dbType type="DECIMAL">
+                    <talendType type="id_BigDecimal" default="true" />
+                    <talendType type="id_Long"/>
+                    <talendType type="id_Integer"/>
+                    <talendType type="id_Double"/>
+                </dbType>
+				<dbType type="TIMESTAMP">
+                    <talendType type="id_Date" default="true" />                
+                </dbType>                                                                                                                               
+                <dbType type="TIMESTAMP WITH LOCAL TIME ZONE">
+                    <talendType type="id_Date" default="true" />                
+                </dbType>                                                                                                                               
+                <dbType type="BOOLEAN">
+                    <talendType type="id_Boolean" default="true" />             
+                </dbType>   																																
 			</dbToTalendTypes>
 		</language>
 	</dbms>

org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/EHadoopVersion4Drivers.java

@@ -1,206 +1,206 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2014 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.hadoop.version;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.ArrayUtils;
-
-/**
- * DOC ycbai class global comment. Detailled comment
- */
-public enum EHadoopVersion4Drivers {
-    HDP_2_1(
-            EHadoopDistributions.HORTONWORKS,
-            "Hortonworks Data Platform V2.1.0(Baikal)",
-            "HDP_2_1",
-            true,
-            false,
-            new EMRVersion[] { EMRVersion.YARN }),
-
-    HDP_2_0(
-            EHadoopDistributions.HORTONWORKS,
-            "Hortonworks Data Platform V2.0.0(BigWheel)",
-            "HDP_2_0",
-            true,
-            false,
-            new EMRVersion[] { EMRVersion.YARN }),
-
-    HDP_1_3(EHadoopDistributions.HORTONWORKS, "Hortonworks Data Platform V1.3.0(Condor)", "HDP_1_3", true, false),
-
-    HDP_1_2(EHadoopDistributions.HORTONWORKS, "Hortonworks Data Platform V1.2.0(Bimota)", "HDP_1_2", true, false),
-
-    HDP_1_0(EHadoopDistributions.HORTONWORKS, "Hortonworks Data Platform V1.0.0(deprecated)", "HDP_1_0", true, false),
-
-    APACHE_1_0_0(EHadoopDistributions.APACHE, "Apache 1.0.0", "APACHE_1_0_0", true, false),
-
-    APACHE_0_20_204(EHadoopDistributions.APACHE, "Apache 0.20.204", "APACHE_0_20_204", false, false),
-
-    APACHE_0_20_203(EHadoopDistributions.APACHE, "Apache 0.20.203", "APACHE_0_20_203", false, false),
-
-    APACHE_0_20_2(EHadoopDistributions.APACHE, "Apache 0.20.2", "APACHE_0_20_2", false, true),
-
-    CLOUDERA_CDH5(
-                  EHadoopDistributions.CLOUDERA,
-                  "Cloudera CDH5",
-                  "Cloudera_CDH5",
-                  true,
-                  false,
-                  new EMRVersion[] { EMRVersion.YARN }),
-
-    CLOUDERA_CDH4_YARN(
-                       EHadoopDistributions.CLOUDERA,
-                       "Cloudera CDH4 YARN",
-                       "Cloudera_CDH4_YARN",
-                       true,
-                       false,
-                       new EMRVersion[] { EMRVersion.YARN }),
-
-    CLOUDERA_CDH4(EHadoopDistributions.CLOUDERA, "Cloudera CDH4", "Cloudera_CDH4", true, false),
-
-    CLOUDERA_CDH3(EHadoopDistributions.CLOUDERA, "Cloudera CDH3(deprecated)", "Cloudera_CDH3", false, false),
-
-    MAPR310(EHadoopDistributions.MAPR, "MapR 3.1.0", "MAPR310", false, true),
-
-    MAPR301(EHadoopDistributions.MAPR, "MapR 3.0.1", "MAPR301", false, true),
-
-    MAPR213(EHadoopDistributions.MAPR, "MapR 2.1.3", "MAPR213", false, true),
-
-    MAPR212(EHadoopDistributions.MAPR, "MapR 2.1.2", "MAPR212", false, true),
-
-    MAPR2(EHadoopDistributions.MAPR, "MapR 2.0.0", "MAPR2", false, true),
-
-    MAPR1(EHadoopDistributions.MAPR, "MapR 1.2.0", "MAPR1", false, true),
-
-    APACHE_1_0_3_EMR(EHadoopDistributions.AMAZON_EMR, "Apache 1.0.3", "APACHE_1_0_3_EMR", true, false),
-
-    MAPR_EMR(EHadoopDistributions.AMAZON_EMR, "MapR 1.2.8(deprecated)", "MapR_EMR", false, true),
-
-    PIVOTAL_HD_2_0(
-                   EHadoopDistributions.PIVOTAL_HD,
-                   "Pivotal HD 2.0",
-                   "PIVOTAL_HD_2_0",
-                   false,
-                   false,
-                   new EMRVersion[] { EMRVersion.YARN }),
-
-    PIVOTAL_HD_1_0_1(
-                     EHadoopDistributions.PIVOTAL_HD,
-                     "Pivotal HD 1.0.1",
-                     "PIVOTAL_HD_1_0_1",
-                     false,
-                     false,
-                     new EMRVersion[] { EMRVersion.YARN }),
-
-    CUSTOM(EHadoopDistributions.CUSTOM, "", "", false, false, new EMRVersion[] { EMRVersion.MR1, EMRVersion.YARN });
-
-    private EHadoopDistributions distribution;
-
-    private String versionDisplayName;
-
-    private String versionValue;
-
-    private boolean supportSecurity;
-
-    private boolean supportGroup;
-
-    private EMRVersion[] mrVersions;
-
-    EHadoopVersion4Drivers(EHadoopDistributions distribution, String versionDisplayName, String versionValue,
-            boolean supportSecurity, boolean supportGroup) {
-        this(distribution, versionDisplayName, versionValue, supportSecurity, supportGroup, new EMRVersion[] { EMRVersion.MR1 });
-    }
-
-    EHadoopVersion4Drivers(EHadoopDistributions distribution, String versionDisplayName, String versionValue,
-            boolean supportSecurity, boolean supportGroup, EMRVersion[] mrVersions) {
-        this.distribution = distribution;
-        this.versionDisplayName = versionDisplayName;
-        this.versionValue = versionValue;
-        this.supportSecurity = supportSecurity;
-        this.supportGroup = supportGroup;
-        this.mrVersions = mrVersions;
-    }
-
-    public EHadoopDistributions getDistribution() {
-        return this.distribution;
-    }
-
-    public String getVersionDisplay() {
-        return this.versionDisplayName;
-    }
-
-    public String getVersionValue() {
-        return this.versionValue;
-    }
-
-    public EMRVersion[] getMrVersions() {
-        return this.mrVersions;
-    }
-
-    public static EHadoopVersion4Drivers indexOfByVersionDisplay(String displayName) {
-        return indexOf(displayName, true);
-    }
-
-    public static EHadoopVersion4Drivers indexOfByVersion(String value) {
-        return indexOf(value, false);
-    }
-
-    private static EHadoopVersion4Drivers indexOf(String name, boolean display) {
-        if (name != null) {
-            for (EHadoopVersion4Drivers version : EHadoopVersion4Drivers.values()) {
-                if (display) {
-                    if (name.equalsIgnoreCase(version.getVersionDisplay())) {
-                        return version;
-                    }
-                } else {
-                    if (name.equalsIgnoreCase(version.getVersionValue())) {
-                        return version;
-                    }
-                }
-            }
-        }
-        return EHadoopVersion4Drivers.CUSTOM;
-    }
-
-    public static List<EHadoopVersion4Drivers> indexOfByDistribution(EHadoopDistributions distribution) {
-        List<EHadoopVersion4Drivers> distribution4Versions = new ArrayList<EHadoopVersion4Drivers>();
-        if (distribution != null) {
-            for (EHadoopVersion4Drivers d4v : EHadoopVersion4Drivers.values()) {
-                if (d4v.getDistribution().equals(distribution)) {
-                    distribution4Versions.add(d4v);
-                }
-            }
-        }
-        return distribution4Versions;
-    }
-
-    public boolean isSupportSecurity() {
-        return this.supportSecurity;
-    }
-
-    public boolean isSupportGroup() {
-        return this.supportGroup;
-    }
-
-    public boolean isSupportMR1() {
-        return ArrayUtils.contains(getMrVersions(), EMRVersion.MR1);
-
-    }
-
-    public boolean isSupportYARN() {
-        return ArrayUtils.contains(getMrVersions(), EMRVersion.YARN);
-
-    }
-
-}
+// ============================================================================
+//
+// Copyright (C) 2006-2014 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.hadoop.version;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.ArrayUtils;
+
+/**
+ * DOC ycbai class global comment. Detailled comment
+ */
+public enum EHadoopVersion4Drivers {
+    HDP_2_1(
+            EHadoopDistributions.HORTONWORKS,
+            "Hortonworks Data Platform V2.1.0(Baikal)",
+            "HDP_2_1",
+            true,
+            false,
+            new EMRVersion[] { EMRVersion.YARN }),
+
+    HDP_2_0(
+            EHadoopDistributions.HORTONWORKS,
+            "Hortonworks Data Platform V2.0.0(BigWheel)",
+            "HDP_2_0",
+            true,
+            false,
+            new EMRVersion[] { EMRVersion.YARN }),
+
+    HDP_1_3(EHadoopDistributions.HORTONWORKS, "Hortonworks Data Platform V1.3.0(Condor)", "HDP_1_3", true, false),
+
+    HDP_1_2(EHadoopDistributions.HORTONWORKS, "Hortonworks Data Platform V1.2.0(Bimota)", "HDP_1_2", true, false),
+
+    HDP_1_0(EHadoopDistributions.HORTONWORKS, "Hortonworks Data Platform V1.0.0(deprecated)", "HDP_1_0", true, false),
+
+    APACHE_1_0_0(EHadoopDistributions.APACHE, "Apache 1.0.0", "APACHE_1_0_0", true, false),
+
+    APACHE_0_20_204(EHadoopDistributions.APACHE, "Apache 0.20.204", "APACHE_0_20_204", false, false),
+
+    APACHE_0_20_203(EHadoopDistributions.APACHE, "Apache 0.20.203", "APACHE_0_20_203", false, false),
+
+    APACHE_0_20_2(EHadoopDistributions.APACHE, "Apache 0.20.2", "APACHE_0_20_2", false, true),
+
+    CLOUDERA_CDH5(
+                  EHadoopDistributions.CLOUDERA,
+                  "Cloudera CDH5",
+                  "Cloudera_CDH5",
+                  true,
+                  false,
+                  new EMRVersion[] { EMRVersion.YARN }),
+
+    CLOUDERA_CDH4_YARN(
+                       EHadoopDistributions.CLOUDERA,
+                       "Cloudera CDH4 YARN",
+                       "Cloudera_CDH4_YARN",
+                       true,
+                       false,
+                       new EMRVersion[] { EMRVersion.YARN }),
+
+    CLOUDERA_CDH4(EHadoopDistributions.CLOUDERA, "Cloudera CDH4", "Cloudera_CDH4", true, false),
+
+    CLOUDERA_CDH3(EHadoopDistributions.CLOUDERA, "Cloudera CDH3(deprecated)", "Cloudera_CDH3", false, false),
+
+    MAPR310(EHadoopDistributions.MAPR, "MapR 3.1.0", "MAPR310", false, true),
+
+    MAPR301(EHadoopDistributions.MAPR, "MapR 3.0.1", "MAPR301", false, true),
+
+    MAPR213(EHadoopDistributions.MAPR, "MapR 2.1.3", "MAPR213", false, true),
+
+    MAPR212(EHadoopDistributions.MAPR, "MapR 2.1.2", "MAPR212", false, true),
+
+    MAPR2(EHadoopDistributions.MAPR, "MapR 2.0.0", "MAPR2", false, true),
+
+    MAPR1(EHadoopDistributions.MAPR, "MapR 1.2.0", "MAPR1", false, true),
+
+    APACHE_1_0_3_EMR(EHadoopDistributions.AMAZON_EMR, "Apache 1.0.3", "APACHE_1_0_3_EMR", true, false),
+
+    MAPR_EMR(EHadoopDistributions.AMAZON_EMR, "MapR 1.2.8(deprecated)", "MapR_EMR", false, true),
+
+    PIVOTAL_HD_2_0(
+                   EHadoopDistributions.PIVOTAL_HD,
+                   "Pivotal HD 2.0",
+                   "PIVOTAL_HD_2_0",
+                   true,
+                   false,
+                   new EMRVersion[] { EMRVersion.YARN }),
+
+    PIVOTAL_HD_1_0_1(
+                     EHadoopDistributions.PIVOTAL_HD,
+                     "Pivotal HD 1.0.1",
+                     "PIVOTAL_HD_1_0_1",
+                     false,
+                     false,
+                     new EMRVersion[] { EMRVersion.YARN }),
+
+    CUSTOM(EHadoopDistributions.CUSTOM, "", "", false, false, new EMRVersion[] { EMRVersion.MR1, EMRVersion.YARN });
+
+    private EHadoopDistributions distribution;
+
+    private String versionDisplayName;
+
+    private String versionValue;
+
+    private boolean supportSecurity;
+
+    private boolean supportGroup;
+
+    private EMRVersion[] mrVersions;
+
+    EHadoopVersion4Drivers(EHadoopDistributions distribution, String versionDisplayName, String versionValue,
+            boolean supportSecurity, boolean supportGroup) {
+        this(distribution, versionDisplayName, versionValue, supportSecurity, supportGroup, new EMRVersion[] { EMRVersion.MR1 });
+    }
+
+    EHadoopVersion4Drivers(EHadoopDistributions distribution, String versionDisplayName, String versionValue,
+            boolean supportSecurity, boolean supportGroup, EMRVersion[] mrVersions) {
+        this.distribution = distribution;
+        this.versionDisplayName = versionDisplayName;
+        this.versionValue = versionValue;
+        this.supportSecurity = supportSecurity;
+        this.supportGroup = supportGroup;
+        this.mrVersions = mrVersions;
+    }
+
+    public EHadoopDistributions getDistribution() {
+        return this.distribution;
+    }
+
+    public String getVersionDisplay() {
+        return this.versionDisplayName;
+    }
+
+    public String getVersionValue() {
+        return this.versionValue;
+    }
+
+    public EMRVersion[] getMrVersions() {
+        return this.mrVersions;
+    }
+
+    public static EHadoopVersion4Drivers indexOfByVersionDisplay(String displayName) {
+        return indexOf(displayName, true);
+    }
+
+    public static EHadoopVersion4Drivers indexOfByVersion(String value) {
+        return indexOf(value, false);
+    }
+
+    private static EHadoopVersion4Drivers indexOf(String name, boolean display) {
+        if (name != null) {
+            for (EHadoopVersion4Drivers version : EHadoopVersion4Drivers.values()) {
+                if (display) {
+                    if (name.equalsIgnoreCase(version.getVersionDisplay())) {
+                        return version;
+                    }
+                } else {
+                    if (name.equalsIgnoreCase(version.getVersionValue())) {
+                        return version;
+                    }
+                }
+            }
+        }
+        return EHadoopVersion4Drivers.CUSTOM;
+    }
+
+    public static List<EHadoopVersion4Drivers> indexOfByDistribution(EHadoopDistributions distribution) {
+        List<EHadoopVersion4Drivers> distribution4Versions = new ArrayList<EHadoopVersion4Drivers>();
+        if (distribution != null) {
+            for (EHadoopVersion4Drivers d4v : EHadoopVersion4Drivers.values()) {
+                if (d4v.getDistribution().equals(distribution)) {
+                    distribution4Versions.add(d4v);
+                }
+            }
+        }
+        return distribution4Versions;
+    }
+
+    public boolean isSupportSecurity() {
+        return this.supportSecurity;
+    }
+
+    public boolean isSupportGroup() {
+        return this.supportGroup;
+    }
+
+    public boolean isSupportMR1() {
+        return ArrayUtils.contains(getMrVersions(), EMRVersion.MR1);
+
+    }
+
+    public boolean isSupportYARN() {
+        return ArrayUtils.contains(getMrVersions(), EMRVersion.YARN);
+
+    }
+
+}

org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataSchema.java

@@ -206,6 +206,7 @@ public class MetadataSchema {
         final Node defaultValue = nodeMap.getNamedItem("default"); //$NON-NLS-1$
         final Node comment = nodeMap.getNamedItem("comment"); //$NON-NLS-1$
         final Node pattern = nodeMap.getNamedItem("pattern"); //$NON-NLS-1$
+        final Node originalLength = nodeMap.getNamedItem("originalLength");//$NON-NLS-1$
         // see feature 4456
 
         String nodeValue = MetadataToolHelper.validateColumnName(label.getNodeValue(), 0);
@@ -222,6 +223,15 @@ public class MetadataSchema {
         } else {
             metadataColumn.setOriginalDbColumnName(nodeValue);
         }
+        if (originalLength != null && originalLength.getNodeValue() != null) {
+            try {
+                metadataColumn.setOriginalLength(Integer.parseInt(originalLength.getNodeValue()));
+            } catch (final NumberFormatException e) {
+                metadataColumn.setOriginalLength(null);
+            }
+        } else {
+            metadataColumn.setOriginalLength(null);
+        }
         if (length.getNodeValue() != null) {
             try {
                 metadataColumn.setLength(Integer.parseInt(length.getNodeValue()));
@@ -784,6 +794,14 @@ public class MetadataSchema {
         }
         column.setAttributeNode(length);
 
+        Attr originalLength = document.createAttribute("originalLength"); //$NON-NLS-1$
+        if (metadataColumn.getOriginalLength() == null) {
+            originalLength.setNodeValue("-1"); //$NON-NLS-1$
+        } else {
+            originalLength.setNodeValue(String.valueOf(metadataColumn.getOriginalLength()));
+        }
+        column.setAttributeNode(originalLength);
+
         Attr precision = document.createAttribute("precision"); //$NON-NLS-1$
         if (metadataColumn.getPrecision() == null) {
             precision.setNodeValue("-1"); //$NON-NLS-1$

org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/connection/hive/HiveConnVersionInfo.java

@@ -45,7 +45,7 @@ public enum HiveConnVersionInfo {
 
     HDP_2_1(1, "HDP_2_1", "Hortonworks Data Platform V2.1.0(Baikal)", true, false, true, true, HiveConnVersionInfo.HORTONWORKS), //$NON-NLS-1$//$NON-NLS-2$
 
-    HDP_2_0(1, "HDP_2_0", "Hortonworks Data Platform V2.0.0(BigWheel)", true, false, true, false, HiveConnVersionInfo.HORTONWORKS), //$NON-NLS-1$//$NON-NLS-2$
+    HDP_2_0(1, "HDP_2_0", "Hortonworks Data Platform V2.0.0(BigWheel)", true, false, true, true, HiveConnVersionInfo.HORTONWORKS), //$NON-NLS-1$//$NON-NLS-2$
 
     HDP_1_3(1, "HDP_1_3", "Hortonworks Data Platform V1.3.0(Condor)", true, true, HiveConnVersionInfo.HORTONWORKS), //$NON-NLS-1$//$NON-NLS-2$
 
@@ -81,7 +81,7 @@ public enum HiveConnVersionInfo {
 
     MapR_EMR(1, "MapR_EMR", "MapR 1.2.8(deprecated)", false, HiveConnVersionInfo.AMAZON_EMR), //$NON-NLS-1$//$NON-NLS-2$
 
-    PIVOTAL_HD_2_0(1, "PIVOTAL_HD_2_0", "Pivotal HD 2.0", true, false, true, false, HiveConnVersionInfo.PIVOTAL_HD), //$NON-NLS-1$//$NON-NLS-2$
+    PIVOTAL_HD_2_0(1, "PIVOTAL_HD_2_0", "Pivotal HD 2.0", true, false, true, true, HiveConnVersionInfo.PIVOTAL_HD), //$NON-NLS-1$//$NON-NLS-2$
 
     PIVOTAL_HD_1_0_1(1, "PIVOTAL_HD_1_0_1", "Pivotal HD 1.0.1", false, false, true, false, HiveConnVersionInfo.PIVOTAL_HD), //$NON-NLS-1$//$NON-NLS-2$
 

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

@@ -92,7 +92,13 @@ public abstract class AbstractNode implements INode {
 
     private List<ModuleNeeded> modulesNeeded = new ArrayList<ModuleNeeded>();
 
-    // as the talend job contains multiple mapreduce jobs, use this to indicate which mapreduce job contains this
+    // for DI job, and indicate if the component after the iterator
+    // connection which enable parallel, even this component after
+    // onComponentOk
+    private String parallelIterator = null;
+
+    // as the talend job contains multiple mapreduce jobs, use this to indicate
+    // which mapreduce job contains this
     // graphic node
     private Integer mrGroupId;
 
@@ -725,6 +731,9 @@ public abstract class AbstractNode implements INode {
 
     @Override
     public List<? extends IElementParameter> getElementParametersWithChildrens() {
+        if (this.elementParameters == null) {
+            return new ArrayList<IElementParameter>();
+        }
         List<IElementParameter> fullListParam = new ArrayList<IElementParameter>(this.elementParameters);
 
         for (IElementParameter curParam : elementParameters) {
@@ -1193,4 +1202,23 @@ public abstract class AbstractNode implements INode {
     public void setRefNode(boolean isRefNode) {
         this.isRefNode = isRefNode;
     }
+
+    /**
+     * Getter for parallelIterator.
+     * 
+     * @return the parallelIterator
+     */
+    public String getParallelIterator() {
+        return parallelIterator;
+    }
+
+    /**
+     * Sets the parallelIterator.
+     * 
+     * @param parallelIterator the parallelIterator to set
+     */
+    public void setParallelIterator(String parallelIterator) {
+        this.parallelIterator = parallelIterator;
+    }
 }
+

org.talend.core.runtime/src/main/java/org/talend/core/model/repository/RepositoryViewObject.java

@@ -112,6 +112,8 @@ public class RepositoryViewObject implements IRepositoryViewObject {
 
     private static final String TIP = "same name item with other project";
 
+    private boolean avoidGuiInfos;
+
     public RepositoryViewObject(Property property, boolean avoidGuiInfos) {
         this.id = property.getId();
         this.author = property.getAuthor();
@@ -137,6 +139,7 @@ public class RepositoryViewObject implements IRepositoryViewObject {
             informationStatus = factory.getStatus(informationLevel);
             modified = factory.isModified(property);
         }
+        this.avoidGuiInfos = avoidGuiInfos;
         if (!avoidGuiInfos) {
             if (type == ERepositoryObjectType.JOBLET) {
                 JobletProcessItem item = (JobletProcessItem) property.getItem();
@@ -307,39 +310,41 @@ public class RepositoryViewObject implements IRepositoryViewObject {
             repositoryStatus = factory.getStatus(property.getItem());
             InformationLevel informationLevel = property.getMaxInformationLevel();
             informationStatus = factory.getStatus(informationLevel);
-            if (type == ERepositoryObjectType.JOBLET) {
-                JobletProcessItem item = (JobletProcessItem) property.getItem();
-                if (item.getIcon() != null && item.getIcon().getInnerContent() != null
-                        && item.getIcon().getInnerContent().length != 0) {
-                    customImage = getJobletCustomIcon(property);
-                    customImage = ImageUtils.propertyLabelScale(property.getId(), customImage, ICON_SIZE.ICON_16);
-                }
-                IComponentsService service = (IComponentsService) GlobalServiceRegister.getDefault().getService(
-                        IComponentsService.class);
-                IJobletProviderService jobletservice = (IJobletProviderService) GlobalServiceRegister.getDefault().getService(
-                        IJobletProviderService.class);
-                if (service != null && jobletservice != null) {
-                    IComponentsFactory factorySingleton = service.getComponentsFactory();
-                    IComponent component = factorySingleton.get(property.getLabel(), DI);
-                    if (component != null) {
-                        try {
-                            Property tProperty = jobletservice.getJobletComponentItem(component);
-                            if (!tProperty.getId().equals(this.id)) {
-                                informationStatus = ERepositoryStatus.WARN;
-                                property.setDescription(TIP);
+            if (!this.avoidGuiInfos) {
+                if (type == ERepositoryObjectType.JOBLET) {
+                    JobletProcessItem item = (JobletProcessItem) property.getItem();
+                    if (item.getIcon() != null && item.getIcon().getInnerContent() != null
+                            && item.getIcon().getInnerContent().length != 0) {
+                        customImage = getJobletCustomIcon(property);
+                        customImage = ImageUtils.propertyLabelScale(property.getId(), customImage, ICON_SIZE.ICON_16);
+                    }
+                    IComponentsService service = (IComponentsService) GlobalServiceRegister.getDefault().getService(
+                            IComponentsService.class);
+                    IJobletProviderService jobletservice = (IJobletProviderService) GlobalServiceRegister.getDefault()
+                            .getService(IJobletProviderService.class);
+                    if (service != null && jobletservice != null) {
+                        IComponentsFactory factorySingleton = service.getComponentsFactory();
+                        IComponent component = factorySingleton.get(property.getLabel(), DI);
+                        if (component != null) {
+                            try {
+                                Property tProperty = jobletservice.getJobletComponentItem(component);
+                                if (!tProperty.getId().equals(this.id)) {
+                                    informationStatus = ERepositoryStatus.WARN;
+                                    property.setDescription(TIP);
+                                }
+                            } catch (Exception e) {
+                                // tProperty is null
                             }
-                        } catch (Exception e) {
-                            // tProperty is null
                         }
                     }
-                }
-            } else if (type == ERepositoryObjectType.DOCUMENTATION) {
-                this.customImage = ImageProvider.getImage(RepositoryImageProvider.getIcon(type));
-                Item item = property.getItem();
-                if (item instanceof DocumentationItem) {
-                    customImage = coreSerivce.getImageWithDocExt(((DocumentationItem) item).getExtension());
-                } else if (item instanceof LinkDocumentationItem) {
-                    customImage = coreSerivce.getImageWithSpecial(customImage).createImage();
+                } else if (type == ERepositoryObjectType.DOCUMENTATION) {
+                    this.customImage = ImageProvider.getImage(RepositoryImageProvider.getIcon(type));
+                    Item item = property.getItem();
+                    if (item instanceof DocumentationItem) {
+                        customImage = coreSerivce.getImageWithDocExt(((DocumentationItem) item).getExtension());
+                    } else if (item instanceof LinkDocumentationItem) {
+                        customImage = coreSerivce.getImageWithSpecial(customImage).createImage();
+                    }
                 }
             }
             return property;

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

@@ -165,6 +165,7 @@ MetadataTableEditorView.DefaultTitle=Default
 MetadataTableEditorView.KeyTitle=Key
 MetadataTableEditorView.LengthTitle=Length
 MetadataTableEditorView.NullableTitle=Nullable
+MetadataTableEditorView.OriginalLengthTitle=OriginalLength
 MetadataTableEditorView.PatternTitle=Date Pattern (Ctrl+Space available)
 MetadataTableEditorView.PrecisionTitle=Precision
 MetadataTableEditorView.TypleTitle=Type

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

@@ -105,6 +105,8 @@ public class ProcessorUtilities {
 
     private static Map<String, Integer> lastGeneratedWithStatsOrTrace = new HashMap<String, Integer>();
 
+    private static Date exportTimeStamp;// time stamp create when exporting a job and reset when export ends.
+
     private static final int GENERATED_WITH_STATS = 1;
 
     private static final int GENERATED_WITH_TRACES = 2;
@@ -144,6 +146,11 @@ public class ProcessorUtilities {
         codeLocation = exportCodeLocation;
         libraryPath = exportLibraryPath;
         exportConfig = true;
+        exportTimeStamp = new Date();
+    }
+
+    public static Date getExportTimestamp() {
+        return exportTimeStamp;
     }
 
     public static boolean isExportConfig() {
@@ -155,6 +162,7 @@ public class ProcessorUtilities {
         codeLocation = null;
         libraryPath = null;
         exportConfig = false;
+        exportTimeStamp = null;
     }
 
     public static String getInterpreter() {

org.talend.libraries.apache.axis2/.classpath

@@ -14,6 +14,5 @@
 	<classpathentry exported="true" kind="lib" path="lib/xmlschema-core-2.0.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="output" path="class"/>
 </classpath>

org.talend.libraries.apache.batik/.classpath

@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.talend.libraries.apache.chemistry/.classpath

@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.talend.libraries.apache.common/.classpath

@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-digester-2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-cli-2.0-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.6.jar"/>

org.talend.libraries.apache.hive/.classpath

@@ -6,7 +6,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.6.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/hive-exec-0.9.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hive-jdbc-0.9.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hive-metastore-0.9.0.jar"/>

org.talend.libraries.apache.http/.classpath

@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.talend.libraries.jdbc.derby/.classpath

@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.talend.libraries.jdbc.exasol/.classpath

@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.talend.libraries.jdbc.hsql/META-INF/MANIFEST.MF

@@ -15,7 +15,6 @@ Export-Package:
  org.hsqldb.resources,
  org.hsqldb.rowio,
  org.hsqldb.scriptio,
- org.hsqldb.store,
  org.hsqldb.types,
  org.hsqldb.util
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

org.talend.libraries.jdbc.paraccel/.classpath

@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.talend.librariesmanager/resources/java/routines/system/TalendThread.java

@@ -8,7 +8,7 @@
 // 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;
 
@@ -19,10 +19,13 @@ public class TalendThread extends Thread {
     public Integer errorCode = null;
 
     public String status = ""; //$NON-NLS-1$
-    
+
     public Exception exception = null;
 
+    public Error error = null;
+
     // this is a template for Iterate Parallel
+    @Override
     public void run() {
         try {
 

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

@@ -217,7 +217,9 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl {
         }
         ResultSet schemas = null;
         // teradata use db name to filter schema
-        if (dbConn != null && EDatabaseTypeName.TERADATA.getProduct().equals(((DatabaseConnection) dbConn).getProductId())) {
+        if (dbConn != null
+                && (EDatabaseTypeName.TERADATA.getProduct().equals(((DatabaseConnection) dbConn).getProductId()) || EDatabaseTypeName.EXASOL
+                        .getProduct().equals(((DatabaseConnection) dbConn).getProductId()))) {
             if (!dbConn.isContextMode()) {
                 String sid = ((DatabaseConnection) dbConn).getSID();
                 if (sid != null && sid.length() > 0) {
@@ -380,12 +382,7 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl {
         }
 
         try {
-            if (dbJDBCMetadata.getDatabaseProductName() != null
-                    && dbJDBCMetadata.getDatabaseProductName().indexOf(EDatabaseTypeName.ORACLEFORSID.getProduct()) > -1) {
-                return catalogList;
-            }
-            // ODBC teradata dosen't support 'dbJDBCMetadata.getCatalogs()',return at here.
-            if (ConnectionUtils.isOdbcTeradata(dbJDBCMetadata)) {
+            if (!isDbSupportCatalogNames(dbJDBCMetadata)) {
                 return catalogList;
             }
             ResultSet catalogNames = null;
@@ -558,6 +555,15 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl {
         return catalogList;
     }
 
+    private boolean isDbSupportCatalogNames(DatabaseMetaData dbJDBCMetadata) throws SQLException {
+        // Now here that OracleForSid,OdbcTeradata,Exasol dosen't support the catalog name.
+        if (ConnectionUtils.isOracleForSid(dbJDBCMetadata, EDatabaseTypeName.ORACLEFORSID.getProduct())
+                || ConnectionUtils.isOdbcTeradata(dbJDBCMetadata) || ConnectionUtils.isExasol(dbJDBCMetadata)) {
+            return false;
+        }
+        return true;
+    }
+
     /**
      * fill the catalog and schemas into Postgresql database connection.
      * 
@@ -656,6 +662,7 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl {
                 }
                 String pattern = ExtractMetaDataUtils.getInstance().retrieveSchemaPatternForAS400(
                         iMetadataCon.getAdditionalParams());
+                String sid = dbConnection.getSID();
                 if (pattern != null && !"".equals(pattern)) { //$NON-NLS-1$
                     String[] multiSchems = ExtractMetaDataUtils.getInstance().getMultiSchems(pattern);
                     if (multiSchems != null) {
@@ -665,6 +672,8 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl {
                             }
                         }
                     }
+                } else if (sid != null && !"".equals(sid)) { //$NON-NLS-1$
+                    scheamFilterList.add(sid);
                 }
             }
         } else {
@@ -750,7 +759,11 @@ public class DBConnectionFillerImpl extends MetadataFillerImpl {
                 if (dbJDBCMetadata instanceof SybaseDatabaseMetaData) {
                     schemaRs = ((SybaseDatabaseMetaData) dbJDBCMetadata).getSchemas(catalog.getName(), null);
                 } else if (dbJDBCMetadata instanceof AS400DatabaseMetaData) {
-                    schemaRs = dbJDBCMetadata.getSchemas(catalog.getName(), null);
+                    String schemaPattern = null;
+                    if (!schemaFilter.isEmpty()) {
+                        schemaPattern = schemaFilter.get(0);
+                    }
+                    schemaRs = dbJDBCMetadata.getSchemas(catalog.getName(), schemaPattern);
                 } else {
                     schemaRs = dbJDBCMetadata.getSchemas();
                 }

org.talend.metadata.managment/src/main/java/org/talend/metadata/managment/connection/manager/HiveConnectionManager.java

@@ -27,6 +27,7 @@ import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
 import org.talend.core.model.metadata.builder.database.JavaSqlFactory;
 import org.talend.core.model.metadata.builder.database.hive.EmbeddedHiveDataBaseMetadata;
 import org.talend.core.model.metadata.connection.hive.HiveConnVersionInfo;
+import org.talend.core.utils.ReflectionUtils;
 import org.talend.metadata.managment.hive.HiveClassLoaderFactory;
 
 /**
@@ -110,6 +111,19 @@ public class HiveConnectionManager extends DataBaseConnectionManager {
             String hivePrincipal = (String) metadataConn.getParameter(ConnParameterKeys.HIVE_AUTHENTICATION_HIVEPRINCIPLA);
             if (useKerberos) {
                 System.setProperty(HiveConfKeysForTalend.HIVE_CONF_KEY_HIVE_METASTORE_KERBEROS_PRINCIPAL.getKey(), hivePrincipal);
+                String principal = (String) metadataConn.getParameter(ConnParameterKeys.HIVE_AUTHENTICATION_PRINCIPLA);
+                String keytabPath = (String) metadataConn.getParameter(ConnParameterKeys.HIVE_AUTHENTICATION_KEYTAB);
+                boolean useKeytab = Boolean.valueOf((String) metadataConn
+                        .getParameter(ConnParameterKeys.HIVE_AUTHENTICATION_USEKEYTAB));
+                if (useKeytab) {
+                    ClassLoader hiveClassLoader = HiveClassLoaderFactory.getInstance().getClassLoader(metadataConn);
+                    try {
+                        ReflectionUtils.invokeStaticMethod("org.apache.hadoop.security.UserGroupInformation", hiveClassLoader, //$NON-NLS-1$
+                                "loginUserFromKeytab", new String[] { principal, keytabPath }); //$NON-NLS-1$
+                    } catch (Exception e) {
+                        throw new SQLException(e);
+                    }
+                }
             }
             if (connURL.startsWith(DatabaseConnConstants.HIVE_2_URL_FORMAT)) {
                 hiveStandaloneConn = createHive2StandaloneConnection(metadataConn);

org.talend.model/src/main/java/org/talend/core/model/properties/impl/JobletProcessItemImpl.java

@@ -24,19 +24,19 @@ import org.talend.designer.joblet.model.JobletProcess;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.talend.core.model.properties.impl.JobletProcessItemImpl#getJobletProcess <em>Joblet Process</em>}</li>
- *   <li>{@link org.talend.core.model.properties.impl.JobletProcessItemImpl#getIcon <em>Icon</em>}</li>
+ * <li>{@link org.talend.core.model.properties.impl.JobletProcessItemImpl#getJobletProcess <em>Joblet Process</em>}</li>
+ * <li>{@link org.talend.core.model.properties.impl.JobletProcessItemImpl#getIcon <em>Icon</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class JobletProcessItemImpl extends ItemImpl implements JobletProcessItem {
 
     /**
-     * The cached value of the '{@link #getJobletProcess() <em>Joblet Process</em>}' reference.
-     * <!-- begin-user-doc -->
+     * The cached value of the '{@link #getJobletProcess() <em>Joblet Process</em>}' reference. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @see #getJobletProcess()
      * @generated
      * @ordered
@@ -55,6 +55,7 @@ public class JobletProcessItemImpl extends ItemImpl implements JobletProcessItem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected JobletProcessItemImpl() {
@@ -63,6 +64,7 @@ public class JobletProcessItemImpl extends ItemImpl implements JobletProcessItem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -75,7 +77,7 @@ public class JobletProcessItemImpl extends ItemImpl implements JobletProcessItem
      * 
      * @generated NOT
      */
-    public JobletProcess getJobletProcess() {
+    public synchronized JobletProcess getJobletProcess() {
         if (jobletProcess != null && jobletProcess.eIsProxy()) {
             InternalEObject oldJobletProcess = (InternalEObject) jobletProcess;
             jobletProcess = (JobletProcess) eResolveProxy(oldJobletProcess);
@@ -93,9 +95,10 @@ public class JobletProcessItemImpl extends ItemImpl implements JobletProcessItem
                 }
             }
             if (jobletProcess != oldJobletProcess) {
-                if (eNotificationRequired())
+                if (eNotificationRequired()) {
                     eNotify(new ENotificationImpl(this, Notification.RESOLVE,
                             PropertiesPackage.JOBLET_PROCESS_ITEM__JOBLET_PROCESS, oldJobletProcess, jobletProcess));
+                }
             }
         }
         return jobletProcess;
@@ -103,6 +106,7 @@ public class JobletProcessItemImpl extends ItemImpl implements JobletProcessItem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public JobletProcess basicGetJobletProcess() {
@@ -111,13 +115,16 @@ public class JobletProcessItemImpl extends ItemImpl implements JobletProcessItem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setJobletProcess(JobletProcess newJobletProcess) {
         JobletProcess oldJobletProcess = jobletProcess;
         jobletProcess = newJobletProcess;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.JOBLET_PROCESS_ITEM__JOBLET_PROCESS, oldJobletProcess, jobletProcess));
+        if (eNotificationRequired()) {
+            eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.JOBLET_PROCESS_ITEM__JOBLET_PROCESS,
+                    oldJobletProcess, jobletProcess));
+        }
     }
 
     /**
@@ -143,9 +150,10 @@ public class JobletProcessItemImpl extends ItemImpl implements JobletProcessItem
                 }
             }
             if (icon != oldIcon) {
-                if (eNotificationRequired())
+                if (eNotificationRequired()) {
                     eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.JOBLET_PROCESS_ITEM__ICON,
                             oldIcon, icon));
+                }
             }
         }
         return icon;
@@ -153,6 +161,7 @@ public class JobletProcessItemImpl extends ItemImpl implements JobletProcessItem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public ByteArray basicGetIcon() {
@@ -161,77 +170,87 @@ public class JobletProcessItemImpl extends ItemImpl implements JobletProcessItem
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setIcon(ByteArray newIcon) {
         ByteArray oldIcon = icon;
         icon = newIcon;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.JOBLET_PROCESS_ITEM__ICON, oldIcon, icon));
+        }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case PropertiesPackage.JOBLET_PROCESS_ITEM__JOBLET_PROCESS:
-                if (resolve) return getJobletProcess();
-                return basicGetJobletProcess();
-            case PropertiesPackage.JOBLET_PROCESS_ITEM__ICON:
-                if (resolve) return getIcon();
-                return basicGetIcon();
+        case PropertiesPackage.JOBLET_PROCESS_ITEM__JOBLET_PROCESS:
+            if (resolve) {
+                return getJobletProcess();
+            }
+            return basicGetJobletProcess();
+        case PropertiesPackage.JOBLET_PROCESS_ITEM__ICON:
+            if (resolve) {
+                return getIcon();
+            }
+            return basicGetIcon();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case PropertiesPackage.JOBLET_PROCESS_ITEM__JOBLET_PROCESS:
-                setJobletProcess((JobletProcess)newValue);
-                return;
-            case PropertiesPackage.JOBLET_PROCESS_ITEM__ICON:
-                setIcon((ByteArray)newValue);
-                return;
+        case PropertiesPackage.JOBLET_PROCESS_ITEM__JOBLET_PROCESS:
+            setJobletProcess((JobletProcess) newValue);
+            return;
+        case PropertiesPackage.JOBLET_PROCESS_ITEM__ICON:
+            setIcon((ByteArray) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.JOBLET_PROCESS_ITEM__JOBLET_PROCESS:
-                setJobletProcess((JobletProcess)null);
-                return;
-            case PropertiesPackage.JOBLET_PROCESS_ITEM__ICON:
-                setIcon((ByteArray)null);
-                return;
+        case PropertiesPackage.JOBLET_PROCESS_ITEM__JOBLET_PROCESS:
+            setJobletProcess((JobletProcess) null);
+            return;
+        case PropertiesPackage.JOBLET_PROCESS_ITEM__ICON:
+            setIcon((ByteArray) null);
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.JOBLET_PROCESS_ITEM__JOBLET_PROCESS:
-                return jobletProcess != null;
-            case PropertiesPackage.JOBLET_PROCESS_ITEM__ICON:
-                return icon != null;
+        case PropertiesPackage.JOBLET_PROCESS_ITEM__JOBLET_PROCESS:
+            return jobletProcess != null;
+        case PropertiesPackage.JOBLET_PROCESS_ITEM__ICON:
+            return icon != null;
         }
         return super.eIsSet(featureID);
     }

org.talend.model/src/main/java/org/talend/core/model/properties/impl/ProcessItemImpl.java

@@ -22,18 +22,18 @@ import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.talend.core.model.properties.impl.ProcessItemImpl#getProcess <em>Process</em>}</li>
+ * <li>{@link org.talend.core.model.properties.impl.ProcessItemImpl#getProcess <em>Process</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ProcessItemImpl extends ItemImpl implements ProcessItem {
 
     /**
-     * The cached value of the '{@link #getProcess() <em>Process</em>}' reference.
-     * <!-- begin-user-doc --> <!--
+     * The cached value of the '{@link #getProcess() <em>Process</em>}' reference. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @see #getProcess()
      * @generated
      * @ordered
@@ -42,6 +42,7 @@ public class ProcessItemImpl extends ItemImpl implements ProcessItem {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     protected ProcessItemImpl() {
@@ -50,6 +51,7 @@ public class ProcessItemImpl extends ItemImpl implements ProcessItem {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
@@ -62,7 +64,7 @@ public class ProcessItemImpl extends ItemImpl implements ProcessItem {
      * 
      * @generated NOT
      */
-    public ProcessType getProcess() {
+    public synchronized ProcessType getProcess() {
         if (process != null && process.eIsProxy()) {
             InternalEObject oldProcess = (InternalEObject) process;
             process = (ProcessType) eResolveProxy(oldProcess);
@@ -80,9 +82,10 @@ public class ProcessItemImpl extends ItemImpl implements ProcessItem {
                 }
             }
             if (process != oldProcess) {
-                if (eNotificationRequired())
+                if (eNotificationRequired()) {
                     eNotify(new ENotificationImpl(this, Notification.RESOLVE, PropertiesPackage.PROCESS_ITEM__PROCESS,
                             oldProcess, process));
+                }
             }
         }
         return process;
@@ -90,6 +93,7 @@ public class ProcessItemImpl extends ItemImpl implements ProcessItem {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public ProcessType basicGetProcess() {
@@ -98,66 +102,74 @@ public class ProcessItemImpl extends ItemImpl implements ProcessItem {
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     public void setProcess(ProcessType newProcess) {
         ProcessType oldProcess = process;
         process = newProcess;
-        if (eNotificationRequired())
+        if (eNotificationRequired()) {
             eNotify(new ENotificationImpl(this, Notification.SET, PropertiesPackage.PROCESS_ITEM__PROCESS, oldProcess, process));
+        }
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case PropertiesPackage.PROCESS_ITEM__PROCESS:
-                if (resolve) return getProcess();
-                return basicGetProcess();
+        case PropertiesPackage.PROCESS_ITEM__PROCESS:
+            if (resolve) {
+                return getProcess();
+            }
+            return basicGetProcess();
         }
         return super.eGet(featureID, resolve, coreType);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case PropertiesPackage.PROCESS_ITEM__PROCESS:
-                setProcess((ProcessType)newValue);
-                return;
+        case PropertiesPackage.PROCESS_ITEM__PROCESS:
+            setProcess((ProcessType) newValue);
+            return;
         }
         super.eSet(featureID, newValue);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public void eUnset(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.PROCESS_ITEM__PROCESS:
-                setProcess((ProcessType)null);
-                return;
+        case PropertiesPackage.PROCESS_ITEM__PROCESS:
+            setProcess((ProcessType) null);
+            return;
         }
         super.eUnset(featureID);
     }
 
     /**
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @generated
      */
     @Override
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-            case PropertiesPackage.PROCESS_ITEM__PROCESS:
-                return process != null;
+        case PropertiesPackage.PROCESS_ITEM__PROCESS:
+            return process != null;
         }
         return super.eIsSet(featureID);
     }

org.talend.repository.metadata/src/main/java/org/talend/repository/metadata/i18n/messages.properties

@@ -1393,3 +1393,4 @@ ConfirmReloadConnectionDialog.reload=reload
 ConfirmReloadConnectionDialog.unreload=don\'t reload
 DatabaseForm.showContext=More options
 DatabaseForm.hideContext=Less options
+SeletorModuleForm.connectFromCustomModuleName.errorTitle=Error

org.talend.repository.metadata/src/main/java/org/talend/repository/ui/wizards/metadata/connection/database/DatabaseForm.java

@@ -1181,9 +1181,6 @@ public class DatabaseForm extends AbstractForm {
             hideControl(browseDriverClassButton, false);
             usernameTxt.show();
             passwordTxt.show();
-            hideControl(useKeyTab, false);
-            principalTxt.show();
-            keytabTxt.show();
         } else {
             metastoreUrlTxt.hide();
             driverJarTxt.hide();
@@ -1192,9 +1189,6 @@ public class DatabaseForm extends AbstractForm {
             hideControl(browseDriverClassButton, true);
             usernameTxt.hide();
             passwordTxt.hide();
-            hideControl(useKeyTab, true);
-            principalTxt.hide();
-            keytabTxt.hide();
         }
     }
 

org.talend.repository.metadata/src/main/java/org/talend/repository/ui/wizards/metadata/connection/files/salesforce/SelectorModulesForm.java

@@ -52,6 +52,7 @@ import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.SearchPattern;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
+import org.talend.commons.ui.runtime.exception.ExceptionMessageDialog;
 import org.talend.commons.ui.swt.dialogs.ErrorDialogWidthDetailArea;
 import org.talend.commons.ui.swt.formtools.Form;
 import org.talend.commons.ui.swt.formtools.UtilsButton;
@@ -329,7 +330,7 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
         // Button Create Table
         String displayStr = Messages.getString("SelectorTableForm.selectAllTables"); //$NON-NLS-1$
         Point buttonSize = gc.stringExtent(displayStr);
-        selectAllTablesButton = new UtilsButton(compositeRetreiveSchemaButton, displayStr, buttonSize.x + 12, HEIGHT_BUTTON_PIXEL); //$NON-NLS-1$
+        selectAllTablesButton = new UtilsButton(compositeRetreiveSchemaButton, displayStr, buttonSize.x + 12, HEIGHT_BUTTON_PIXEL);
 
         displayStr = Messages.getString("SelectorTableForm.selectNoneTables"); //$NON-NLS-1$
         buttonSize = gc.stringExtent(displayStr);
@@ -416,6 +417,7 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
 
             private final Comparator strComparator = new Comparator() {
 
+                @Override
                 public int compare(Object arg0, Object arg1) {
 
                     TableItem t1 = (TableItem) arg0;
@@ -513,8 +515,8 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
                 updateStatus(IStatus.ERROR, null);
                 TableItem[] tableItems = table.getItems();
                 int size = tableItems.length;
-                for (int i = 0; i < tableItems.length; i++) {
-                    TableItem tableItem = tableItems[i];
+                for (TableItem tableItem2 : tableItems) {
+                    TableItem tableItem = tableItem2;
                     if (!tableItem.getChecked()) {
                         tableItem.setText(3, Messages.getString("SelectorTableForm.Pending")); //$NON-NLS-1$
                         countPending++;
@@ -539,8 +541,7 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
                 countSuccess = 0;
                 countPending = 0;
                 TableItem[] tableItems = table.getItems();
-                for (int i = 0; i < tableItems.length; i++) {
-                    TableItem tableItem = tableItems[i];
+                for (TableItem tableItem : tableItems) {
                     if (tableItem.getChecked()) {
                         clearTableItem(tableItem);
                         tableItem.setChecked(false);
@@ -611,6 +612,7 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
             }
             parentWizardPage.getWizard().getContainer().run(true, true, new IRunnableWithProgress() {
 
+                @Override
                 public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
                     monitor.beginTask(Messages.getString("CreateTableAction.action.createTitle"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$
 
@@ -619,24 +621,36 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
                     String proxy = null;
                     oldTemConnection = getOriginalValueConnection();
                     if (oldTemConnection.isUseProxy()) {
-                        proxy = SalesforceModuleParseAPI.USE_SOCKS_PROXY;//$NON-NLS-1$
+                        proxy = SalesforceModuleParseAPI.USE_SOCKS_PROXY;
                     } else if (oldTemConnection.isUseHttpProxy()) {
-                        proxy = SalesforceModuleParseAPI.USE_HTTP_PROXY;//$NON-NLS-1$
+                        proxy = SalesforceModuleParseAPI.USE_HTTP_PROXY;
                     }
+                    try {
+                        itemTableName = connectFromCustomModuleName(proxy);
 
-                    itemTableName = connectFromCustomModuleName(proxy);
-
-                    if (itemTableName.size() <= 0) {
-                        // connection is done but any table exist
-                        if (displayMessageBox) {
-                            openInfoDialogInUIThread(getShell(),
-                                    Messages.getString("DatabaseTableForm.checkConnection"), Messages //$NON-NLS-1$
-                                            .getString("DatabaseTableForm.tableNoExist"), true);//$NON-NLS-1$
+                        if (itemTableName.size() <= 0) {
+                            // connection is done but any table exist
+                            if (displayMessageBox) {
+                                openInfoDialogInUIThread(getShell(),
+                                        Messages.getString("DatabaseTableForm.checkConnection"), Messages //$NON-NLS-1$
+                                                .getString("DatabaseTableForm.tableNoExist"), true);//$NON-NLS-1$
+                            }
+                        } else {
+                            createAllItems(displayMessageBox, null);
                         }
-                    } else {
-                        createAllItems(displayMessageBox, null);
+                    } catch (final Exception ex) {
+                        Display.getDefault().asyncExec(new Runnable() {
+
+                            @Override
+                            public void run() {
+                                ExceptionMessageDialog.openError(
+                                        getShell(),
+                                        Messages.getString("SeletorModuleForm.connectFromCustomModuleName.errorTitle"), ex.getMessage(), ex); //$NON-NLS-1$
+                            }
+                        });
+                    } finally {
+                        monitor.done();
                     }
-                    monitor.done();
                 }
             });
         } catch (Exception e) {
@@ -654,6 +668,7 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
     private void createAllItems(final boolean displayMessageBox, final List<String> newList) {
         Display.getDefault().asyncExec(new Runnable() {
 
+            @Override
             public void run() {
                 List<String> list = new ArrayList<String>();
                 if (newList != null) {
@@ -693,16 +708,21 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
         });
     }
 
-    public static void openInfoDialogInUIThread(final Shell shell, final String title, final String msg, boolean ifUseRunnable) {
+    public static void openInfoDialogInUIThread(Shell shell, final String title, final String msg, boolean ifUseRunnable) {
         if (ifUseRunnable) {
-            shell.getDisplay().asyncExec(new Runnable() {
+            Display.getDefault().asyncExec(new Runnable() {
 
+                @Override
                 public void run() {
-                    MessageDialog.openInformation(shell, title, msg);
+                    MessageDialog.openInformation(new Shell(), title, msg);
                 }
             });
         } else {
-            MessageDialog.openInformation(shell, title, msg);
+            Shell iShell = shell;
+            if (iShell == null) {
+                iShell = new Shell();
+            }
+            MessageDialog.openInformation(iShell, title, msg);
         }
     }
 
@@ -873,8 +893,8 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
             if (runnable != null) {
                 return runnable;
             }
-            for (Iterator iter = getQueue().iterator(); iter.hasNext();) {
-                RetrieveColumnRunnable element = (RetrieveColumnRunnable) iter.next();
+            for (Object element2 : getQueue()) {
+                RetrieveColumnRunnable element = (RetrieveColumnRunnable) element2;
                 if (element.getTableItem() == key) {
                     return element;
                 }
@@ -938,6 +958,7 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
             getConnection().setModuleName(tableString);
         }
 
+        @Override
         public void run() {
             if (isCanceled()) {
                 return;
@@ -1042,6 +1063,7 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
             //
             Display.getDefault().syncExec(new Runnable() {
 
+                @Override
                 public void run() {
                     if (isCanceled()) {
                         return;
@@ -1162,7 +1184,11 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
     protected void addFieldsListeners() {
         nameFilter.addModifyListener(new ModifyListener() {
 
+            @Override
             public void modifyText(ModifyEvent e) {
+                if (itemTableName == null) {
+                    return;
+                }
                 List<String> newList = new ArrayList<String>();
 
                 String pattern = nameFilter.getText();
@@ -1318,6 +1344,7 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
         }
     }
 
+    @Override
     protected SalesforceSchemaConnection getConnection() {
         if (oldTemConnection != null) {
             return oldTemConnection;
@@ -1393,7 +1420,7 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
         return this.itemTableName;
     }
 
-    public List<String> connectFromCustomModuleName(String proxy) {
+    public List<String> connectFromCustomModuleName(String proxy) throws Exception {
         preparModuleInit();
         SalesforceModuleParseAPI salesforceAPI = new SalesforceModuleParseAPI();
         String[] types = null;
@@ -1412,90 +1439,83 @@ public class SelectorModulesForm extends AbstractSalesforceStepForm {
                 httpProxy = true;
             }
         }
-        try {
-            if (loginType.equalsIgnoreCase(BASIC)) {
-                salesforceAPI.resetAllProxy();
-                salesforceAPI.setProxy(proxyHost, proxyPort, proxyUsername, proxyPassword, httpProxy, socksProxy, httpsProxy);
-                salesforceAPI.login(endPoint, username, pwd, timeOut);
-                ISalesforceModuleParser currentAPI = salesforceAPI.getCurrentAPI();
-                if (currentAPI instanceof SalesforceModuleParseEnterprise) {
-                    describeGlobalResult = describeGlobal();
-                    if (describeGlobalResult != null) {
-                        types = describeGlobalResult.getTypes();
-                    }
-                } else {
-                    // for bug 17280 use new jar axis2 for salesforce component and wizard.
-                    if (currentAPI instanceof SalesforceModuleParserPartner) {
-                        SalesforceModuleParserPartner partner = (SalesforceModuleParserPartner) currentAPI;
-                        SforceManagementImpl sforceManagement = partner.getSforceManagement();
-                        SessionHeader sessionHeader = sforceManagement.getSessionHeader();
-                        DescribeGlobal dg = new DescribeGlobal();
-                        com.salesforce.soap.partner.DescribeGlobalResult dgr = sforceManagement.getStub()
-                                .describeGlobal(dg, sessionHeader, null, null).getResult();
-                        dgsrs = dgr.getSobjects();
-
-                    }
+        if (loginType.equalsIgnoreCase(BASIC)) {
+            salesforceAPI.resetAllProxy();
+            salesforceAPI.setProxy(proxyHost, proxyPort, proxyUsername, proxyPassword, httpProxy, socksProxy, httpsProxy);
+            salesforceAPI.login(endPoint, username, pwd, timeOut);
+            ISalesforceModuleParser currentAPI = salesforceAPI.getCurrentAPI();
+            if (currentAPI instanceof SalesforceModuleParseEnterprise) {
+                describeGlobalResult = describeGlobal();
+                if (describeGlobalResult != null) {
+                    types = describeGlobalResult.getTypes();
                 }
             } else {
-                salesforceAPI.resetAllProxy();
-                salesforceAPI.setProxy(proxyHost, proxyPort, proxyUsername, proxyPassword, httpProxy, socksProxy, httpsProxy);
-                Token token = salesforceAPI.login(endPointForAuth, consumerKey, consumeSecret, callbackHost, callbackPort,
-                        salesforceVersion, tokenProperties, timeOut);
-                if (token != null) {
-                    org.talend.salesforce.SforceManagement sfMgr = new org.talend.salesforce.SforceManagementImpl();
-                    OAuthClient client = new OAuthClient();
-                    client.setBaseOAuthURL(endPointForAuth);
-                    client.setCallbackHost(callbackHost);
-                    client.setCallbackPort(Integer.parseInt(callbackPort));
-                    client.setClientID(consumerKey);
-                    client.setClientSecret(consumeSecret);
-                    String endpoint = client.getSOAPEndpoint(token, salesforceVersion);
-                    boolean result = sfMgr.login(token.getAccess_token(), endpoint, Integer.parseInt(timeOut), false);
-                    SessionHeader sessionHeader = sfMgr.getSessionHeader();
+                // for bug 17280 use new jar axis2 for salesforce component and wizard.
+                if (currentAPI instanceof SalesforceModuleParserPartner) {
+                    SalesforceModuleParserPartner partner = (SalesforceModuleParserPartner) currentAPI;
+                    SforceManagementImpl sforceManagement = partner.getSforceManagement();
+                    SessionHeader sessionHeader = sforceManagement.getSessionHeader();
                     DescribeGlobal dg = new DescribeGlobal();
-                    com.salesforce.soap.partner.DescribeGlobalResult dgr = sfMgr.getStub()
+                    com.salesforce.soap.partner.DescribeGlobalResult dgr = sforceManagement.getStub()
                             .describeGlobal(dg, sessionHeader, null, null).getResult();
                     dgsrs = dgr.getSobjects();
+
                 }
             }
-
+        } else {
             salesforceAPI.resetAllProxy();
-            INode node = getSalesforceNode();
-
-            List list = new ArrayList();
-
-            IElementParameter modulesNameParam = node.getElementParameter("MODULENAME"); //$NON-NLS-1$
-            Object[] modulename = modulesNameParam.getListItemsValue();
-            if (modulename != null && modulename.length > 1) {
-                for (int i = 0; i < modulename.length - 1; i++) {
-                    list.add(i, modulename[i]);
-                }
+            salesforceAPI.setProxy(proxyHost, proxyPort, proxyUsername, proxyPassword, httpProxy, socksProxy, httpsProxy);
+            Token token = salesforceAPI.login(endPointForAuth, consumerKey, consumeSecret, callbackHost, callbackPort,
+                    salesforceVersion, tokenProperties, timeOut);
+            if (token != null) {
+                org.talend.salesforce.SforceManagement sfMgr = new org.talend.salesforce.SforceManagementImpl();
+                OAuthClient client = new OAuthClient();
+                client.setBaseOAuthURL(endPointForAuth);
+                client.setCallbackHost(callbackHost);
+                client.setCallbackPort(Integer.parseInt(callbackPort));
+                client.setClientID(consumerKey);
+                client.setClientSecret(consumeSecret);
+                String endpoint = client.getSOAPEndpoint(token, salesforceVersion);
+                boolean result = sfMgr.login(token.getAccess_token(), endpoint, Integer.parseInt(timeOut), false);
+                SessionHeader sessionHeader = sfMgr.getSessionHeader();
+                DescribeGlobal dg = new DescribeGlobal();
+                com.salesforce.soap.partner.DescribeGlobalResult dgr = sfMgr.getStub()
+                        .describeGlobal(dg, sessionHeader, null, null).getResult();
+                dgsrs = dgr.getSobjects();
             }
-            if (types != null && types.length > 0) {
-                for (int j = 0; j < types.length; j++) {
-                    if (!list.contains(types[j])) {
-                        list.add(types[j]);
-                    }
-                }
-            }
-            if (dgsrs != null && dgsrs.length > 0) {
-                for (int k = 0; k < dgsrs.length; k++) {
-                    DescribeGlobalSObjectResult dsResult = dgsrs[k];
-                    String name = dsResult.getName();
-                    if (!list.contains(name)) {
-                        list.add(name);
-                    }
-                }
-
-            }
-            // createAllItems(false, list);
-            return list;
-
-        } catch (Exception ex) {
-            ExceptionHandler.process(ex);
-            return null;
         }
 
+        salesforceAPI.resetAllProxy();
+        INode node = getSalesforceNode();
+
+        List list = new ArrayList();
+
+        IElementParameter modulesNameParam = node.getElementParameter("MODULENAME"); //$NON-NLS-1$
+        Object[] modulename = modulesNameParam.getListItemsValue();
+        if (modulename != null && modulename.length > 1) {
+            for (int i = 0; i < modulename.length - 1; i++) {
+                list.add(i, modulename[i]);
+            }
+        }
+        if (types != null && types.length > 0) {
+            for (int j = 0; j < types.length; j++) {
+                if (!list.contains(types[j])) {
+                    list.add(types[j]);
+                }
+            }
+        }
+        if (dgsrs != null && dgsrs.length > 0) {
+            for (DescribeGlobalSObjectResult dsResult : dgsrs) {
+                String name = dsResult.getName();
+                if (!list.contains(name)) {
+                    list.add(name);
+                }
+            }
+
+        }
+        // createAllItems(false, list);
+        return list;
+
     }
 
     private void preparModuleInit() {

org.talend.update.p2-feature/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.update.p2-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

org.talend.update.p2-feature/build.properties

@@ -0,0 +1 @@
+bin.includes = feature.xml

org.talend.update.p2-feature/feature.xml

@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.update.p2_feature"
+      label="P2-feature"
+      version="1.0.0.qualifier">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <plugin
+         id="org.eclipse.equinox.p2.director"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.engine"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.jarprocessor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.metadata"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.metadata.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.artifact.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.touchpoint.eclipse"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.touchpoint.natives"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.frameworkadmin"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.frameworkadmin.equinox"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.console"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.simpleconfigurator.manipulator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.ui.sdk"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.garbagecollector"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.directorywatcher"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.reconciler.dropins"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.metadata.generator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.updatesite"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.sat4j.core"
+         download-size="0"
+         install-size="0"
+         version="2.2.0.v20100429"
+         unpack="false"/>
+
+   <plugin
+         id="org.sat4j.pb"
+         download-size="0"
+         install-size="0"
+         version="2.2.0.v20100429"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.security.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.extensionlocation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.director.app"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.publisher"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.repository.tools"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.repository"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.filetransfer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.identity"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.provider.filetransfer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.provider.filetransfer.httpclient"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.codec"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.httpclient"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.logging"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.operations"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.ql"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.discovery"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.ui.discovery"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.p2.discovery.compatibility"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

org.talend.utils/src/main/java/org/talend/utils/sql/ConnectionUtils.java

@@ -225,9 +225,11 @@ public final class ConnectionUtils {
         return url != null && url.startsWith("jdbc:teradata"); //$NON-NLS-1$
     }
 
-    public static boolean isVertica(String url) { 
- 	    return url != null && url.startsWith("jdbc:vertica"); //$NON-NLS-1$ 
- 	}     /**
+    public static boolean isVertica(String url) {
+        return url != null && url.startsWith("jdbc:vertica"); //$NON-NLS-1$ 
+    }
+
+    /**
      * Method "isValid".
      * 
      * @param connection the connection to test
@@ -380,6 +382,32 @@ public final class ConnectionUtils {
         return result;
     }
 
+    public static boolean isOracleForSid(DatabaseMetaData metadata, String oracleProduct) throws SQLException {
+        if (metadata != null && metadata.getDatabaseProductName() != null
+                && metadata.getDatabaseProductName().indexOf(oracleProduct) > -1) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 
+     * DOC Comment method "isExasol".
+     * 
+     * @param metadata
+     * @return
+     * @throws SQLException
+     */
+    public static boolean isExasol(DatabaseMetaData metadata) throws SQLException {
+        if (metadata != null && metadata.getDriverName() != null
+                && metadata.getDriverName().toLowerCase().startsWith("exasol") //$NON-NLS-1$
+                && metadata.getDatabaseProductName() != null
+                && metadata.getDatabaseProductName().toLowerCase().startsWith("exasol")) { //$NON-NLS-1$
+            return true;
+        }
+        return false;
+    }
+
     /**
      * yyi 2010-08-25 for 14851, Sybase DB has several names with different productions and versions. For example the
      * Sybase IQ with version 12.6 is called 'Sybase' getting by JDBC but the version 15+ it is changed to 'Sybase IQ'.

pom.xml

@@ -7,7 +7,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.talend</groupId>
+<<<<<<< HEAD
+    <artifactId>org.talend.tis-shared</artifactId>
+=======
     <artifactId>org.talend.tos</artifactId>
+>>>>>>> release/5.5.1/tos
     <version>5.5.1</version>
 
     <packaging>pom</packaging>
@@ -17,11 +21,26 @@
     </properties>
 
     <modules>
+<<<<<<< HEAD
+        <module>org.talend.remote.commons</module>
+        <module>org.talend.remote.jobserver.commons</module>
+=======
         <module>org.talend.utils</module>
+>>>>>>> release/5.5.1/tos
     </modules>
 
 	<distributionManagement>
 		<repository>
+<<<<<<< HEAD
+			<id>tis-releases</id>
+			<name>TIS releases Repository</name>
+			<url>${tis.releases.repo.url}</url>
+		</repository>
+		<snapshotRepository>
+			<id>tis-snapshots</id>
+			<name>TIS snapshots Repository</name>
+			<url>${tis.snapshots.repo.url}</url>
+=======
 			<id>tos-releases</id>
 			<name>TOS releases Repository</name>
 			<url>${tos.releases.repo.url}</url>
@@ -30,6 +49,7 @@
 			<id>tos-snapshots</id>
 			<name>TOS snapshots Repository</name>
 			<url>${tos.snapshots.repo.url}</url>
+>>>>>>> release/5.5.1/tos
 		</snapshotRepository>
 	</distributionManagement>