fix(TESB-25952):[Java 11]DemoRESTRoute cannot run from studio (#2433)

* fix(TESB-25692): Add java11 missing jars for Route

* fix(TESB-25692): Add jakarta.jws-api

i18n/features/org.talend.babel.all.tos.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
 	<groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   

i18n/plugins/org.talend.common.ui.runtime.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.common.ui.runtime.nl</artifactId>

i18n/plugins/org.talend.commons.runtime.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.runtime.nl</artifactId>

i18n/plugins/org.talend.commons.ui.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.ui.nl</artifactId>

i18n/plugins/org.talend.core.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.nl</artifactId>

i18n/plugins/org.talend.core.repository.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.repository.nl</artifactId>

i18n/plugins/org.talend.core.runtime.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.runtime.nl</artifactId>

i18n/plugins/org.talend.core.ui.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.ui.nl</artifactId>

i18n/plugins/org.talend.cwm.mip.edit.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.cwm.mip.edit.nl</artifactId>

i18n/plugins/org.talend.cwm.mip.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.cwm.mip.nl</artifactId>

i18n/plugins/org.talend.designer.maven.ui.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.ui.nl</artifactId>

i18n/plugins/org.talend.help.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.help.nl</artifactId>

i18n/plugins/org.talend.helpers.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.helpers.nl</artifactId>

i18n/plugins/org.talend.librariesmanager.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.librariesmanager.nl</artifactId>

i18n/plugins/org.talend.librariesmanager.ui.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.librariesmanager.ui.nl</artifactId>

i18n/plugins/org.talend.metadata.managment.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.metadata.managment.nl</artifactId>

i18n/plugins/org.talend.metadata.managment.ui.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.metadata.managment.ui.nl</artifactId>

i18n/plugins/org.talend.migrationTool.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.migrationTool.nl</artifactId>

i18n/plugins/org.talend.model.edit.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.edit.nl</artifactId>

i18n/plugins/org.talend.model.migration.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.migration.nl</artifactId>

i18n/plugins/org.talend.model.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.nl</artifactId>

i18n/plugins/org.talend.presentation.onboarding.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.nl</artifactId>

i18n/plugins/org.talend.rcp.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.nl</artifactId>

i18n/plugins/org.talend.registration.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.registration.nl</artifactId>

i18n/plugins/org.talend.repository.items.importexport.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.items.importexport.nl</artifactId>

i18n/plugins/org.talend.repository.items.importexport.ui.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>

i18n/plugins/org.talend.repository.localprovider.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.localprovider.nl</artifactId>

i18n/plugins/org.talend.repository.mdm.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.mdm.nl</artifactId>

i18n/plugins/org.talend.repository.metadata.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.metadata.nl</artifactId>

i18n/plugins/org.talend.repository.view.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.view.nl</artifactId>

i18n/plugins/org.talend.resources.nl/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.resources.nl</artifactId>

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

@@ -9,8 +9,8 @@
   </url>  
   <requires>
     <import feature="org.talend.model.migration.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="bcprov" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="com.fasterxml.jackson.core.jackson-databind" version="2.9.5" match="greaterOrEqual"/>
+    <import plugin="org.bouncycastle.bcprov" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="com.fasterxml.jackson.core.jackson-databind" version="2.9.8" match="greaterOrEqual"/>
     <import plugin="jackson-core-asl" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="jackson-mapper-asl" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.xalan" version="0.0.0" match="greaterOrEqual"/>

main/features/org.talend.commons.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.feature</artifactId>

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

@@ -26,7 +26,9 @@
     <import feature="org.talend.utils.feature" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="javax.activation" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="javax.mail" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="javax.xml.bind" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="javax.xml.soap" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="javax.xml.ws" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="net.jeeeyul.eclipse.themes" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="net.jeeeyul.swtend" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.commons.collections" version="0.0.0" match="greaterOrEqual"/>
@@ -34,15 +36,9 @@
     <import plugin="org.apache.commons.io" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.httpcomponents.httpclient" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.httpcomponents.httpcore" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.aether.api" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.aether.connector.basic" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.aether.impl" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.aether.spi" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.aether.transport.file" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.aether.transport.http" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.aether.util" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.compare" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.compare.core" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.m2m.atl.emftvm.trace" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.ops4j.pax.url.mvn" version="0.0.0" match="greaterOrEqual"/>
   </requires>  
   <plugin id="org.talend.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
@@ -70,8 +66,8 @@
   <plugin id="org.talend.model" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.model.edit" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.model.edit.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.model.migration"/>
-  <plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.model.migration.nl"/>
+  <plugin id="org.talend.model.migration" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.model.migration.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.model.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.osgi.lib.loader" download-size="0" install-size="0" version="0.0.0" unpack="false" fragment="true"/>
   <plugin id="org.talend.resources" download-size="0" install-size="0" version="0.0.0"/>

main/features/org.talend.core.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.feature</artifactId>

main/features/org.talend.fragment.jars.common.feature/feature.xml

@@ -16,13 +16,6 @@
       [Enter License Description here.]
    </license>
 
-   <plugin
-         id="org.talend.libraries.nattable.glazedlist"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
    <plugin
          id="org.talend.developpement"
          download-size="0"

main/features/org.talend.fragment.jars.common.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.fragment.jars.common.feature</artifactId>

main/features/org.talend.help.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.help.feature</artifactId>

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

@@ -5,7 +5,8 @@
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  
   <requires>
-    <import plugin="org.codehaus.groovy" version="0.0.0" match="greaterOrEqual"/>
+    <!-- bonita requires org.codehaus.groovy version 2.4.16.xx-201812291959-e2018-12-RELEASE -->
+    <import plugin="org.codehaus.groovy" version="2.4.16.xx-201812291959-e2018-12-RELEASE" match="perfect"/>
     <import plugin="org.eclipse.ant.launching" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.ant.ui" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.jdt" version="0.0.0" match="greaterOrEqual"/>
@@ -30,6 +31,6 @@
     <import plugin="org.hamcrest.core" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.junit" version="0.0.0" match="greaterOrEqual"/>
   </requires>
-  <plugin id="org.eclipse.jdt.launching.macosx" os="macosx" download-size="17" install-size="28" version="3.2.300.v20130801-1441" unpack="false"/>
-  <plugin id="org.eclipse.jdt.launching.ui.macosx" os="macosx" download-size="55" install-size="101" version="1.0.300.v20130801-1441" unpack="false"/>
+  <plugin id="org.eclipse.jdt.launching.macosx" os="macosx" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.eclipse.jdt.launching.ui.macosx" os="macosx" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>

main/features/org.talend.jdt.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.jdt.feature</artifactId>

main/features/org.talend.libraries.jdbc.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.libraries.jdbc.feature</artifactId>

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

@@ -5,6 +5,7 @@
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  
   <requires>
+    <import feature="org.eclipse.equinox.p2.discovery.feature" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.eclipse.wst.common.fproj" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.eclipse.wst.common_core.feature" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.eclipse.wst.xml_core.feature" version="0.0.0" match="greaterOrEqual"/>
@@ -18,6 +19,7 @@
     <import plugin="org.eclipse.m2e.archetype.common" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.m2e.core" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.m2e.core.ui" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.m2e.discovery" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.m2e.editor" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.m2e.editor.xml" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.m2e.jdt" version="0.0.0" match="greaterOrEqual"/>
@@ -32,7 +34,9 @@
     <import plugin="org.eclipse.m2e.profiles.ui" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.m2e.refactoring" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.m2e.scm" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.m2e.workspace.cli" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.slf4j.impl.log4j12" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.wst.server.discovery" version="0.0.0" match="greaterOrEqual"/>
   </requires>
 </feature>

main/features/org.talend.m2e.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.m2e.feature</artifactId>

main/features/org.talend.model.migration.feature/feature.xml

@@ -7,6 +7,6 @@
   <requires>
     <import feature="org.eclipse.m2m.atl" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.talend.utils.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="bcprov" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.bouncycastle.bcprov" version="0.0.0" match="greaterOrEqual"/>
   </requires> 
 </feature>

main/features/org.talend.model.migration.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.model.migration.feature</artifactId>

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

@@ -18,8 +18,6 @@
     <import plugin="org.eclipse.core.filesystem" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.core.net" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.core.runtime.compatibility" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.eclipse.core.runtime.compatibility.registry" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.core.variables" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.debug.core" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.debug.ui" version="0.0.0" match="greaterOrEqual"/>
@@ -47,6 +45,7 @@
     <import plugin="org.eclipse.ui.ide" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.ui.ide.application" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.ui.intro" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ui.intro.quicklinks" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.ui.intro.universal" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.ui.navigator" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.ui.navigator.resources" version="0.0.0" match="greaterOrEqual"/>
@@ -56,28 +55,15 @@
     <import plugin="org.eclipse.ui.views.properties.tabbed" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.ui.workbench.texteditor" version="0.0.0" match="greaterOrEqual"/>
   </requires>
-  <plugin id="org.eclipse.compare.win32" os="win32" download-size="38" install-size="71" version="1.0.200.v20130514-1224" unpack="false"/>
-  <plugin id="org.eclipse.core.filesystem.aix.ppc" os="aix" arch="ppc" download-size="9" install-size="17" version="1.1.0.v20140124-1940" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.filesystem.aix.ppc64" os="aix" arch="ppc64" download-size="9" install-size="18" version="1.1.0.v20140124-1940" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.filesystem.hpux.ia64" os="hpux" arch="ia64" download-size="20" install-size="102" version="1.1.0.v20140124-1940" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.filesystem.linux.ppc" os="linux" arch="ppc" download-size="22" install-size="52" version="1.0.200.v20140124-1940" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.filesystem.linux.ppc64" os="linux" arch="ppc64" download-size="10" install-size="21" version="1.4.0.v20140124-1940" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.filesystem.linux.ppc64le" os="linux" arch="ppc64le" download-size="10" install-size="20" version="1.4.0.v20140808-1353" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.filesystem.linux.x86" os="linux" arch="x86" download-size="10" install-size="17" version="1.4.200.v20140124-1940" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.filesystem.linux.x86_64" os="linux" arch="x86_64" download-size="10" install-size="19" version="1.2.200.v20140124-1940" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.filesystem.macosx" os="macosx" download-size="13" install-size="64" version="1.3.0.v20140124-1940" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.filesystem.solaris.sparc" os="solaris" arch="sparc" download-size="9" install-size="16" version="1.2.0.v20140124-1940" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.filesystem.win32.x86" os="win32" arch="x86" download-size="26" install-size="54" version="1.4.0.v20140124-1940" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.filesystem.win32.x86_64" os="win32" arch="x86_64" download-size="31" install-size="64" version="1.4.0.v20140124-1940" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.net.linux.x86" os="linux" arch="x86" download-size="36" install-size="95" version="1.1.300.v20140124-2013" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.net.linux.x86_64" os="linux" arch="x86_64" download-size="37" install-size="100" version="1.1.100.v20140124-2013" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.net.win32.x86" os="win32" arch="x86" download-size="29" install-size="54" version="1.0.100.v20140124-2013" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.net.win32.x86_64" os="win32" arch="x86_64" download-size="28" install-size="54" version="1.0.100.v20140124-2013" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.resources.win32.x86" os="win32" arch="x86" download-size="17" install-size="42" version="3.5.100.v20140124-1940" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.core.resources.win32.x86_64" os="win32" arch="x86_64" download-size="26" install-size="53" version="3.5.0.v20140124-1940" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.equinox.security.macosx" os="macosx" download-size="16" install-size="58" version="1.100.200.v20130327-1442" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.equinox.security.win32.x86" os="win32" arch="x86" download-size="22" install-size="47" version="1.0.300.v20130327-1442" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.equinox.security.win32.x86_64" os="win32" arch="x86_64" download-size="34" install-size="65" version="1.0.100.v20130327-1442" fragment="true" unpack="false"/>
-  <plugin id="org.eclipse.ui.win32" os="win32" download-size="24" install-size="48" version="3.2.400.v20140423-2207" fragment="true" unpack="false"/>
+  <plugin id="org.eclipse.compare.win32" os="win32" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.eclipse.core.filesystem.linux.x86_64" os="linux" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.eclipse.core.filesystem.macosx" os="macosx" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.eclipse.core.filesystem.win32.x86_64" os="win32" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.eclipse.core.net.linux.x86_64" os="linux" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.eclipse.core.net.win32.x86_64" os="win32" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.eclipse.core.resources.win32.x86_64" os="win32" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.eclipse.equinox.security.macosx" os="macosx" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.eclipse.equinox.security.win32.x86_64" os="win32" arch="x86_64" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.eclipse.ui.win32" os="win32" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.platform.logging" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>

main/features/org.talend.platform.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   

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

@@ -13,6 +13,7 @@
     <import plugin="net.jeeeyul.eclipse.themes" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="net.jeeeyul.swtend" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.ui.views.log" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.urischeme" version="0.0.0" match="greaterOrEqual"/>
   </requires>  
   <plugin id="org.talend.rcp" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.rcp.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>

main/features/org.talend.rcp.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.feature</artifactId>

main/features/org.talend.update.p2.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.update.p2.feature</artifactId>

main/features/org.talend.updates.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.updates.feature</artifactId>

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

@@ -5,10 +5,10 @@
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  
   <requires>
-    <import plugin="bcprov" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.bouncycastle.bcprov" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="com.cedarsoftware.json-io" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="com.fasterxml.jackson.core.jackson-annotations" version="2.9.0" match="greaterOrEqual"/>
-    <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.5" match="greaterOrEqual"/>
+    <import plugin="com.fasterxml.jackson.core.jackson-core" version="2.9.8" match="greaterOrEqual"/>
     <import plugin="com.thoughtworks.paranamer" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="jackson-core-asl" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="jackson-mapper-asl" version="0.0.0" match="greaterOrEqual"/>
@@ -22,5 +22,6 @@
     <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
   </requires>  
   <plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.utils.feature</artifactId>

main/plugins/org.talend.common.ui.runtime/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.common.ui.runtime</artifactId>

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/MessageBoxExceptionHandler.java

@@ -54,9 +54,7 @@ public final class MessageBoxExceptionHandler {
 
                 @Override
                 public void run() {
-                    Shell shell = display.getActiveShell() == null ? new Shell() : display.getActiveShell();
-                    process(ex, shell);
-
+                    process(ex, display.getActiveShell());
                 }
             });
         }

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

@@ -23,6 +23,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.ImageDataProvider;
 import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.graphics.Point;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
@@ -103,7 +104,7 @@ public class ImageUtils {
      * RAP.
      */
     public static Image scale(Image image, int percent) {
-        float scale = (float) percent / 100f;
+        float scale = percent / 100f;
         int newWidth = (int) (scale * image.getImageData().width);
         int newHeight = (int) (scale * image.getImageData().height);
         ImageData imageData = image.getImageData().scaledTo(newWidth, newHeight);
@@ -143,7 +144,7 @@ public class ImageUtils {
         return imageDes;
     }
 
-    private static Map<byte[], ImageData> imageFromDataCachedImages = new HashMap<byte[], ImageData>();
+    private static Map<byte[], ImageDataProvider> imageFromDataCachedImages = new HashMap<byte[], ImageDataProvider>();
 
     /**
      * By default, keep in memory the .
@@ -154,13 +155,14 @@ public class ImageUtils {
      */
     public static ImageDescriptor createImageFromData(byte[] data, boolean... keepInMemory) {
         if (data != null) {
-            ImageData img = imageFromDataCachedImages.get(data);
-            if (img == null) {
+            ImageDataProvider imageProvider = imageFromDataCachedImages.get(data);
+            if (imageProvider == null) {
                 ByteArrayInputStream bais = new ByteArrayInputStream(data);
-                img = new ImageData(bais);
-                imageFromDataCachedImages.put(data, img);
+                ImageData img = new ImageData(bais);
+                imageProvider = new TalendImageProvider(img);
+                imageFromDataCachedImages.put(data, imageProvider);
             }
-            return ImageDescriptor.createFromImageData(img);
+            return ImageDescriptor.createFromImageDataProvider(imageProvider);
         }
         return null;
     }
@@ -283,11 +285,11 @@ public class ImageUtils {
             // if width is mort than height.
             if (w > h) {
                 newSize.x = requiredSize.x;
-                newSize.y = (int) (w >= 1 ? Math.round(originalSize.y / w) : Math.round(originalSize.y * w));
+                newSize.y = w >= 1 ? Math.round(originalSize.y / w) : Math.round(originalSize.y * w);
             }
             // if width is less than height.
             else if (w < h) {
-                newSize.x = (int) (h >= 1 ? Math.round(originalSize.x / h) : Math.round(originalSize.x * h));
+                newSize.x = h >= 1 ? Math.round(originalSize.x / h) : Math.round(originalSize.x * h);
                 newSize.y = requiredSize.y;
             }
             // if equal

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

@@ -0,0 +1,22 @@
+package org.talend.commons.ui.runtime.image;
+
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.ImageDataProvider;
+
+public class TalendImageProvider implements ImageDataProvider {
+
+    private ImageData imageData;
+
+    public TalendImageProvider(ImageData imageData) {
+        this.imageData = imageData;
+    }
+
+    @Override
+    public ImageData getImageData(int zoom) {
+        if (zoom == 100) {
+            return imageData;
+        }
+        return null;
+    }
+
+}

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/swt/celleditor/ComboxCellEditorImproved.java

@@ -18,6 +18,7 @@ import org.eclipse.jface.util.Assert;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ComboBoxCellEditor;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.events.FocusAdapter;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.KeyAdapter;
@@ -27,7 +28,6 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.TraverseEvent;
 import org.eclipse.swt.events.TraverseListener;
 import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
@@ -53,7 +53,7 @@ public class ComboxCellEditorImproved extends CellEditor {
     /**
      * The custom combo box control.
      */
-    Combo comboBox;
+    CCombo comboBox;
 
     /**
      * Default ComboBoxCellEditor style
@@ -125,7 +125,7 @@ public class ComboxCellEditorImproved extends CellEditor {
      */
     protected Control createControl(Composite parent) {
 
-        comboBox = new Combo(parent, getStyle());
+        comboBox = new CCombo(parent, getStyle());
         comboBox.setFont(parent.getFont());
 
         comboBox.addKeyListener(new KeyAdapter() {

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/swt/tableviewer/TableViewerCreatorNotModifiable.java

@@ -375,8 +375,12 @@ public class TableViewerCreatorNotModifiable<B> {
             tableEditorManager.init(this.listenableList);
         }
 
-        if (hasChanged && !isLazyLoad()) {
-            refreshTableEditorControls();
+        if (hasChanged) {
+        	if(!isLazyLoad()) {
+        		refreshTableEditorControls();
+        	}else if(tableEditorManager != null){
+            	tableEditorManager.clearEditor();
+            }
         }
 
     }

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/swt/tableviewer/tableeditor/TableEditorManager.java

@@ -313,6 +313,17 @@ public class TableEditorManager {
         }
 
     }
+    
+    public void clearEditor() {
+    	for (int i = 0; i < tableEditorList.size(); i++) {
+            TableEditor tableEditor = tableEditorList.get(i);
+            disposeTableEditor(tableEditor);
+            fireEvent(new TableEditorManagerEvent(EVENT_TYPE.CONTROL_DISPOSED, tableEditor));
+        }
+
+        tableEditorList.clear();
+        dataToMultipleDataEditor.clear();
+    }
 
     @SuppressWarnings("unchecked")
     public void refresh() {

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/utils/ZipFileUtils.java

@@ -0,0 +1,175 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2018 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.commons.ui.runtime.utils;
+
+/**
+ * DOC Administrator class global comment. Detailled comment
+ */
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+
+import org.apache.tools.zip.ZipEntry;
+import org.apache.tools.zip.ZipFile;
+import org.talend.commons.ui.runtime.exception.ExceptionHandler;
+
+public class ZipFileUtils {
+
+    private static int bufSize = 2048; // size of bytes
+
+    public static String zip(String zipDirectory) {
+        File zipDir = new File(zipDirectory);
+        return zip(zipDirectory, zipDir.getPath(), false);
+    }
+
+    public static String zip(String zipDirectory, String zipFileName, boolean includeSelfDir) {
+        File zipDir = new File(zipDirectory);
+        File[] willZipFileArr;
+        if (includeSelfDir || zipDir.isFile()) {
+            willZipFileArr = new File[] { zipDir };
+        } else {
+            willZipFileArr = zipDir.listFiles();
+        }
+        return zip(willZipFileArr, zipFileName);
+    }
+
+    public static String zip(File[] files, String zipFileName) {
+
+        JarOutputStream jarOutput = null;
+        try {
+            jarOutput = new JarOutputStream(new FileOutputStream(zipFileName));
+
+            for (File file : files) {
+                zipFiles(file, jarOutput, "");
+            }
+
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        } finally {
+            if (jarOutput != null) {
+                try {
+                    jarOutput.close();
+                } catch (IOException e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+        }
+        return null;
+    }
+
+    private static void zipFiles(File file, JarOutputStream jos, String pathName) throws Exception {
+        String fileName = pathName + file.getName();
+        if (file.isDirectory()) {
+            fileName = fileName + "/";
+            jos.putNextEntry(new JarEntry(fileName));
+            String fileNames[] = file.list();
+            if (fileNames != null) {
+                for (int i = 0; i < fileNames.length; i++) {
+                    zipFiles(new File(file, fileNames[i]), jos, fileName);
+                }
+                jos.closeEntry();
+            }
+        } else {
+            JarEntry jarEntry = new JarEntry(fileName);
+            BufferedInputStream in = new BufferedInputStream(new FileInputStream(file));
+            jos.putNextEntry(jarEntry);
+
+            byte[] buf = new byte[bufSize];
+            int len;
+            while ((len = in.read(buf)) >= 0) {
+                jos.write(buf, 0, len);
+            }
+            in.close();
+            jos.closeEntry();
+        }
+    }
+
+    public static String unZip(File unZipFile) {
+        return unZip(unZipFile.getPath(), null);
+    }
+
+    public static String unZip(File unZipFile, String destFileName) {
+        return unZip(unZipFile.getPath(), destFileName);
+    }
+
+    public static String unZip(String unZipFileName) {
+        return unZip(unZipFileName, null);
+    }
+
+    public static String unZip(String unZipFileName, String destFileName) {
+        File unzipFile = new File(unZipFileName);
+
+        if (destFileName == null || destFileName.trim().length() == 0) {
+            destFileName = unzipFile.getParent();
+        }
+
+        File destFile;
+        ZipFile zipFile = null;
+        try {
+            zipFile = new ZipFile(unzipFile, "GBK");
+            for (Enumeration entries = zipFile.getEntries(); entries.hasMoreElements();) {
+                ZipEntry entry = (ZipEntry) entries.nextElement();
+                destFile = new File(destFileName, entry.getName());
+
+                unZipFile(destFile, zipFile, entry);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+            return e.getMessage();
+        } finally {
+            try {
+                assert zipFile != null;
+                zipFile.close();
+            } catch (Exception e) {
+                ExceptionHandler.process(e);
+            }
+        }
+        return null;
+    }
+
+    private static void unZipFile(File destFile, ZipFile zipFile, ZipEntry entry) throws IOException {
+        InputStream inputStream;
+        FileOutputStream fileOut;
+        if (entry.isDirectory()) {
+            destFile.mkdirs();
+        } else {
+            File parent = destFile.getParentFile();
+            if (parent != null && !parent.exists()) {
+                parent.mkdirs();
+            }
+
+            inputStream = zipFile.getInputStream(entry);
+
+            fileOut = new FileOutputStream(destFile);
+            byte[] buf = new byte[bufSize];
+            int readedBytes;
+            while ((readedBytes = inputStream.read(buf)) > 0) {
+                fileOut.write(buf, 0, readedBytes);
+            }
+            fileOut.close();
+
+            inputStream.close();
+        }
+    }
+
+    public void setBufSize(int bufSize) {
+        ZipFileUtils.bufSize = bufSize;
+    }
+}

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

@@ -11,7 +11,6 @@ Require-Bundle: org.apache.log4j;visibility:=reexport,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore.xmi,
  org.talend.libraries.apache,
- org.apache.xerces,
  com.ibm.icu,
  org.apache.commons.io,
  org.talend.utils
@@ -61,3 +60,4 @@ Bundle-ClassPath: .,
  fakejdbc_driver.jar
 Bundle-Vendor: .Talend SA.
 Bundle-ActivationPolicy: lazy
+Import-Package: org.apache.xerces.jaxp

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.runtime</artifactId>

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

@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.talend</groupId>
         <artifactId>org.talend.tos</artifactId>
-        <version>7.2.1-M3</version>
+        <version>7.2.1-M6</version>
         <relativePath>../pom_server.xml</relativePath>
     </parent>
 

main/plugins/org.talend.commons.runtime/src/org/talend/commons/CommonsPlugin.java

@@ -17,13 +17,16 @@ import java.io.InputStream;
 import java.net.URL;
 
 import org.apache.commons.lang.ArrayUtils;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.talend.commons.exception.ExceptionService;
 import org.talend.commons.runtime.debug.TalendDebugHandler;
+import org.talend.commons.utils.system.EclipseCommandLine;
 
 /**
  * Activator for Code Generator.
@@ -99,6 +102,10 @@ public class CommonsPlugin implements BundleActivator {
         CommonsPlugin.headless = headless;
     }
 
+    public static boolean isScriptCmdlineMode() {
+        return System.getProperty(EclipseCommandLine.PROP_VM) == null;
+    }
+
     public static boolean isDebugMode() {
         return ArrayUtils.contains(Platform.getApplicationArgs(), TalendDebugHandler.TALEND_DEBUG);
     }
@@ -160,4 +167,13 @@ public class CommonsPlugin implements BundleActivator {
     	InstanceScope.INSTANCE.getNode("org.eclipse.m2e.core").putBoolean("eclipse.m2.offline", state);
     }
 
+    public static URL getBundleRealURL(String bundleId) throws Exception {
+        Bundle bundle = Platform.getBundle(bundleId);
+        if (bundle == null) {
+            return null;
+        }
+        URL entry = bundle.getEntry("/"); //$NON-NLS-1$
+        return FileLocator.toFileURL(entry);
+    }
+
 }

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/utils/io/FileCopyUtils.java

@@ -123,6 +123,10 @@ public class FileCopyUtils {
         if (!resFolder.exists()) {
             return;
         }
+        if (resFolder.getAbsolutePath().equals(destFolder.getAbsolutePath())) {// If the source path and target path are
+                                                                               // same, don't copy
+            return;
+        }
         destFolder.mkdirs();
         String[] file = resFolder.list();
         File temp = null;

main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/xml/XSDValidator.java

@@ -15,6 +15,7 @@ package org.talend.commons.runtime.xml;
 import java.io.File;
 import java.io.IOException;
 
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -38,11 +39,17 @@ public class XSDValidator {
 
     private static final String SCHEMA_VALIDATOR = "http://java.sun.com/xml/jaxp/properties/schemaSource"; //$NON-NLS-1$
 
+    private static final String PROTOCOL_PLATFORM = "platform"; //$NON-NLS-1$
+
+    private static final String PROTOCOL_FILE = "file"; //$NON-NLS-1$
+
     public static Document checkXSD(File fileToCheck, File fileXSD) throws IOException, ParserConfigurationException,
             SAXException {
         final DocumentBuilderFactory fabrique = XmlUtils.getSecureDocumentBuilderFactory(false);
         fabrique.setAttribute(SCHEMA_LANGUAGE, "http://www.w3.org/2001/XMLSchema"); //$NON-NLS-1$
         fabrique.setAttribute(SCHEMA_VALIDATOR, fileXSD);
+        fabrique.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, PROTOCOL_PLATFORM);
+        fabrique.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, PROTOCOL_FILE);
         fabrique.setValidating(true);
 
         Document document = null;

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/PasswordEncryptUtil.java

@@ -21,6 +21,7 @@ import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.DESKeySpec;
 
 import org.apache.commons.codec.binary.Base64;
+import org.talend.utils.security.AESEncryption;
 
 /**
  * DOC chuang class global comment. Detailled comment
@@ -85,20 +86,6 @@ public class PasswordEncryptUtil {
         return new String(clearByte);
     }
 
-    private static SecretKey passwordKey = null;
-
-    private static String CHARSET = "UTF-8";
-
-    private static SecretKey getSecretKeyUTF8() throws Exception {
-        if (passwordKey == null) {
-            byte rawKeyData[] = rawKey.getBytes(CHARSET);
-            DESKeySpec dks = new DESKeySpec(rawKeyData);
-            SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("DES"); //$NON-NLS-1$
-            passwordKey = keyFactory.generateSecret(dks);
-        }
-        return passwordKey;
-    }
-
     /**
      * Work for codegen only. and must be same as the routine
      * "routines.system.PasswordEncryptUtil.encryptPassword(input)".
@@ -108,12 +95,7 @@ public class PasswordEncryptUtil {
         if (input == null) {
             return input;
         }
-        SecretKey key = getSecretKeyUTF8();
-        Cipher c = Cipher.getInstance("DES"); //$NON-NLS-1$
-        c.init(Cipher.ENCRYPT_MODE, key, secureRandom);
-        byte[] cipherByte = c.doFinal(input.getBytes(CHARSET));
-        String dec = Hex.encodeHexString(cipherByte);
-        return dec;
+        return AESEncryption.encryptPassword(input);
     }
 
     /**
@@ -159,5 +141,4 @@ public class PasswordEncryptUtil {
             return value.replaceAll(".", "*"); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
-
 }

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/VersionUtils.java

@@ -15,10 +15,13 @@ package org.talend.commons.utils;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Properties;
+import java.util.regex.Pattern;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
@@ -26,6 +29,8 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.URIUtil;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
+import org.talend.commons.CommonsPlugin;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.i18n.internal.Messages;
 
 /**
@@ -213,6 +218,40 @@ public class VersionUtils {
         return version;
     }
 
+    public static String getMojoVersion(String mojoKey) {
+        String version = null;
+        String talendVersion = getTalendVersion();
+        Properties properties = new Properties();
+        File file = new Path(Platform.getConfigurationLocation().getURL().getPath()).append("mojo_version.properties").toFile(); //$NON-NLS-1$
+        if (file.exists()) {
+            try (InputStream inStream = new FileInputStream(file)) {
+                properties.load(inStream);
+                version = properties.getProperty(mojoKey);
+            } catch (IOException e) {
+                ExceptionHandler.process(e);
+            }
+            if (version != null && !version.startsWith(talendVersion)) {
+                ExceptionHandler
+                        .process(new Exception(
+                                "Incompatible Mojo version:" + mojoKey + "[" + version + "], use default version.")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                version = null;
+            }
+        }
+        // default version
+        if (StringUtils.isBlank(version)) {
+            version = talendVersion;
+            if (CommonsPlugin.isJUnitTest()) {
+                productVersion = null;
+            }
+            String productVersion = getInternalVersion();
+            String revision = StringUtils.substringAfterLast(productVersion, "-"); //$NON-NLS-1$
+            if (("SNAPSHOT").equals(revision) || Pattern.matches("M\\d{1}", revision)) { //$NON-NLS-1$ //$NON-NLS-2$
+                version += "-" + revision; //$NON-NLS-1$
+            }
+        }
+        return version;
+    }
+
     public static void clearCache() {
         synchronized (VersionUtils.class) {
             productVersion = null;

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

@@ -120,33 +120,41 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
     public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types)
             throws SQLException {
         String[] neededTypes = getNeededTypes(types);
-        ResultSet rs = connection.getMetaData().getTables(catalog, schemaPattern, tableNamePattern, neededTypes);
         List<String[]> list = new ArrayList<String[]>();
-        while (rs.next()) {
-            String name = rs.getString("TABLE_NAME"); //$NON-NLS-1$
-            String schema = rs.getString("TABLE_SCHEM"); //$NON-NLS-1$
-            String type = rs.getString("TABLE_TYPE"); //$NON-NLS-1$
+        // has other types which is not Calculation View
+        if (neededTypes.length > 1 || !ArrayUtils.contains(neededTypes, NEEDED_TYPES[3])) {
+            ResultSet rs = connection.getMetaData().getTables(catalog, schemaPattern, tableNamePattern, neededTypes);
+            while (rs.next()) {
+                String name = rs.getString("TABLE_NAME"); //$NON-NLS-1$
+                String schema = rs.getString("TABLE_SCHEM"); //$NON-NLS-1$
+                String type = rs.getString("TABLE_TYPE"); //$NON-NLS-1$
 
-            String id = ""; //$NON-NLS-1$
-            String remarks = ""; //$NON-NLS-1$
-            try {
-                remarks = rs.getString("REMARKS"); //$NON-NLS-1$
-            } catch (Exception e) {
-                // nothing
-            }
+                String id = ""; //$NON-NLS-1$
+                String remarks = ""; //$NON-NLS-1$
+                try {
+                    remarks = rs.getString("REMARKS"); //$NON-NLS-1$
+                } catch (Exception e) {
+                    // nothing
+                }
 
-            if (ArrayUtils.contains(neededTypes, type)) {
-                // check if the type is contained is in the types needed.
-                // since sybase can return some system views as "SYSTEM VIEW" instead of "VIEW/TABLE" from the request.
-                String[] r = new String[] { id, schema, name, type, remarks, null };
-                list.add(r);
+                if (ArrayUtils.contains(neededTypes, type)) {
+                    // check if the type is contained is in the types needed.
+                    // since sybase can return some system views as "SYSTEM VIEW" instead of "VIEW/TABLE" from the
+                    // request.
+                    String[] r = new String[] { id, schema, name, type, remarks, null };
+                    list.add(r);
+                }
             }
         }
 
         // For Calculation View
         if (ArrayUtils.contains(neededTypes, NEEDED_TYPES[3])) {
             // check if the type is contained is in the types needed.
-            String sqlcv = "SELECT CATALOG_NAME,SCHEMA_NAME,CUBE_NAME, COLUMN_OBJECT,CUBE_TYPE,DESCRIPTION from _SYS_BI.BIMC_CUBES"; //$NON-NLS-1$
+            String sqlcv = "SELECT OBJECT_NAME,PACKAGE_ID FROM _SYS_REPO.ACTIVE_OBJECT WHERE OBJECT_SUFFIX = 'calculationview'"; //$NON-NLS-1$
+            if (tableNamePattern != null && !tableNamePattern.equals("%")) { //$NON-NLS-1$
+                sqlcv += " AND (OBJECT_NAME LIKE '" + tableNamePattern + "'"; //$NON-NLS-1$ //$NON-NLS-2$
+                sqlcv += " OR PACKAGE_ID LIKE '" + tableNamePattern + "')"; //$NON-NLS-1$ //$NON-NLS-2$
+            }
             ResultSet rscv = null;
             Statement stmtcv = null;
             List<String[]> listcv = new ArrayList<String[]>();
@@ -154,25 +162,16 @@ public class SAPHanaDataBaseMetadata extends FakeDatabaseMetaData {
                 stmtcv = connection.createStatement();
                 rscv = stmtcv.executeQuery(sqlcv);
                 while (rscv.next()) {
-                    String catalogName = rscv.getString("CATALOG_NAME"); //$NON-NLS-1$
-                    if (catalogName != null) {
-                        catalogName = catalogName.trim();
+                    String objectName = rscv.getString("OBJECT_NAME"); //$NON-NLS-1$
+                    if (objectName != null) {
+                        objectName = objectName.trim();
                     }
-                    String schemaName = rscv.getString("SCHEMA_NAME"); //$NON-NLS-1$
-                    if (schemaName != null) {
-                        schemaName = schemaName.trim();
+                    String packageId = rscv.getString("PACKAGE_ID"); //$NON-NLS-1$
+                    if (packageId != null) {
+                        packageId = packageId.trim();
                     }
-                    String cubeName = rscv.getString("CUBE_NAME"); //$NON-NLS-1$
-                    if (cubeName != null) {
-                        cubeName = cubeName.trim();
-                    }
-                    String id = ""; //$NON-NLS-1$
-                    // String type = rscv.getString("CUBE_TYPE"); //$NON-NLS-1$
-
-                    String remarks = rscv.getString("DESCRIPTION"); //$NON-NLS-1$
-                    String name = catalogName + "/" + cubeName;//$NON-NLS-1$
-
-                    String[] r = new String[] { id, schemaName, name, NEEDED_TYPES[3], remarks, catalogName };
+                    String name = packageId + "/" + objectName; //$NON-NLS-1$
+                    String[] r = new String[] { "", "_SYS_BIC", name, NEEDED_TYPES[3], "", packageId }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                     listcv.add(r);
                 }
             } catch (SQLException e) {

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/network/NetworkUtil.java

@@ -42,13 +42,15 @@ public class NetworkUtil {
 
     private static final String TALEND_DISABLE_INTERNET = "talend.disable.internet";//$NON-NLS-1$
 
+    private static final String HTTP_NETWORK_URL = "https://talend-update.talend.com";
+
     public static boolean isNetworkValid() {
         String disableInternet = System.getProperty(TALEND_DISABLE_INTERNET);
         if ("true".equals(disableInternet)) { //$NON-NLS-1$
             return false;
         }
         try {
-            URL url = new URL("https://www.talend.com"); //$NON-NLS-1$
+            URL url = new URL(HTTP_NETWORK_URL);
             HttpURLConnection conn = (HttpURLConnection) url.openConnection();
             conn.setConnectTimeout(4000);
             conn.setReadTimeout(4000);

main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/system/EclipseCommandLine.java

@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
  */
 public class EclipseCommandLine {
 
-    static final String PROP_VM = "eclipse.vm"; //$NON-NLS-1$
+    public static final String PROP_VM = "eclipse.vm"; //$NON-NLS-1$
 
     static final String PROP_VMARGS = "eclipse.vmargs"; //$NON-NLS-1$
 

main/plugins/org.talend.commons.ui/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.commons.ui</artifactId>

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

@@ -56,6 +56,10 @@ public class DisplayUtils {
      * @since 1.2
      */
     public static Shell getDefaultShell() {
+        return getDefaultShell(false);
+    }
+
+    public static Shell getDefaultShell(boolean createIfNotExist) {
         Shell shell = null;
 
         try {
@@ -67,7 +71,11 @@ public class DisplayUtils {
         try {
             if (shell == null) {
                 if (!PlatformUI.isWorkbenchRunning()) {
-                    return new Shell();
+                    if (createIfNotExist) {
+                        return new Shell();
+                    } else {
+                        return null;
+                    }
                 }
                 IWorkbenchWindow activeWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
                 if (activeWindow != null) {
@@ -81,7 +89,11 @@ public class DisplayUtils {
 
         if (shell == null) {
             if (!PlatformUI.isWorkbenchRunning()) {
-                return new Shell();
+                if (createIfNotExist) {
+                    return new Shell();
+                } else {
+                    return null;
+                }
             }
             IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
             for (int i = 0; shell == null && i < windows.length; i++) {

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/html/DynamicURLParser.java

@@ -18,8 +18,8 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import org.apache.commons.lang.StringUtils;
 import org.eclipse.ui.internal.intro.impl.util.Log;
-import org.eclipse.ui.internal.intro.impl.util.StringUtil;
 
 /**
  * DOC talend class global comment. Detailled comment
@@ -165,12 +165,12 @@ public class DynamicURLParser {
         if (query.indexOf("&") != -1) {
             query = query.replaceAll("&", "&");
         }
-        params = StringUtil.split(query, "&"); //$NON-NLS-1$
+        params = StringUtils.split(query, "&"); //$NON-NLS-1$
         for (String param : params) {
             // for every parameter, ie: key=value pair, create a property
             // entry. we know we have the key as the first string in the array,
             // and the value as the second array.
-            String[] keyValuePair = StringUtil.split(param, "="); //$NON-NLS-1$
+            String[] keyValuePair = StringUtils.split(param, "="); //$NON-NLS-1$
             if (keyValuePair.length != 2) {
                 Log.warning("Ignoring the following Intro URL parameter: " //$NON-NLS-1$
                         + param);

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/SSLDialog.java

@@ -28,6 +28,7 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.i18n.Messages;
 
 public class SSLDialog extends Dialog {
@@ -144,15 +145,18 @@ public class SSLDialog extends Dialog {
     @Override
     protected void okPressed() {
         if (keyStoreText.getText().equals("")) {
-            MessageDialog.openError(new Shell(), getShell().getText(), Messages.getString("SSLConfirmDialog.KeyStore")); //$NON-NLS-1$
+            MessageDialog.openError(DisplayUtils.getDefaultShell(false), getShell().getText(),
+                    Messages.getString("SSLConfirmDialog.KeyStore")); //$NON-NLS-1$
             return;
         }
         if (passwordText.getText().equals("")) {
-            MessageDialog.openError(new Shell(), getShell().getText(), Messages.getString("SSLConfirmDialog.TrustStore")); //$NON-NLS-1$
+            MessageDialog.openError(DisplayUtils.getDefaultShell(false), getShell().getText(),
+                    Messages.getString("SSLConfirmDialog.TrustStore")); //$NON-NLS-1$
             return;
         }
         if (trustStoreText.getText().equals("")) {
-            MessageDialog.openError(new Shell(), getShell().getText(), Messages.getString("SSLConfirmDialog.Password")); //$NON-NLS-1$
+            MessageDialog.openError(DisplayUtils.getDefaultShell(false), getShell().getText(),
+                    Messages.getString("SSLConfirmDialog.Password")); //$NON-NLS-1$
             return;
         }
         keyStorePath = keyStoreText.getText();
@@ -191,7 +195,7 @@ public class SSLDialog extends Dialog {
         dialog.setFilterPath("");
         dialog.setText("select keyStore");
         dialog.setFileName("");
-        dialog.setFilterExtensions(new String[] { "*.jks" });// 设置文件扩展名
+        dialog.setFilterExtensions(new String[] { "*.jks" });// set file extension
         String fileName = dialog.open();//
 
         if (fileName != null) {
@@ -205,7 +209,7 @@ public class SSLDialog extends Dialog {
         dialog.setFilterPath("");
         dialog.setText("select trustStore");
         dialog.setFileName("");
-        dialog.setFilterExtensions(new String[] { "*.jks" });// 设置文件扩展名
+        dialog.setFilterExtensions(new String[] { "*.jks" });// set file extension
         String fileName = dialog.open();//
         if (fileName != null) {
             trustStoreText.setText(fileName);

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

@@ -30,6 +30,7 @@ import org.talend.commons.ui.runtime.ws.WindowSystem;
 import org.talend.commons.utils.performance.IPerformanceEvaluatorListener;
 import org.talend.commons.utils.performance.PerformanceEvaluator;
 import org.talend.commons.utils.performance.PerformanceEvaluatorEvent;
+import org.talend.commons.utils.system.EnvironmentUtils;
 import org.talend.commons.utils.threading.ExecutionLimiterImproved;
 
 /**
@@ -332,11 +333,13 @@ public class BackgroundRefresher implements IBackgroundRefresher {
         Point returnedPoint = new Point(point.x, point.y);
         while (child != drawableComposite.getBgDrawableComposite()) {
             Rectangle bounds = child.getBounds();
-            if (WindowSystem.isGTK() && child instanceof Table) {
+            if ((WindowSystem.isGTK() || EnvironmentUtils.isMacOsSytem()) && child instanceof Table) {
                 returnedPoint.y += ((Table) child).getHeaderHeight();
+                returnedPoint.y += ((Table) child).getItemHeight();
             }
-            if (WindowSystem.isGTK() && child instanceof Tree) {
+            if ((WindowSystem.isGTK() || EnvironmentUtils.isMacOsSytem()) && child instanceof Tree) {
                 returnedPoint.y += ((Tree) child).getHeaderHeight();
+                returnedPoint.y += ((Table) child).getItemHeight();
             }
             child = child.getParent();
             ScrollBar vScrollBar = child.getVerticalBar();

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/utils/workbench/gef/SimpleHtmlFigure.java

@@ -30,7 +30,7 @@ import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 
 /**
  * Figure managing some simple HTML styles. <br/>
@@ -267,7 +267,7 @@ public class SimpleHtmlFigure extends Figure {
         } while (font == null && f != null);
 
         if (font == null) {
-            GC gc = new GC(new Shell());
+            GC gc = new GC(DisplayUtils.getDefaultShell(true));
             font = gc.getFont();
             gc.dispose();
         }

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

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Automatic-Module-Name: org.talend.core.repository
 Bundle-ManifestVersion: 2
 Bundle-Name: Core Repository Plug-in
 Bundle-SymbolicName: org.talend.core.repository;singleton:=true

main/plugins/org.talend.core.repository/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.repository</artifactId>

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

@@ -182,7 +182,6 @@ ProjectRepositoryNode.sapContentExtractor=SAP BI Content Extractor
 
 RepositoryDropAdapter_copyingItems=Copying items...
 RepositoryDropAdapter_errorMsg=This directory contains the locked item,it can not be moved now
-RepositoryDropAdapter_folder=Folder
 RepositoryDropAdapter_lockedByOthers=This item is locked by other users, it can not be moved now.
 RepositoryDropAdapter_lockedByYou=This item is locked by you, it can not be moved now.
 RepositoryDropAdapter_moveTitle=Move

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

@@ -6,7 +6,7 @@ import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Shell;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.login.AbstractLoginTask;
 import org.talend.repository.model.IRepositoryService;
@@ -21,7 +21,7 @@ public class ReadOnlyProjectConfirm extends AbstractLoginTask implements IRunnab
         SubMonitor subMonitor = SubMonitor.convert(monitor, 1);
         subMonitor.setTaskName("ReadOnly confirm.");
         IRepositoryService service = (IRepositoryService) GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
-        service.openReadOnlyDialog(new Shell());
+        service.openReadOnlyDialog(DisplayUtils.getDefaultShell(false));
 
         subMonitor.done();
     }

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

@@ -154,7 +154,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC nrousseau ProjectRepositoryNode constructor comment.
-     * 
+     *
      * @param object
      * @param parent
      * @param type
@@ -277,7 +277,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
     private void deleteHiddenNodes(List<IRepositoryNode> nodes) {
 
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IBrandingService.class)) {
-            IBrandingService service = (IBrandingService) GlobalServiceRegister.getDefault().getService(IBrandingService.class);
+            IBrandingService service = GlobalServiceRegister.getDefault().getService(IBrandingService.class);
             List<IRepositoryNode> hiddens = service.getBrandingConfiguration().getHiddenRepositoryCategory(this, "DI");
             for (IRepositoryNode node : hiddens) {
                 Iterator<IRepositoryNode> it = nodes.iterator();
@@ -384,7 +384,7 @@ 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);
+            wizardService = GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
         }
         if (wizardService != null) {
             List<RepositoryNode> nodes = wizardService.createNodesFromComponentService(curParentNode);
@@ -453,7 +453,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC nrousseau Comment method "initializeChildren".
-     * 
+     *
      * @param parent
      */
     public void initializeChildren(Object parent) {
@@ -547,8 +547,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             RuntimeExceptionHandler.process(e);
         }
     }
-    
-    private void addExtraChildren(ERepositoryObjectType contentType, org.talend.core.model.general.Project newProject, 
+
+    private void addExtraChildren(ERepositoryObjectType contentType, org.talend.core.model.general.Project newProject,
             RepositoryNode repositoryNode) throws PersistenceException{
         if(contentType != ERepositoryObjectType.METADATA_CONNECTIONS){
             return;
@@ -556,7 +556,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         List<ERepositoryObjectType> extraTypes = new ArrayList<ERepositoryObjectType>();
         IGenericDBService dbService = null;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericDBService.class)) {
-            dbService = (IGenericDBService) GlobalServiceRegister.getDefault().getService(
+            dbService = GlobalServiceRegister.getDefault().getService(
                     IGenericDBService.class);
         }
         if(dbService != null){
@@ -645,7 +645,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC nrousseau Comment method "addDeletedElements".
-     * 
+     *
      * @param project2
      * @param nodes
      */
@@ -654,7 +654,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         List<IRepositoryViewObject> elements = new ArrayList<IRepositoryViewObject>();
         ITestContainerProviderService testContainerService = null;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
-            testContainerService = (ITestContainerProviderService) GlobalServiceRegister.getDefault()
+            testContainerService = GlobalServiceRegister.getDefault()
                     .getService(ITestContainerProviderService.class);
         }
         for (IRepositoryViewObject currentObject : objects) {
@@ -687,7 +687,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC nrousseau Comment method "addDeletedElements".
-     * 
+     *
      * @param project2
      * @param nodes
      */
@@ -695,7 +695,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         List<IRepositoryNode> rootNodes = rootNode.getChildren();
         ITestContainerProviderService testContainerService = null;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
-            testContainerService = (ITestContainerProviderService) GlobalServiceRegister.getDefault()
+            testContainerService = GlobalServiceRegister.getDefault()
                     .getService(ITestContainerProviderService.class);
         }
         for (IRepositoryViewObject currentObject : elements) {
@@ -726,7 +726,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC hwang Comment method "getTestCaseParent".
-     * 
+     *
      * @param repositoryObjectType
      * @param path
      * @return
@@ -750,7 +750,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC nrousseau Comment method "getFolder".
-     * 
+     *
      * @param repositoryObjectType
      * @param path
      * @return
@@ -804,7 +804,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC nrousseau Comment method "buildFolders".
-     * 
+     *
      * @param currentType
      * @param path
      * @param nodes
@@ -912,7 +912,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC nrousseau Comment method "addDeletedSubItems".
-     * 
+     *
      * @param item
      * @param currentParentNode
      */
@@ -962,7 +962,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             Set<MetadataTable> tables = null;
             IGenericWizardService wizardService = null;
             if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
-                wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault()
+                wizardService = GlobalServiceRegister.getDefault()
                         .getService(IGenericWizardService.class);
             }
             if (wizardService != null && wizardService.isGenericItem(item)) {
@@ -997,9 +997,9 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
     }
 
     /**
-     * 
+     *
      * ggu Comment method "isGeneratedJobItem".
-     * 
+     *
      * feature 4393
      */
     private boolean isGeneratedJobItem(Item item) {
@@ -1062,7 +1062,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             }
         }
     }
-    
+
     private void convert(org.talend.core.model.general.Project newProject, Container fromModel, RepositoryNode parent,
             ERepositoryObjectType type) {
         convert(newProject, fromModel, parent, type, false);
@@ -1128,7 +1128,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                             break;
                         }
                     }
-                    IBrandingService breaningService = (IBrandingService) GlobalServiceRegister.getDefault()
+                    IBrandingService breaningService = GlobalServiceRegister.getDefault()
                             .getService(IBrandingService.class);
 
                     if (!existSystemFolder && !breaningService.isPoweredOnlyCamel()) {
@@ -1167,7 +1167,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                             folder = new RepositoryNode(oFolder, parent, ENodeType.SIMPLE_FOLDER);
                             if (factory.getStatus(oFolder) != ERepositoryStatus.DELETED) {
                                 parent.getChildren().add(folder);
-                            } 
+                            }
                         }
                     }
                 } else {
@@ -1176,9 +1176,9 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                         folder = new RepositoryNode(oFolder, parent, ENodeType.SIMPLE_FOLDER);
                         if (factory.getStatus(oFolder) != ERepositoryStatus.DELETED) {
                             parent.getChildren().add(folder);
-                        } 
+                        }
                     }
-                    
+
                 }
 
             }
@@ -1211,7 +1211,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             }
         }
     }
-    
+
     private RepositoryNode avoidReCreateFolder(RepositoryNode parent, Folder oFolder, boolean extra){
         RepositoryNode folder = null;
         if(extra){
@@ -1325,7 +1325,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             // node.setParent(recBinNode);
         } else {
             if (GlobalServiceRegister.getDefault().isServiceRegistered(IDesignerCoreService.class)) {
-                IDesignerCoreService designerCoreService = (IDesignerCoreService) GlobalServiceRegister.getDefault()
+                IDesignerCoreService designerCoreService = GlobalServiceRegister.getDefault()
                         .getService(IDesignerCoreService.class);
                 if (designerCoreService != null) {
                     for (IRepositoryNode repositoryNode : parent.getChildren()) {
@@ -1377,7 +1377,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC tguiu Comment method "createTables".
-     * 
+     *
      * @param node
      * @param repositoryObjectType TODO
      * @param iMetadataConnection
@@ -1417,7 +1417,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC cantoine Comment method "createTable".
-     * 
+     *
      * @param node
      * @param metadataTable
      * @param repositoryObjectType TODO
@@ -1635,7 +1635,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                 DatabaseConnectionItem connectionItem = (DatabaseConnectionItem) item;
                 DatabaseConnection connection = (DatabaseConnection) connectionItem.getConnection();
                 if (PluginChecker.isCDCPluginLoaded()) {
-                    ICDCProviderService service = (ICDCProviderService) GlobalServiceRegister.getDefault()
+                    ICDCProviderService service = GlobalServiceRegister.getDefault()
                             .getService(ICDCProviderService.class);
                     if (service != null && service.canCreateCDCConnection(connection)) {
                         RepositoryNode cdcNode = new StableRepositoryNode(node,
@@ -1886,7 +1886,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC YeXiaowei Comment method "createSAPFunctionNodes".
-     * 
+     *
      * @param metadataConnection
      * @param functionNode
      */
@@ -1926,7 +1926,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC zli Comment method "createSAPIDocNodes".
-     * 
+     *
      * @param recBin
      * @param rebObj
      * @param metadataConnection
@@ -1961,7 +1961,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC YeXiaowei Comment method "createSAPNode".
-     * 
+     *
      * @param rebObj
      * @param functionNode
      * @param unit
@@ -1987,7 +1987,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC tguiu Comment method "createMetatable".
-     * 
+     *
      * @param node
      * @param table
      * @param repositoryObjectType TODO
@@ -2016,7 +2016,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /**
      * DOC cantoine Comment method "createQueryNode".
-     * 
+     *
      * @param node
      * @param repObj
      * @param query
@@ -2032,7 +2032,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.talend.repository.model.IProjectRepositoryNode#getProject()
      */
     @Override
@@ -2101,7 +2101,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.talend.repository.model.nodes.IProjectRepositoryNode#getRecBinNode()
      */
     @Override
@@ -2124,8 +2124,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             String branch = ProjectManager.getInstance().getMainProjectBranch(project);
             if ("".equals(branch) || branch == null) { //$NON-NLS-1$
                 branch = null;
-            }
-            if (!branch.contains(SVNConstant.NAME_TRUNK) && !branch.contains(SVNConstant.NAME_BRANCHES)
+            } else if (!branch.contains(SVNConstant.NAME_TRUNK) && !branch.contains(SVNConstant.NAME_BRANCHES)
                     && !branch.contains(SVNConstant.NAME_TAGS)) {
                 branch = null;
             }
@@ -2295,9 +2294,9 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
     public IRepositoryNode removeCache(String key) {
         return nodeCache.removeCache(key);
     }
-    
+
     public void setOptions(int options) {
         this.options = options;
     }
-    
+
 }

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

@@ -67,10 +67,9 @@ import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.exception.SystemException;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
 import org.talend.commons.runtime.service.ITaCoKitService;
-import org.talend.commons.ui.runtime.CommonUIPlugin;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
 import org.talend.commons.utils.data.container.RootContainer;
-import org.talend.commons.utils.generation.JavaUtils;
 import org.talend.commons.utils.time.TimeMeasure;
 import org.talend.commons.utils.workbench.resources.ResourceUtils;
 import org.talend.core.AbstractDQModelService;
@@ -129,7 +128,6 @@ import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.repository.item.ItemProductKeys;
 import org.talend.core.runtime.services.IMavenUIService;
 import org.talend.core.runtime.util.ItemDateParser;
-import org.talend.core.runtime.util.JavaHomeUtil;
 import org.talend.core.service.ICoreUIService;
 import org.talend.cwm.helper.SubItemHelper;
 import org.talend.cwm.helper.TableHelper;
@@ -212,14 +210,14 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
     private ICoreService getCoreService() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
-            return (ICoreService) GlobalServiceRegister.getDefault().getService(ICoreService.class);
+            return GlobalServiceRegister.getDefault().getService(ICoreService.class);
         }
         return null;
     }
     
     private IRunProcessService getRunProcessService() {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
-            return (IRunProcessService) GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
+            return GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
         }
         return null;
     }
@@ -316,7 +314,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @throws LoginException
      */
     private void checkProjectCompatibility(Project project) throws LoginException {
-        IMigrationToolService migrationToolService = (IMigrationToolService) GlobalServiceRegister.getDefault().getService(
+        IMigrationToolService migrationToolService = GlobalServiceRegister.getDefault().getService(
                 IMigrationToolService.class);
         // update migration system.
         migrationToolService.updateMigrationSystem(project.getEmfProject(), false);
@@ -385,7 +383,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 ITDQRepositoryService tdqRepService = null;
 
                 if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
-                    tdqRepService = (ITDQRepositoryService) GlobalServiceRegister.getDefault().getService(
+                    tdqRepService = GlobalServiceRegister.getDefault().getService(
                             ITDQRepositoryService.class);
                 }
 
@@ -407,7 +405,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                         public void run() {
                             Shell currentShell = tmpDisplay.getActiveShell();
                             if (currentShell == null) {
-                                currentShell = new Shell();
+                                currentShell = DisplayUtils.getDefaultShell(false);
                             }
                             MessageBox box = new MessageBox(currentShell, SWT.ICON_WARNING | SWT.OK | SWT.CANCEL);
                             box.setText(Messages.getString("ProxyRepositoryFactory.JobNameErroe")); //$NON-NLS-1$
@@ -522,7 +520,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         checkFileName(projectInfor.getLabel(), RepositoryConstants.PROJECT_PATTERN);
         Project toReturn = this.repositoryFactoryFromProvider.createProject(authUser, authPassword, projectInfor);
         if (toReturn.isLocal()) {
-            IMigrationToolService service = (IMigrationToolService) GlobalServiceRegister.getDefault().getService(
+            IMigrationToolService service = GlobalServiceRegister.getDefault().getService(
                     IMigrationToolService.class);
             service.initNewProjectTasks(toReturn);
         }
@@ -852,7 +850,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
         if (repositoryObjectType == ERepositoryObjectType.PROCESS && isFullLogonFinished()) {
             if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
-                IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
+                IESBService service = GlobalServiceRegister.getDefault().getService(IESBService.class);
                 if (service != null) {
                     service.refreshOperationLabel(object.getProperty().getId());
                 }
@@ -919,7 +917,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
             if (repositoryObjectType == ERepositoryObjectType.PROCESS && isFullLogonFinished()) {
                 if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
-                    IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
+                    IESBService service = GlobalServiceRegister.getDefault().getService(IESBService.class);
                     if (service != null) {
                         service.refreshOperationLabel(object.getProperty().getId());
                     }
@@ -930,7 +928,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         }
 
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
-            IRunProcessService service = (IRunProcessService) GlobalServiceRegister.getDefault()
+            IRunProcessService service = GlobalServiceRegister.getDefault()
                     .getService(IRunProcessService.class);
             service.batchDeleteAllVersionTalendJobProject(idList);
         }
@@ -2033,6 +2031,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                         workspace.setDescription(description);
                     } catch (CoreException e) {
                         // do nothing
+                        ExceptionHandler.process(e);
                     }
                 }
                 isCancelled = false;
@@ -2073,7 +2072,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 checkProjectCompatibility(project);
 
                 if (GlobalServiceRegister.getDefault().isServiceRegistered(IMavenUIService.class)) {
-                    IMavenUIService mavenUIService = (IMavenUIService) GlobalServiceRegister.getDefault().getService(
+                    IMavenUIService mavenUIService = GlobalServiceRegister.getDefault().getService(
                             IMavenUIService.class);
                     if (mavenUIService != null) {
                         mavenUIService.updateMavenResolver(true);
@@ -2110,7 +2109,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.load.componnents"), 1); //$NON-NLS-1$
                 ICoreUIService coreUiService = null;
                 if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreUIService.class)) {
-                    coreUiService = (ICoreUIService) GlobalServiceRegister.getDefault().getService(ICoreUIService.class);
+                    coreUiService = GlobalServiceRegister.getDefault().getService(ICoreUIService.class);
                 }
                 if (coreUiService != null) {
                     coreUiService.componentsReset();
@@ -2143,20 +2142,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 if (coreService != null) {
                     // clean workspace
                     currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.cleanWorkspace"), 1); //$NON-NLS-1$
-
-                    String specifiedVersion = null;
-                    String currentVersion = JavaUtils.getProjectJavaVersion();
-                    String newVersion = null;
-                    if (CommonUIPlugin.isFullyHeadless()) {
-                        specifiedVersion = JavaHomeUtil.getSpecifiedJavaVersion();
-                    }
-                    if (specifiedVersion == null) {
-                        newVersion = currentVersion != null ? currentVersion : JavaUtils.DEFAULT_VERSION;
-                    } else {
-                        newVersion = specifiedVersion;
-                    }
-
-                    JavaUtils.updateProjectJavaVersion(newVersion);
                     
                     TimeMeasure.step("logOnProject", "clean Java project"); //$NON-NLS-1$ //$NON-NLS-2$     
 
@@ -2175,6 +2160,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                             coreService.syncAllBeans();
                         } catch (SystemException e1) {
                             //
+                            ExceptionHandler.process(e1);
                         }
                     }
                 }
@@ -2204,6 +2190,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     }
                 } catch (SystemException e) {
                     // ignore
+                    ExceptionHandler.process(e);
                 }
 
                 if (runProcessService != null && !isCommandLineLocalRefProject) {
@@ -2212,7 +2199,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     TimeMeasure.step("logOnProject", "install / setup root poms"); //$NON-NLS-1$ //$NON-NLS-2$
                 }
                 if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
-                    ITDQRepositoryService tdqRepositoryService = (ITDQRepositoryService) GlobalServiceRegister.getDefault()
+                    ITDQRepositoryService tdqRepositoryService = GlobalServiceRegister.getDefault()
                             .getService(ITDQRepositoryService.class);
                     if (tdqRepositoryService != null) {
                         tdqRepositoryService.initProxyRepository();

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ldap/AdvancedSocketFactory.java

@@ -22,16 +22,15 @@ import java.security.Security;
 import java.util.Hashtable;
 
 import javax.net.SocketFactory;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
 
 import org.apache.log4j.Logger;
 import org.talend.core.repository.i18n.Messages;
 
-import com.sun.net.ssl.KeyManagerFactory;
-import com.sun.net.ssl.SSLContext;
-import com.sun.net.ssl.TrustManager;
-import com.sun.net.ssl.internal.ssl.Provider;
-
 /**
  * This class is used for LDAP. <br/>
  * 
@@ -219,12 +218,12 @@ public class AdvancedSocketFactory extends SSLSocketFactory {
      */
     private void init(KeyStore ks, char password[]) {
         SSLContext ctx = null;
-        com.sun.net.ssl.KeyManager keyManagers[] = null;
+        KeyManager keyManagers[] = null;
         TrustManager trustManagers[] = null;
         try {
             if (ks != null) {
                 KeyManagerFactory kmf = null;
-                kmf = KeyManagerFactory.getInstance("SunX509"); //$NON-NLS-1$
+                kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); //$NON-NLS-1$
                 kmf.init(ks, password);
                 keyManagers = kmf.getKeyManagers();
             }
@@ -237,7 +236,4 @@ public class AdvancedSocketFactory extends SSLSocketFactory {
         }
     }
 
-    static {
-        Security.addProvider(new Provider());
-    }
 }

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ldap/LDAPCATruster.java

@@ -24,14 +24,16 @@ import java.net.URLConnection;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+
 import org.apache.log4j.Logger;
 import org.talend.core.repository.i18n.Messages;
 
-import com.sun.net.ssl.TrustManagerFactory;
-import com.sun.net.ssl.X509TrustManager;
-
 /**
  * This class is used for verifying CA for LDAP connection.
  * 
@@ -175,9 +177,9 @@ public class LDAPCATruster implements X509TrustManager {
      */
     private X509TrustManager initTrustManager(KeyStore ks) throws NoSuchAlgorithmException, KeyStoreException {
         TrustManagerFactory trustManagerFactory = null;
-        trustManagerFactory = TrustManagerFactory.getInstance("SunX509"); //$NON-NLS-1$
+        trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); //$NON-NLS-1$
         trustManagerFactory.init(ks);
-        com.sun.net.ssl.TrustManager trusts[] = trustManagerFactory.getTrustManagers();
+        TrustManager trusts[] = trustManagerFactory.getTrustManagers();
         return (X509TrustManager) trusts[0];
     }
 
@@ -192,34 +194,28 @@ public class LDAPCATruster implements X509TrustManager {
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.sun.net.ssl.X509TrustManager#isClientTrusted(java.security.cert.X509Certificate[])
-     */
-    public boolean isClientTrusted(X509Certificate chain[]) {
-        if (trustManager == null)
-            return false;
+    @Override
+	public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+    	if (trustManager == null)
+            throw new CertificateException("Trust manager is not initialized");
         else
-            return trustManager.isClientTrusted(chain);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.sun.net.ssl.X509TrustManager#isServerTrusted(java.security.cert.X509Certificate[])
-     */
-    public boolean isServerTrusted(X509Certificate chain[]) {
-        if (trustManager != null) {
-            boolean rs = trustManager.isServerTrusted(chain);
-            if (rs)
-                return rs;
-        }
+            trustManager.checkClientTrusted(chain, authType);
+	}
+    
+    @Override
+	public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+		if (trustManager != null) {
+			try {
+				trustManager.checkServerTrusted(chain, authType);
+				return;
+			} catch(Exception e) {
+			}
+		}
         X509Certificate ca = getCACert(chain);
         if (ca != null) {
-            if (isAccepted(ca)) {
-                log.error(Messages.getString("LDAPCATruster.sslError1")); //$NON-NLS-1$
-                return false;
+            if (!isAccepted(ca)) {
+                System.err.println("SSL Error:Server certificate chain verification failed.");
+                throw new CertificateException("Server certificate chain verification failed.");
             }
             String id = String.valueOf(System.currentTimeMillis());
             X509TrustManager tmpTrustManager = null;
@@ -227,25 +223,26 @@ public class LDAPCATruster implements X509TrustManager {
                 ks.setCertificateEntry(id, ca);
                 tmpTrustManager = initTrustManager(ks);
             } catch (Exception e) {
-                log.error(Messages.getString("LDAPCATruster.failedCreateTmp") + e.getMessage()); //$NON-NLS-1$
-                return false;
+                System.err.println("ASF Truster: Failed to create tmp trust store : " + e.getMessage());
+                throw new CertificateException(e);
             }
-            if (tmpTrustManager.isServerTrusted(chain)) {
+            try{
+            	tmpTrustManager.checkServerTrusted(chain, authType);
                 if (this.isSaveCA) {
                     saveStore();
                     trustManager = tmpTrustManager;
                 }
-                return true;
-            } else {
-                log.error(Messages.getString("LDAPCATruster.sslError2")); //$NON-NLS-1$
-                return false;
+                return;
+            } catch(CertificateException e) {
+                System.err.println("SSL Error:Server certificate chain verification failed and \\nthe CA is missing.");
+                throw e;
             }
         } else {
-            log.error(Messages.getString("LDAPCATruster.sslError3") //$NON-NLS-1$
-                    + Messages.getString("LDAPCATruster.noCertificate")); //$NON-NLS-1$
-            return false;
+            System.err
+                    .println("SSL Error:CA certificate is not in the server certificate chain.\nPlease use the keytool command to import the server certificate.");
+            throw new CertificateException("CA certificate is not in the server certificate chain.\\nPlease use the keytool command to import the server certificate.");
         }
-    }
+	}
 
     /**
      * Comment method "saveStore".
@@ -279,4 +276,5 @@ public class LDAPCATruster implements X509TrustManager {
                 }
         }
     }
+
 }

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

@@ -48,6 +48,7 @@ import org.eclipse.ui.actions.ActionFactory;
 import org.talend.commons.exception.BusinessException;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
 import org.talend.commons.ui.runtime.image.EImage;
@@ -1241,7 +1242,8 @@ public class DeleteAction extends AContextualAction {
 
                 @Override
                 public void run() {
-                    MessageDialog dialog = new MessageDialog(new Shell(), title, null, lockMessage, MessageDialog.ERROR,
+                    MessageDialog dialog = new MessageDialog(DisplayUtils.getDefaultShell(false), title, null, lockMessage,
+                            MessageDialog.ERROR,
                             new String[] { IDialogConstants.OK_LABEL }, 0);
                     dialog.open();
                 }
@@ -1372,7 +1374,7 @@ public class DeleteAction extends AContextualAction {
                                     + " " + Messages.getString("DeleteAction.dialog.message0") + "\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                                     + Messages.getString("DeleteAction.dialog.message2"); //$NON-NLS-1$
 
-                            confirmFromDialog = MessageDialog.openQuestion(new Shell(), title, message);
+                            confirmFromDialog = MessageDialog.openQuestion(DisplayUtils.getDefaultShell(false), title, message);
                         }
                     });
                     confirm = confirmFromDialog;
@@ -1839,7 +1841,7 @@ public class DeleteAction extends AContextualAction {
             }
         }
         if (shell == null) {
-            shell = new Shell();
+            shell = DisplayUtils.getDefaultShell(false);
         }
         return shell;
     }

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

@@ -27,9 +27,9 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.runtime.image.EImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
@@ -157,8 +157,8 @@ public class DeleteTableAction extends AContextualAction {
 
                             @Override
                             public void run() {
-                                MessageDialog dialog = new MessageDialog(new Shell(), title, null, message, MessageDialog.ERROR,
-                                        new String[] { IDialogConstants.OK_LABEL }, 0);
+                                MessageDialog dialog = new MessageDialog(DisplayUtils.getDefaultShell(false), title, null,
+                                        message, MessageDialog.ERROR, new String[] { IDialogConstants.OK_LABEL }, 0);
                                 dialog.open();
                             }
                         });

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

@@ -40,6 +40,7 @@ import org.eclipse.ui.PlatformUI;
 import org.talend.commons.exception.BusinessException;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
 import org.talend.commons.ui.runtime.image.ECoreImage;
@@ -258,7 +259,7 @@ public class EmptyRecycleBinAction extends AContextualAction {
             }
         }
         if (shell == null) {
-            shell = new Shell();
+            shell = DisplayUtils.getDefaultShell(false);
         }
         return shell;
     }

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

@@ -18,11 +18,11 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.actions.ActionFactory;
 import org.talend.commons.exception.BusinessException;
 import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
 import org.talend.commons.ui.runtime.image.EImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
@@ -116,8 +116,9 @@ public class PasteAction extends AContextualAction {
                         if (copyObjectAction.validateAction((RepositoryNode) currentSource, target)) {
                             copyObjectAction.execute((RepositoryNode) currentSource, target);
                         } else {
-                            MessageDialog.openWarning(new Shell(), Messages.getString("PasteObjectAction.error.title"), Messages //$NON-NLS-1$
-                                    .getString("PasteObjectAction.error.labelAlreadyExists")); //$NON-NLS-1$
+                            MessageDialog.openWarning(DisplayUtils.getDefaultShell(false),
+                                    Messages.getString("PasteObjectAction.error.title"), Messages //$NON-NLS-1$
+                                            .getString("PasteObjectAction.error.labelAlreadyExists")); //$NON-NLS-1$
                         }
                     } catch (BusinessException e) {
                         MessageBoxExceptionHandler.process(e);

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/view/RepositoryDropAdapter.java

@@ -121,8 +121,7 @@ public class RepositoryDropAdapter extends PluginDropAdapter {
                     boolean isLock = MoveObjectAction.getInstance().isLock(sourceNode);
                     if (isLock) {
                         String errorMsg = null;
-                        if (sourceNode.getObjectType().getType()
-                                .equalsIgnoreCase(Messages.getString("RepositoryDropAdapter_folder"))) { //$NON-NLS-1$
+                        if (sourceNode.getObjectType().getType().equals(ERepositoryObjectType.FOLDER.getType())) {
                             errorMsg = Messages.getString("RepositoryDropAdapter_errorMsg"); //$NON-NLS-1$
                         }
                         if (ProxyRepositoryFactory.getInstance().getStatus(repositoryObject) == ERepositoryStatus.LOCK_BY_USER) {
@@ -653,7 +652,7 @@ public class RepositoryDropAdapter extends PluginDropAdapter {
                         IRepositoryViewObject objectToCopy = repositoryNode.getObject();
                         // TDI-14680 add a warning message when move a directory that it has locked jobs.
                         IRepositoryNode node = objectToCopy.getRepositoryNode();
-                        if (node.getObjectType().getType().equalsIgnoreCase(Messages.getString("RepositoryDropAdapter_folder"))) { //$NON-NLS-1$
+                        if (node.getObjectType().getType().equals(ERepositoryObjectType.FOLDER.getType())) {
                             errorMsg = Messages.getString("RepositoryDropAdapter_errorMsg"); //$NON-NLS-1$
                         }
                         if (ProxyRepositoryFactory.getInstance().getStatus(objectToCopy) == ERepositoryStatus.LOCK_BY_USER) {

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

@@ -21,8 +21,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.resources.IContainer;
@@ -274,20 +277,37 @@ public class ProjectDataJsonProvider {
 
     public static void loadMigrationTaskSetting(Project project, InputStream input) throws PersistenceException {
         try {
+        	project.eSetDeliver(false);
             MigrationTaskSetting migrationTaskSetting = null;
             if (input != null) {
                 migrationTaskSetting = new ObjectMapper().readValue(input, MigrationTaskSetting.class);
             }
             if (migrationTaskSetting != null) {
                 MigrationTask fakeTask = createFakeMigrationTask();
-                List<MigrationTask> allRealTask = new ArrayList<MigrationTask>();
+                MigrationTask existingFakeTask = null;
                 for (int i = 0; i < project.getMigrationTask().size(); i++) {
                     MigrationTask task = (MigrationTask) project.getMigrationTask().get(i);
-                    if (!StringUtils.equals(fakeTask.getId(), task.getId())) {
-                        allRealTask.add(task);
+                    if (StringUtils.equals(fakeTask.getId(), task.getId())) {
+                    	existingFakeTask = task;
+                    	break;
                     }
                 }
-                project.getMigrationTask().removeAll(allRealTask);
+                // remove all the migrations from the project
+                project.getMigrationTask().clear();
+                if (existingFakeTask != null) {
+                	// keep only the fake migration task of 7.1.1 with new migration index
+                	// re-use the same instance to make sure we keep the same emf id.
+                	project.getMigrationTask().add(existingFakeTask);
+                }
+                Set<String> tasksIds = new HashSet<>();
+                Iterator<MigrationTaskJson> it = migrationTaskSetting.getMigrationTaskList().iterator();
+                while (it.hasNext()) { // remove duplicates to fix issues found in TUP-22735
+                	MigrationTaskJson task = it.next();
+                	if (tasksIds.contains(task.getId())) {
+                		it.remove();
+                	}
+                	tasksIds.add(task.getId());
+                }
                 project.getMigrationTasks().clear();
                 if (migrationTaskSetting.getMigrationTaskList() != null) {
                     for (MigrationTaskJson json : migrationTaskSetting.getMigrationTaskList()) {
@@ -305,6 +325,7 @@ public class ProjectDataJsonProvider {
         } catch (Exception e) {
             throw new PersistenceException(e);
         } finally {
+            project.eSetDeliver(true);
             closeInputStream(input);
         }
     }

main/plugins/org.talend.core.runtime/mappings/mapping_AmazonAurora.xml

@@ -0,0 +1,280 @@
+<?xml version="1.0"?>
+<mapping>
+	<dbms product="AMAZON_AURORA" id="amazon_aurora_id" label="Mapping AMAZON_AURORA"
+		default="true">
+		<dbTypes>
+			<dbType type="BIGINT" ignorePre="true"/>
+			<dbType type="BIGINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="BINARY" ignorePre="true"/>
+			<dbType type="BIT" ignorePre="true" />
+			<dbType type="BLOB" ignoreLen="true" ignorePre="true" />
+			<dbType type="CHAR" defaultLength="200" ignorePre="true"/>
+			<dbType type="DATE" ignoreLen="true" ignorePre="true" />
+			<dbType type="DATETIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="DECIMAL" defaultLength="20" defaultPrecision="10" preBeforelen="false"/>
+			<dbType type="DOUBLE" defaultLength="20" defaultPrecision="10"/>
+			<dbType type="DOUBLE UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="ENUM" ignoreLen="true" ignorePre="true" />
+			<dbType type="FLOAT" defaultPrecision="2"/>
+			<dbType type="FLOAT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="GEOMETRY" ignoreLen="true" ignorePre="true" />
+			<dbType type="GEOMETRYCOLLECTION" ignoreLen="true" ignorePre="true" />
+			<dbType type="INT" ignorePre="true" />
+			<dbType type="INT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="LINESTRING" ignoreLen="true" ignorePre="true" />
+			<dbType type="LONGTEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="LONGBLOB" ignoreLen="true" ignorePre="true"/>
+			<dbType type="MEDIUMBLOB" ignoreLen="true" ignorePre="true" />
+			<dbType type="MEDIUMINT" ignorePre="true" />
+			<dbType type="MEDIUMINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="MEDIUMTEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="MULTILINESTRING" ignoreLen="true" ignorePre="true" />
+			<dbType type="MULTIPOINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="MULTIPOLYGON" ignoreLen="true" ignorePre="true" />
+			<dbType type="POINT" ignoreLen="true" ignorePre="true" />
+			<dbType type="POLYGON" ignoreLen="true" ignorePre="true" />
+			<dbType type="SMALLINT" ignorePre="true" />
+			<dbType type="SMALLINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="SET" ignoreLen="true" ignorePre="true" />
+			<dbType type="TEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIME" ignoreLen="true" ignorePre="true" />
+			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true" />
+			<dbType type="TINYBLOB" ignoreLen="true" ignorePre="true" />
+			<dbType type="TINYINT" ignorePre="true" />
+			<dbType type="TINYINT UNSIGNED" ignoreLen="true" ignorePre="true" />
+			<dbType type="TINYTEXT" ignoreLen="true" ignorePre="true" />
+			<dbType type="VARBINARY" ignorePre="true" />
+			<dbType type="VARCHAR" default="true" defaultLength="100" ignorePre="true"/>
+			<dbType type="YEAR" ignorePre="true"/>
+		</dbTypes>
+
+		<language name="java">
+			<talendToDbTypes><!-- Adviced mappings  -->
+				<talendType type="id_List"/>
+				<talendType type="id_Boolean">	
+					<dbType type="BIT" default="true" />				
+				</talendType>
+				<talendType type="id_Byte">
+					<dbType type="TINYINT" default="true" />
+					<dbType type="BIGINT" />
+					<dbType type="INT" />
+					<dbType type="MEDIUMINT" />
+					<dbType type="SMALLINT" />				
+				</talendType>
+				<talendType type="id_byte[]">
+				</talendType>
+				<talendType type="id_Character">
+					<dbType type="CHAR" default="true" />
+					<dbType type="VARCHAR"/>
+				</talendType>
+				<talendType type="id_Date">
+					<dbType type="DATE" />
+					<dbType type="DATETIME" default="true" />	
+					<dbType type="TIME" />
+					<dbType type="YEAR" />
+					<dbType type="TIMESTAMP" />				
+				</talendType>
+				<talendType type="id_BigDecimal">
+					<dbType type="DECIMAL" default="true" />
+					<dbType type="FLOAT"/>
+					<dbType type="DOUBLE" />				
+				</talendType>
+				<talendType type="id_Double">
+					<dbType type="DOUBLE" default="true" />
+					<dbType type="FLOAT"/>
+					<dbType type="DECIMAL" />				
+				</talendType>
+				<talendType type="id_Float">
+					<dbType type="FLOAT" default="true" />
+					<dbType type="DOUBLE"/>
+					<dbType type="DECIMAL" />
+				</talendType>
+				<talendType type="id_Integer">
+					<dbType type="INT" default="true" />
+					<dbType type="BIGINT" />
+				</talendType>
+				<talendType type="id_Long">
+					<dbType type="BIGINT" default="true" />		
+				</talendType>
+				<talendType type="id_Object">
+					<dbType type="BLOB" default="true"/>
+					<dbType type="ENUM" />
+					<dbType type="GEOMETRY" />
+					<dbType type="GEOMETRYCOLLECTION" />
+					<dbType type="MEDIUMINT" />
+					<dbType type="LONGBLOB" />
+					<dbType type="MEDIUMBLOB" />
+					<dbType type="MULTIPOINT" />
+					<dbType type="MULTIPOLYGON" />
+					<dbType type="POINT" />
+					<dbType type="POLYGON" />
+					<dbType type="SET" />
+					<dbType type="TINYBLOB" />
+				</talendType>
+				<talendType type="id_Short">
+					<dbType type="SMALLINT" default="true" />
+					<dbType type="INT" />
+					<dbType type="BIGINT"/>
+					<dbType type="MEDIUMINT" />
+				</talendType>
+				<talendType type="id_String">
+					<dbType type="VARCHAR" default="true" />
+					<dbType type="LINESTRING" />
+					<dbType type="LONGTEXT"/>
+					<dbType type="MEDIUMTEXT" />
+					<dbType type="MULTILINESTRING" />		
+					<dbType type="TEXT" />
+					<dbType type="TINYTEXT" />
+				</talendType>
+			</talendToDbTypes>
+			<dbToTalendTypes>
+				<dbType type="BIGINT">
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="BINARY">
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
+				<dbType type="BIT">
+					<talendType type="id_Boolean" default="true" />
+				</dbType>
+				<dbType type="BLOB">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="CHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="DATE">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="DATETIME">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="DECIMAL">
+					<talendType type="id_Float"/>
+					<talendType type="id_Double"/>
+					<talendType type="id_BigDecimal" default="true"/>
+				</dbType>
+				<dbType type="DOUBLE">
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="ENUM">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="FLOAT">
+					<talendType type="id_Float" default="true" />
+					<talendType type="id_Double"/>
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="GEOMETRY">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="GEOMETRYCOLLECTION">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="INT">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="LINESTRING">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="LONGTEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="LONGBLOB">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="MEDIUMBLOB">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="MEDIUMINT">
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long"/>
+				</dbType>
+				<dbType type="MEDIUMTEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="MULTILINESTRING">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="MULTIPOINT">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="MULTIPOLYGON">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="POINT">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="POLYGON">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="SMALLINT">
+					<talendType type="id_Short" default="true" />
+					<talendType type="id_Long"/>
+					<talendType type="id_Integer"/>
+				</dbType>
+				<dbType type="SET">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="TEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="TIME">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TIMESTAMP">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="TINYBLOB">
+					<talendType type="id_Object" default="true" />
+				</dbType>
+				<dbType type="TINYINT">
+					<talendType type="id_Byte" default="true" />
+					<talendType type="id_Integer"/>
+					<talendType type="id_Long"/>
+					<talendType type="id_Short"/>
+				</dbType>
+				<dbType type="TINYTEXT">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="VARBINARY">
+				</dbType>
+				<dbType type="VARCHAR">
+					<talendType type="id_String" default="true" />
+				</dbType>
+				<dbType type="YEAR">
+					<talendType type="id_Date" default="true" />
+				</dbType>		
+				<dbType type="BIGINT UNSIGNED" >
+				</dbType>
+				<dbType type="DOUBLE UNSIGNED" >		
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="FLOAT UNSIGNED" >
+					<talendType type="id_Double" default="true" />
+					<talendType type="id_BigDecimal"/>
+				</dbType>
+				<dbType type="INT UNSIGNED" >
+					<talendType type="id_Long" default="true" />
+				</dbType>
+				<dbType type="MEDIUMINT UNSIGNED" >
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long" />
+				</dbType>
+				<dbType type="SMALLINT UNSIGNED" >
+					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long" />
+				</dbType>
+				<dbType type="TINYINT UNSIGNED" >
+					<talendType type="id_Short" default="true" />
+					<talendType type="id_Integer" />
+					<talendType type="id_Long" />
+				</dbType>
+			</dbToTalendTypes>
+		</language>
+	</dbms>
+
+</mapping>

main/plugins/org.talend.core.runtime/mappings/mapping_Hive.xml

@@ -88,10 +88,8 @@
                     <talendType type="id_BigDecimal" default="true"/>
                 </dbType>
 				<dbType type="BIGINT">
-					<talendType type="id_BigDecimal" default="true"/>
-					<talendType type="id_Byte"/>
+					<talendType type="id_Long" default="true"/>
 					<talendType type="id_Integer"/>
-					<talendType type="id_Long"/>
 				</dbType>
 				<dbType type="INT">
 					<talendType type="id_Integer" default="true"/>

main/plugins/org.talend.core.runtime/mappings/mapping_Vertica.xml

@@ -13,6 +13,8 @@
 			<dbType type="DOUBLE PRECISION" ignoreLen="true" ignorePre="true"/>
 			<dbType type="DATE" ignoreLen="true" ignorePre="true"/>			
 			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true"/>
+			<dbType type="INTERVAL DAY TO SECOND" ignoreLen="true" ignorePre="true"/>
+			<dbType type="INTERVAL YEAR TO MONTH" ignoreLen="true" ignorePre="true"/>
 			<dbType type="BINARY" ignorePre="true"/>
 			<dbType type="VARBINARY" ignorePre="true" />
 			<dbType type="NUMERIC" defaultLength="10" defaultPrecision="5"/>
@@ -32,7 +34,8 @@
 					<dbType type="BOOLEAN" default="true"/>
 				</talendType>
 				<talendType type="id_Byte">
-					<dbType type="INTEGER" default="true" />					
+					<dbType type="BIGINT" default="true" />	
+					<dbType type="INTEGER"/>					
 				</talendType>
 				<talendType type="id_byte[]">
 					<dbType type="BINARY" default="true"/>
@@ -45,6 +48,8 @@
 				<talendType type="id_Date">
 					<dbType type="DATE" default="true" />
 					<dbType type="TIMESTAMP"/>
+					<dbType type="INTERVAL DAY TO SECOND"/>
+					<dbType type="INTERVAL YEAR TO MONTH"/>
 				</talendType>
 				<talendType type="id_Double">
 					<dbType type="DOUBLE PRECISION" default="true" />
@@ -55,7 +60,8 @@
 					<dbType type="FLOAT8"/>
 				</talendType>
 				<talendType type="id_Integer">
-					<dbType type="INTEGER" default="true" />
+					<dbType type="BIGINT" default="true" />	
+					<dbType type="INTEGER"/>
 					<dbType type="INT8" />
 				</talendType>
 				<talendType type="id_Long">
@@ -64,7 +70,8 @@
 				<talendType type="id_Object">
 				</talendType>
 				<talendType type="id_Short">
-					<dbType type="INTEGER" default="true" />
+					<dbType type="BIGINT" default="true" />	
+					<dbType type="INTEGER" />
 				</talendType>
 				<talendType type="id_String">
 					<dbType type="VARCHAR" default="true" />
@@ -88,12 +95,14 @@
 					<talendType type="id_String" default="true" />
 				</dbType>
 				<dbType type="INTEGER">
-					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long" default="true" />
+					<talendType type="id_Integer" />
 					<talendType type="id_Short" />
 					<talendType type="id_Byte" />
 				</dbType>
 				<dbType type="INT8">
-					<talendType type="id_Integer" default="true" />
+					<talendType type="id_Long" default="true" />
+					<talendType type="id_Integer" />
 					<talendType type="id_Short" />
 					<talendType type="id_Byte" />
 				</dbType>
@@ -116,6 +125,12 @@
 				<dbType type="TIMESTAMP">
 					<talendType type="id_Date" default="true" />
 				</dbType>
+				<dbType type="INTERVAL DAY TO SECOND">
+					<talendType type="id_Date" default="true" />
+				</dbType>
+				<dbType type="INTERVAL YEAR TO MONTH">
+					<talendType type="id_Date" default="true" />
+				</dbType>
 				<dbType type="BINARY">
 					<talendType type="id_byte[]" default="true" />
 				</dbType>

main/plugins/org.talend.core.runtime/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M3</version>
+    <version>7.2.1-M6</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.core.runtime</artifactId>

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

@@ -139,7 +139,7 @@ public class GlobalServiceRegister {
      * @param klass the Service type you want to get
      * @return IService IService
      */
-    public IService getService(Class klass) {
+    public <T extends IService> T getService(Class<T> klass) {
         IService service = services.get(klass);
         if (service == null && getConfigurationElements() != null) {
             service = findService(klass);
@@ -149,7 +149,7 @@ public class GlobalServiceRegister {
             }
             services.put(klass, service);
         }
-        return service;
+        return (T) service;
     }
 
     /**
@@ -158,7 +158,7 @@ public class GlobalServiceRegister {
      * @param klass the interface type want to find.
      * @return IService
      */
-    private IService findService(Class klass) {
+    private <T extends IService> T findService(Class<T> klass) {
         String key = klass.getName();
         IConfigurationElement[] configElements = getConfigurationElements();
         if (configElements != null) {
@@ -171,7 +171,7 @@ public class GlobalServiceRegister {
                     try {
                         Object service = element.createExecutableExtension("class"); //$NON-NLS-1$
                         if (klass.isInstance(service)) {
-                            return (IService) service;
+                            return (T) service;
                         }
                     } catch (CoreException e) {
                         ExceptionHandler.process(e);

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

@@ -16,7 +16,7 @@ import org.talend.core.model.metadata.IMetadataConnection;
 import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
 import org.talend.core.model.metadata.builder.connection.FileConnection;
 
-public interface IRepositoryContextService {
+public interface IRepositoryContextService extends IService {
 
     public DatabaseConnection cloneOriginalValueConnection(DatabaseConnection dbConn);
 

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

@@ -18,7 +18,6 @@ import java.net.URL;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.Bundle;
 
 /**
@@ -145,10 +144,6 @@ public class PluginChecker {
         return isJobLetPluginLoaded();
     }
 
-    public static Plugin getWSDLPlugin() {
-        return Platform.getPlugin(WSDL_PLUGIN_ID);
-    }
-
     public static boolean isRefProjectLoaded() {
         return isPluginLoaded(REF_PROJECT_PLUGIN_ID);
     }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/context/RepositoryContext.java

@@ -44,6 +44,8 @@ public class RepositoryContext {
 
     private Map<String, String> fields;
 
+    private boolean token = false;
+
     /**
      * DOC smallet RepositoryContext constructor comment.
      * 
@@ -246,4 +248,12 @@ public class RepositoryContext {
     public void setNoUpdateWhenLogon(boolean noUpdateWhenLogon) {
         this.noUpdateWhenLogon = noUpdateWhenLogon;
     }
+
+    public boolean isToken() {
+        return this.token;
+    }
+
+    public void setToken(boolean token) {
+        this.token = token;
+    }
 }