TESB-25418 Missing commons-parent dependency is added for TOS

fix(TESB-24789): Remove spring-boot plugin in TOS for microservice (#2342 )
fix(TUP-22182)Non-default Artifactory context path, not working (#2338 )
2019-04-11 01:05:49 +03:00 · 2019-04-10 17:57:44 +08:00 · 2019-04-10 11:20:47 +08:00 · 2019-04-10 11:18:58 +08:00 · 2019-04-09 18:23:49 +08:00 · 2019-04-09 17:50:16 +08:00
294 changed files with 6412 additions and 4395 deletions
--- a/i18n/features/org.talend.babel.all.tos.feature/feature.xml
+++ b/i18n/features/org.talend.babel.all.tos.feature/feature.xml
@@ -1,51 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.babel.all.tos.feature"
-      label="Babel feature with all languages for TOS"
-      version="7.2.1.qualifier">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.eclipse.babel.nls_eclipse_de"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.babel.nls_eclipse_es"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.babel.nls_eclipse_fr"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.babel.nls_eclipse_it"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.babel.nls_eclipse_ja"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.babel.nls_eclipse_pt_BR"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.babel.nls_eclipse_ru"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.babel.nls_eclipse_zh"
-         version="0.0.0"/>

+<feature id="org.talend.babel.all.tos.feature" label="Babel feature with all languages for TOS" version="7.2.1.qualifier"> 
+  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
+  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
+  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
+  <requires>
+    <import feature="org.eclipse.babel.nls_eclipse_de" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.babel.nls_eclipse_es" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.babel.nls_eclipse_fr" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.babel.nls_eclipse_it" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.babel.nls_eclipse_ja" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.babel.nls_eclipse_pt_BR" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.babel.nls_eclipse_ru" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.babel.nls_eclipse_zh" version="0.0.0" match="greaterOrEqual"/>
+  </requires> 
 </feature>
--- a/main/features/org.talend.commons.feature/feature.xml
+++ b/main/features/org.talend.commons.feature/feature.xml
@@ -1,140 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.commons.feature"
-      label="Commons Feature"
-      version="7.2.1.qualifier"
-      provider-name=".Talend SA.">
-
-   <description url="http://www.talend.com/online/featuresdescription.html#commons-feature">
-      Complete description about this feature at http://www.talend.com/online/featuresdescription.html#commons-feature
-   </description>
-
-   <copyright url="http://www.talend.com/online/copyright.txt">
-      Copyright Talend 2006, 2007
-   </copyright>
-
-   <license>
-      The licence are describe in branding feature
-   </license>
-
-   <url>
-      <discovery label="Talend web site" url="http://www.talend.com"/>
-   </url>
-
-   <includes
-         id="org.talend.model.migration.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.commons.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.commons.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.commons.ui.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.common.ui.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.common.ui.runtime.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.libraries.apache"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.dom4j-jaxen"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.jackson"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="bcprov"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.commons.runtime.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.xalan"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="jackson-core-asl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="jackson-mapper-asl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.xerces"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.fasterxml.jackson.core.jackson-databind"
-         download-size="0"
-         install-size="0"
-         version="2.9.5"
-         unpack="false"/>

+<feature id="org.talend.commons.feature" label="Commons Feature" version="7.2.1.qualifier" provider-name=".Talend SA."> 
+  <description url="http://www.talend.com/online/featuresdescription.html#commons-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#commons-feature</description>  
+  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
+  <license>The licence are describe in branding feature</license>  
+  <url> 
+    <discovery label="Talend web site" url="http://www.talend.com"/> 
+  </url>  
+  <requires>
+    <import feature="org.talend.model.migration.feature" version="0.0.0" 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"/>
+    <import plugin="org.apache.xerces" version="0.0.0" match="greaterOrEqual"/>
+  </requires>  
+  <plugin id="org.talend.common.ui.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.common.ui.runtime.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.commons.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.commons.runtime.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.commons.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.commons.ui.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.libraries.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>
--- a/main/features/org.talend.core.feature/feature.xml
+++ b/main/features/org.talend.core.feature/feature.xml
@@ -1,473 +1,76 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.core.feature"
-      label="Core Feature"
-      version="7.2.1.qualifier"
-      provider-name=".Talend SA.">
-
-   <description url="http://www.talend.com/online/featuresdescription.html#core-feature">
-      Complete description about this feature at http://www.talend.com/online/featuresdescription.html#core-feature
-   </description>
-
-   <copyright url="http://www.talend.com/online/copyright.txt">
-      Copyright Talend 2006, 2007
-   </copyright>
-
-   <license>
-      The licence are describe in branding feature
-   </license>
-
-   <url>
-      <discovery label="Talend web site" url="http://www.talend.com"/>
-   </url>
-
-   <includes
-         id="org.eclipse.draw2d"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.workspace"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.common"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.ecore"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.ecore.edit"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.transaction"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.validation"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.edit"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.gef"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.gmf.runtime.notation"
-         version="0.0.0"/>
-
-   <includes
-         id="org.talend.tos.libraries.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.talend.jdt.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.talend.platform.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.talend.utils.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.cwm.mip"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.model"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.cwm.mip.edit"
-         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.migrationTool"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.core.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.model.edit.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.resources"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.librariesmanager"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.librariesmanager.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.librariesmanager.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.resources.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.core.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.metadata.managment"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.metadata.managment.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.core.runtime.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.core.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.core.ui.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.core.repository"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.core.repository.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.commons.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.commons.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.common.ui.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.metadata.managment.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.metadata.managment.ui.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.commons.runtime.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.datatools.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         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.maven.resolver"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.librariesmanager.ui.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.collections"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.io"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.compare"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.compare.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.themes.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="net.jeeeyul.eclipse.themes"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="net.jeeeyul.swtend"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.ops4j.pax.url.mvn"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.httpcomponents.httpcore"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.httpcomponents.httpclient"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.aether.api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.aether.connector.basic"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.aether.impl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.aether.spi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.aether.transport.file"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.aether.transport.http"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.aether.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.maven.aether"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.mail"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.discovery"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.xml.soap"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.activation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>

+<feature id="org.talend.core.feature" label="Core Feature" version="7.2.1.qualifier" provider-name=".Talend SA."> 
+  <description url="http://www.talend.com/online/featuresdescription.html#core-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#core-feature</description>  
+  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
+  <license>The licence are describe in branding feature</license>  
+  <url> 
+    <discovery label="Talend web site" url="http://www.talend.com"/> 
+  </url>  
+  <requires>
+	<import plugin="javax.wsdl" version="1.6.2" match="greaterOrEqual"/>
+    <import feature="org.eclipse.draw2d" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.emf" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.emf.common" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.emf.ecore" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.emf.ecore.edit" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.emf.edit" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.emf.transaction" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.emf.validation" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.emf.workspace" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.gef" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.gmf.runtime.notation" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.jdt.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.platform.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.tos.libraries.feature" version="0.0.0" match="greaterOrEqual"/>
+    <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"/>
+    <import plugin="org.apache.commons.discovery" version="0.0.0" match="greaterOrEqual"/>
+    <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.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"/>
+  <plugin id="org.talend.core.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.core.repository" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.core.repository.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.core.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.core.runtime.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.core.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.core.ui.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.cwm.mip" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.cwm.mip.edit" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.datatools.xml" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.maven.aether" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.librariesmanager" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.librariesmanager.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.librariesmanager.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.librariesmanager.ui.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.maven.resolver" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.metadata.managment" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.metadata.managment.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.metadata.managment.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.metadata.managment.ui.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.migrationTool" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <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 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"/>
+  <plugin id="org.talend.resources.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
+  <plugin id="org.talend.themes.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>
--- a/main/features/org.talend.fragment.jars.common.feature/.project
+++ b/main/features/org.talend.fragment.jars.common.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.talend.fragment.jars.feature</name>
+	<name>org.talend.fragment.jars.common.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- a/main/features/org.talend.fragment.jars.common.feature/build.properties
+++ b/main/features/org.talend.fragment.jars.common.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
--- a/main/features/org.talend.fragment.jars.common.feature/feature.xml
+++ b/main/features/org.talend.fragment.jars.common.feature/feature.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.fragment.jars.common.feature"
+      label="Fragment Jars in Common"
+      version="7.2.1.qualifier">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <plugin
+         id="org.talend.developpement"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.jexcel.jars"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.talend.libraries.jfreechart.jars"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.talend.libraries.javacsv.jars"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.talend.libraries.jboss.jars"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.talend.libraries.apache.lucene6"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.talend.libraries.apache.lucene4"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
--- a/main/features/org.talend.fragment.jars.common.feature/pom.xml
+++ b/main/features/org.talend.fragment.jars.common.feature/pom.xml
@@ -7,6 +7,6 @@
    <version>7.2.1-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
-  <artifactId>org.talend.test.tos.feature</artifactId>
+  <artifactId>org.talend.fragment.jars.common.feature</artifactId>
  <packaging>eclipse-feature</packaging>
 </project>
--- a/main/features/org.talend.fragment.jars.feature/build.properties
+++ b/main/features/org.talend.fragment.jars.feature/build.properties
@@ -1,2 +0,0 @@
-bin.includes = feature.xml
-generateFeatureVersionSuffix="true"
--- a/main/features/org.talend.fragment.jars.feature/feature.xml
+++ b/main/features/org.talend.fragment.jars.feature/feature.xml
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.fragment.jars.feature"
-      version="7.2.1.qualifier"
-      provider-name=".Talend SA.">
-
-   <plugin
-         id="net.sourceforge.sqlexplorer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="net.sourceforge.sqlexplorer.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.talend.libraries.edifact"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.ftp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.javacsv.jars"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.talend.libraries.jfreechart.jars"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.talend.libraries.jboss.jars"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.talend.libraries.jexcel.jars"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.talend.libraries.microsoft"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.sqlbuilder.jars"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.talend.libraries.nattable.glazedlist"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.talend.libraries.uniserv"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.dataprofiler.top.chart"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.dataprofiler.top.chart.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.talend.libraries.apache.lucene4"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.apache.lucene6"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.dataquality.standardization.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.talend.developpement"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.designer.oas"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
--- a/main/features/org.talend.fragment.jars.feature/pom.xml
+++ b/main/features/org.talend.fragment.jars.feature/pom.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.fragment.jars.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
--- a/main/features/org.talend.help.feature/feature.xml
+++ b/main/features/org.talend.help.feature/feature.xml
@@ -1,44 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.help.feature"
-      label="Help Feature"
-      version="7.2.1.qualifier"
-      provider-name=".Talend SA.">
-
-   <description url="http://www.talend.com/online/featuresdescription.html#help-feature">
-      Complete description about this feature at http://www.talend.com/online/featuresdescription.html#help-feature
-   </description>
-
-   <copyright url="http://www.talend.com/online/copyright.txt">
-      Copyright Talend 2006, 2007
-   </copyright>
-
-   <license>
-      The licence are describe in branding feature
-   </license>
-
-   <url>
-      <update label="CORE Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/>
-      <discovery label="Talend web site" url="http://www.talend.com"/>
-   </url>
-
-   <includes
-         id="org.eclipse.help"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.help.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>

+<feature id="org.talend.help.feature" label="Help Feature" version="7.2.1.qualifier" provider-name=".Talend SA."> 
+  <description url="http://www.talend.com/online/featuresdescription.html#help-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#help-feature</description>  
+  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
+  <license>The licence are describe in branding feature</license>  
+  <url> 
+    <update label="CORE Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/>  
+    <discovery label="Talend web site" url="http://www.talend.com"/> 
+  </url>  
+  <requires>
+    <import feature="org.eclipse.help" version="0.0.0" match="greaterOrEqual"/>
+  </requires>
+  <plugin id="org.talend.help" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.help.nl" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
 </feature>
--- a/main/features/org.talend.jdt.feature/feature.xml
+++ b/main/features/org.talend.jdt.feature/feature.xml
@@ -1,209 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.jdt.feature"
-      label="Feature"
-      version="7.2.1.qualifier">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <plugin
-         id="org.eclipse.jdt"
-         download-size="42"
-         install-size="57"
-         version="3.10.0.v20140925-0400"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ant.ui"
-         download-size="1013"
-         install-size="2490"
-         version="3.5.500.v20140521-1557"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.apt.core"
-         download-size="356"
-         install-size="775"
-         version="3.3.600.v20140311-1758"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.apt.ui"
-         download-size="67"
-         install-size="150"
-         version="3.3.400.v20140311-1758"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.apt.pluggable.core"
-         download-size="32"
-         install-size="63"
-         version="1.0.400.v20131113-0353"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.compiler.apt"
-         download-size="157"
-         install-size="357"
-         version="1.1.0.v20140509-1235"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.compiler.tool"
-         download-size="57"
-         install-size="114"
-         version="1.0.300.v20140311-1758"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.core"
-         download-size="5435"
-         install-size="12495"
-         version="3.10.0.xx-201509250011-e44"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.annotation"
-         download-size="14"
-         install-size="21"
-         version="1.1.0.v20140129-1625"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.annotation"
-         download-size="17"
-         install-size="28"
-         version="2.0.0.v20140415-1436"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.core.manipulation"
-         download-size="85"
-         install-size="180"
-         version="1.5.0.v20130605-1748"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.debug.ui"
-         download-size="1355"
-         install-size="2923"
-         version="3.6.300.v20140512-1926"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.debug"
-         download-size="849"
-         install-size="960"
-         version="3.8.101.v20140902-1548"/>
-
-   <plugin
-         id="org.eclipse.jdt.junit"
-         download-size="416"
-         install-size="853"
-         version="3.7.300.v20140418-0836"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.junit.core"
-         download-size="145"
-         install-size="308"
-         version="3.7.300.v20140409-1618"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.junit.runtime"
-         download-size="51"
-         install-size="96"
-         version="3.4.500.v20140527-1138"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.junit4.runtime"
-         download-size="19"
-         install-size="35"
-         version="1.1.400.v20140314-0036"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.launching"
-         download-size="313"
-         install-size="696"
-         version="3.7.101.v20140825-1922"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.ui"
-         download-size="10216"
-         install-size="24250"
-         version="3.10.1.v20140817-1500"
-         unpack="false"/>
-
-   <plugin
-         id="org.junit"
-         download-size="223"
-         install-size="268"
-         version="4.11.0.v201303080030"/>
-
-   <plugin
-         id="org.hamcrest.core"
-         download-size="54"
-         install-size="113"
-         version="1.3.0.v201303031735"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.doc.user"
-         download-size="7506"
-         install-size="9604"
-         version="3.10.1.v20140827-1504"
-         unpack="false"/>
-
-   <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.ant.launching"
-         download-size="155"
-         install-size="266"
-         version="1.0.400.v20140518-0030"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.groovy.core"
-         download-size="0"
-         install-size="0"
-         version="2.9.2.xx-201509250011-e44"
-         unpack="false"/>
-
-   <plugin
-         id="org.codehaus.groovy"
-         download-size="0"
-         install-size="0"
-         version="2.4.300.xx-201509250011-e44"/>

+<feature id="org.talend.jdt.feature" label="Feature" version="7.2.1.qualifier"> 
+  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
+  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
+  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
+  <requires>
+    <!-- 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"/>
+    <import plugin="org.eclipse.jdt.annotation" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.apt.core" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.apt.pluggable.core" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.apt.ui" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.compiler.apt" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.compiler.tool" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.core" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.core.manipulation" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.debug" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.debug.ui" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.doc.user" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.groovy.core" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.junit" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.junit.core" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.junit.runtime" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.junit4.runtime" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.launching" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jdt.ui" version="0.0.0" match="greaterOrEqual"/>
+    <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="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>
--- a/main/features/org.talend.libraries.jdbc.feature/feature.xml
+++ b/main/features/org.talend.libraries.jdbc.feature/feature.xml
@@ -1,92 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.libraries.jdbc.feature"
-      label="Jdbc_feature Feature"
-      version="7.2.1.qualifier"
-      provider-name=".Talend SA.">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <plugin
-         id="org.talend.libraries.jdbc.mysql"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.jdbc.postgresql"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.jdbc.ingres"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.jdbc.sqlite3"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.jdbc.teradata"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.jdbc.hsql"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.jdbc.as400"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.jdbc.derby"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.jdbc.exasol"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.jdbc.h2"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.jdbc.paraccel"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.jdbc.access"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>

+<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="7.2.1.qualifier" provider-name=".Talend SA."> 
+  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
+  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
+  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
+  <plugin id="org.talend.libraries.jdbc.access" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.jdbc.as400" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.jdbc.derby" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.jdbc.exasol" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.jdbc.h2" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.jdbc.hsql" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.jdbc.ingres" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.jdbc.mysql" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.jdbc.paraccel" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.jdbc.postgresql" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.jdbc.sqlite3" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.jdbc.teradata" download-size="0" install-size="0" version="0.0.0"/>
 </feature>
--- a/main/features/org.talend.m2e.feature/feature.xml
+++ b/main/features/org.talend.m2e.feature/feature.xml
@@ -1,207 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.m2e.feature"
-      label="Feature"
-      version="7.2.1.qualifier">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.talend.jdt.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.common_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.common.fproj"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.m2e.archetype.common"
-         download-size="1844"
-         install-size="2076"
-         version="1.5.0.20140605-2032"/>
-
-   <plugin
-         id="org.eclipse.m2e.maven.indexer"
-         download-size="1103"
-         install-size="1306"
-         version="1.5.0.20140605-2032"/>
-
-   <plugin
-         id="org.eclipse.m2e.model.edit"
-         download-size="385"
-         install-size="1338"
-         version="1.5.0.20140606-0033"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.m2e.core"
-         download-size="554"
-         install-size="1318"
-         version="1.5.0.20140606-0033"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.m2e.launching"
-         download-size="111"
-         install-size="222"
-         version="1.5.0.20140606-0033"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.m2e.jdt"
-         download-size="112"
-         install-size="255"
-         version="1.5.0.20140606-0033"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.m2e.editor"
-         download-size="292"
-         install-size="583"
-         version="1.5.0.20140606-0033"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.m2e.editor.xml"
-         download-size="230"
-         install-size="500"
-         version="1.5.0.20140606-0033"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.m2e.maven.runtime"
-         download-size="5480"
-         install-size="6167"
-         version="1.5.0.20140605-2032"/>
-
-   <plugin
-         id="org.eclipse.m2e.maven.runtime.slf4j.simple"
-         download-size="18"
-         install-size="25"
-         version="1.5.0.20140605-2032"/>
-
-   <plugin
-         id="org.eclipse.m2e.refactoring"
-         download-size="74"
-         install-size="155"
-         version="1.5.0.20140606-0033"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.m2e.lifecyclemapping.defaults"
-         download-size="9"
-         install-size="17"
-         version="1.5.0.20140606-0033"/>
-
-   <plugin
-         id="org.eclipse.m2e.core.ui"
-         download-size="750"
-         install-size="1585"
-         version="1.5.0.20140606-0033"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.m2e.scm"
-         download-size="67"
-         install-size="139"
-         version="1.5.0.20140606-0033"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.m2e.jdt.ui"
-         download-size="28"
-         install-size="60"
-         version="1.5.0.20140606-0033"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.m2e.profiles.core"
-         download-size="22"
-         install-size="43"
-         version="1.5.0.20140606-0033"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.m2e.profiles.ui"
-         download-size="43"
-         install-size="93"
-         version="1.5.0.20140606-0033"
-         unpack="false"/>
-
-   <plugin
-         id="org.slf4j.api"
-         download-size="0"
-         install-size="0"
-         version="1.7.2.v20121108-1250"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.ecore"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.ecore.xmi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.ecore.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jem.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.google.guava"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.slf4j.impl.log4j12"
-         download-size="0"
-         install-size="0"
-         version="1.7.2.v20131105-2200"
-         fragment="true"
-         unpack="false"/>

+<feature id="org.talend.m2e.feature" label="Feature" version="7.2.1.qualifier"> 
+  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
+  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
+  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
+  <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"/>
+    <import feature="org.talend.jdt.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="com.google.guava" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.emf.ecore" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.emf.ecore.edit" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.emf.ecore.xmi" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.emf.edit" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jem.util" version="0.0.0" match="greaterOrEqual"/>
+    <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"/>
+    <import plugin="org.eclipse.m2e.jdt.ui" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.m2e.launching" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.m2e.lifecyclemapping.defaults" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.m2e.maven.indexer" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.m2e.maven.runtime" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.m2e.maven.runtime.slf4j.simple" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.m2e.model.edit" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.m2e.profiles.core" version="0.0.0" match="greaterOrEqual"/>
+    <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>
--- a/main/features/org.talend.model.migration.feature/feature.xml
+++ b/main/features/org.talend.model.migration.feature/feature.xml
@@ -1,78 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.model.migration.feature"
-      label="model Migration feature"
-      version="7.2.1.qualifier">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.eclipse.m2m.atl"
-         version="0.0.0"/>
-
-   <includes
-         id="org.talend.utils.feature"
-         version="0.0.0"/>
-
-   <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"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.cwm.mip"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.commons.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="bcprov"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.commons.runtime.nl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>

+<feature id="org.talend.model.migration.feature" label="model Migration feature" version="7.2.1.qualifier"> 
+  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
+  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
+  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
+  <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="org.bouncycastle.bcprov" version="0.0.0" match="greaterOrEqual"/>
+  </requires> 
 </feature>
--- a/main/features/org.talend.platform.feature/feature.xml
+++ b/main/features/org.talend.platform.feature/feature.xml
@@ -1,591 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.platform.feature"
-      label="Platform"
-      version="7.2.1.qualifier">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.eclipse.rcp"
-         version="4.4.0.v20140925-0400"/>
-
-   <includes
-         id="org.eclipse.equinox.p2.user.ui"
-         version="2.2.0.v20140911-0143"
-         optional="true"/>
-
-   <includes
-         id="org.eclipse.help"
-         version="2.0.102.v20140925-0400"/>
-
-   <plugin
-         id="org.apache.ant"
-         download-size="2360"
-         install-size="2778"
-         version="1.9.2.v201404171502"/>
-
-   <plugin
-         id="org.eclipse.ant.core"
-         download-size="104"
-         install-size="184"
-         version="3.3.0.v20140518-0042"
-         unpack="false"/>
-
-   <plugin
-         id="com.jcraft.jsch"
-         download-size="259"
-         install-size="476"
-         version="0.1.50.v201403120620"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.compare.core"
-         download-size="61"
-         install-size="116"
-         version="3.5.400.v20130903-0736"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.compare"
-         download-size="737"
-         install-size="1545"
-         version="3.5.501.v20140817-1445"
-         unpack="false"/>
-
-   <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.filebuffers"
-         download-size="111"
-         install-size="244"
-         version="3.5.400.v20140127-1516"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem"
-         download-size="56"
-         install-size="107"
-         version="1.4.100.v20140514-1614"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.net"
-         download-size="68"
-         install-size="131"
-         version="1.2.200.v20140124-2013"
-         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.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_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.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.resources"
-         download-size="814"
-         install-size="1767"
-         version="3.9.1.v20140825-1431"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime.compatibility"
-         download-size="91"
-         install-size="201"
-         version="3.2.200.v20140128-0851"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime.compatibility.registry"
-         download-size="18"
-         install-size="24"
-         version="3.5.300.v20140128-0851"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.osgi.util"
-         download-size="25"
-         install-size="49"
-         version="3.3.0.v20131023-1243"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.debug.core"
-         download-size="349"
-         install-size="722"
-         version="3.9.1.v20140805-1629"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.debug.ui"
-         download-size="2763"
-         install-size="5818"
-         version="3.10.1.v20140822-1408"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.event"
-         download-size="31"
-         install-size="57"
-         version="1.3.100.v20140115-1647"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ltk.core.refactoring"
-         download-size="318"
-         install-size="706"
-         version="3.6.101.v20140817-1500"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ltk.ui.refactoring"
-         download-size="447"
-         install-size="945"
-         version="3.7.100.v20140324-1358"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.platform"
-         download-size="325"
-         install-size="813"
-         version="4.4.0.v20140925-0400"/>
-
-   <plugin
-         id="org.eclipse.platform.doc.user"
-         download-size="8213"
-         install-size="9896"
-         version="4.4.1.v20140829-1306"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.search"
-         download-size="461"
-         install-size="948"
-         version="3.9.100.v20140226-1637"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.core"
-         download-size="393"
-         install-size="834"
-         version="3.7.0.v20130514-1224"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.ui"
-         download-size="1404"
-         install-size="3071"
-         version="3.7.100.v20130710-1213"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.text"
-         download-size="243"
-         install-size="481"
-         version="3.5.300.v20130515-1451"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jface.text"
-         download-size="971"
-         install-size="2043"
-         version="3.9.1.v20140827-1810"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jsch.core"
-         download-size="37"
-         install-size="69"
-         version="1.1.500.v20131112-1442"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jsch.ui"
-         download-size="95"
-         install-size="185"
-         version="1.1.500.v20131112-1442"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.console"
-         download-size="174"
-         install-size="327"
-         version="3.5.300.v20140424-1437"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.intro"
-         download-size="301"
-         install-size="621"
-         version="3.4.200.v20130326-1254"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.intro.universal"
-         download-size="1594"
-         install-size="2080"
-         version="3.2.700.v20130904-1701"/>
-
-   <plugin
-         id="org.eclipse.ui.cheatsheets"
-         download-size="322"
-         install-size="660"
-         version="3.4.200.v20131227-1524"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.browser"
-         download-size="187"
-         install-size="332"
-         version="3.4.200.v20131003-1453"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.navigator"
-         download-size="393"
-         install-size="837"
-         version="3.5.401.v20140724-1117"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.navigator.resources"
-         download-size="125"
-         install-size="266"
-         version="3.4.700.v20140407-1004"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.net"
-         download-size="47"
-         install-size="87"
-         version="1.2.200.v20120807-0927"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.workbench.texteditor"
-         download-size="571"
-         install-size="1250"
-         version="3.9.0.v20140411-1521"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views"
-         download-size="94"
-         install-size="178"
-         version="3.7.0.v20140408-0703"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.editors"
-         download-size="563"
-         install-size="1271"
-         version="3.8.200.v20140401-1310"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.externaltools"
-         download-size="143"
-         install-size="284"
-         version="3.2.300.v20140327-1949"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.ide"
-         download-size="2470"
-         install-size="5027"
-         version="3.10.1.v20140828-0944"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.ide.application"
-         download-size="70"
-         install-size="137"
-         version="1.0.500.v20140514-2033"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.win32"
-         ws="win32"
-         download-size="24"
-         install-size="48"
-         version="3.2.400.v20140423-2207"
-         fragment="true"
-         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.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.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.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.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.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.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.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.variables"
-         download-size="33"
-         install-size="63"
-         version="3.2.800.v20130819-1716"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.forms"
-         download-size="295"
-         install-size="596"
-         version="3.6.100.v20140422-1825"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views.properties.tabbed"
-         download-size="103"
-         install-size="213"
-         version="3.6.100.v20140519-0906"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security"
-         download-size="104"
-         install-size="216"
-         version="1.2.0.v20130424-1801"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.ui"
-         download-size="177"
-         install-size="331"
-         version="1.1.200.v20130626-2037"
-         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.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.core.externaltools"
-         download-size="40"
-         install-size="78"
-         version="1.0.300.v20140219-0051"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.themes"
-         download-size="43"
-         install-size="125"
-         version="1.0.1.v20140819-1717"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.java7"
-         download-size="14"
-         install-size="23"
-         version="1.0.0.v20140429-1531"
-         fragment="true"
-         unpack="false"/>

+<feature id="org.talend.platform.feature" label="Platform" version="7.2.1.qualifier"> 
+  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
+  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
+  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
+  <requires>
+    <import feature="org.eclipse.equinox.p2.user.ui" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.help" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.eclipse.rcp" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="com.jcraft.jsch" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.ant" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ant.core" 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.core.externaltools" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.core.filebuffers" version="0.0.0" match="greaterOrEqual"/>
+    <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.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"/>
+    <import plugin="org.eclipse.equinox.event" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.equinox.security" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.equinox.security.ui" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jface.text" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jsch.core" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.jsch.ui" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ltk.core.refactoring" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ltk.ui.refactoring" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.osgi.util" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.platform" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.platform.doc.user" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.search" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.team.core" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.team.ui" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.text" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ui.browser" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ui.cheatsheets" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ui.console" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ui.editors" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ui.externaltools" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ui.forms" version="0.0.0" match="greaterOrEqual"/>
+    <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"/>
+    <import plugin="org.eclipse.ui.net" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ui.themes" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.ui.views" version="0.0.0" match="greaterOrEqual"/>
+    <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="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>
--- a/main/features/org.talend.rcp.feature/feature.xml
+++ b/main/features/org.talend.rcp.feature/feature.xml
@@ -1,77 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.rcp.feature"
-      label="RCP Feature"
-      version="7.2.1.qualifier"
-      provider-name=".Talend SA.">
-
-   <description url="http://www.talend.com/online/featuresdescription.html#rcp-feature">
-      Complete description about this feature at http://www.talend.com/online/featuresdescription.html#rcp-feature
-   </description>
-
-   <copyright url="http://www.talend.com/online/copyright.txt">
-      Copyright Talend 2006, 2007
-   </copyright>
-
-   <license>
-      The licence are describe in branding feature
-   </license>
-
-   <url>
-      <update label="CORE Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/>
-      <discovery label="Talend web site" url="http://www.talend.com"/>
-   </url>
-
-   <includes
-         id="org.eclipse.rcp"
-         version="0.0.0"/>
-
-   <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"/>
-
-   <plugin
-         id="org.talend.libraries.apache"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ui.views.log"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="net.jeeeyul.eclipse.themes"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.themes.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="net.jeeeyul.swtend"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>

+<feature id="org.talend.rcp.feature" label="RCP Feature" version="7.2.1.qualifier" provider-name=".Talend SA."> 
+  <description url="http://www.talend.com/online/featuresdescription.html#rcp-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#rcp-feature</description>  
+  <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
+  <license>The licence are describe in branding feature</license>  
+  <url> 
+    <update label="CORE Talend update site for milestones" url="http://talendforge.org/core/updatesite/testing/"/>  
+    <discovery label="Talend web site" url="http://www.talend.com"/> 
+  </url>  
+  <requires>
+    <import feature="org.eclipse.rcp" 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.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"/>
 </feature>
--- a/main/features/org.talend.update.p2.feature/feature.xml
+++ b/main/features/org.talend.update.p2.feature/feature.xml
@@ -1,23 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.update.p2.feature"
-      label="P2-feature"
-      version="7.2.1.qualifier">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.eclipse.equinox.p2.rcp.feature"
-         version="0.0.0"/>

+<feature id="org.talend.update.p2.feature" label="P2-feature" version="7.2.1.qualifier"> 
+  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
+  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
+  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
+  <requires>
+    <import feature="org.eclipse.equinox.p2.rcp.feature" version="0.0.0" match="greaterOrEqual"/>
+  </requires> 
 </feature>
--- a/main/features/org.talend.updates.feature/feature.xml
+++ b/main/features/org.talend.updates.feature/feature.xml
@@ -1,19 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.updates.feature"
-      label="Updates-feature"
-      version="7.2.1.qualifier"
-      provider-name=".Talend SA.">
-
-   <copyright url="http://www.talend.com/about-us">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <plugin
-         id="org.talend.updates.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>

+<feature id="org.talend.updates.feature" label="Updates-feature" version="7.2.1.qualifier" provider-name=".Talend SA."> 
+  <copyright url="http://www.talend.com/about-us">[Enter Copyright Description here.]</copyright>  
+  <plugin id="org.talend.updates.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>
--- a/main/features/org.talend.utils.feature/feature.xml
+++ b/main/features/org.talend.utils.feature/feature.xml
@@ -1,158 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.utils.feature"
-      label="Utils_feature Feature"
-      version="7.2.1.qualifier">
-
-   <description url="http://www.example.com/description">
-      This feature contains the Talend utilities plugin and its dependencies.
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <requires>
-      <import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.talend.libraries.apache"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="bcprov"
-         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"/>
-
-   <plugin
-         id="org.talend.libraries.javacsv"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.libraries.csv"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.junit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.log4j"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.fasterxml.jackson.core.jackson-annotations"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.fasterxml.jackson.core.jackson-core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.codec"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.lang"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.daikon"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.cedarsoftware.json-io"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.slf4j.api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="jackson-core-asl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="jackson-mapper-asl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.servicemix.bundles.avro"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="com.thoughtworks.paranamer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.compress"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.lang3"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>

+<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="7.2.1.qualifier"> 
+  <description url="http://www.example.com/description">This feature contains the Talend utilities plugin and its dependencies.</description>  
+  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
+  <license url="http://www.example.com/license">[Enter License Description here.]</license>  
+  <requires>
+    <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.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"/>
+    <import plugin="org.apache.commons.codec" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.commons.compress" version="1.10.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.commons.lang" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.commons.lang3" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.log4j" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.servicemix.bundles.avro" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.junit" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
+  </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>
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/MessageBoxExceptionHandler.java
+++ b/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());
                }
            });
        }
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/ImageUtils.java
+++ b/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
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/image/TalendImageProvider.java
+++ b/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;
+    }
+
+}
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/utils/ZipFileUtils.java
+++ b/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;
+    }
+}
--- a/main/plugins/org.talend.commons.runtime/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.commons.runtime/META-INF/MANIFEST.MF
@@ -11,9 +11,9 @@ 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.apache.commons.io,
+ org.talend.utils
 Export-Package: org.talend.commons,
 org.talend.commons.exception,
 org.talend.commons.i18n,
@@ -59,5 +59,5 @@ Export-Package: org.talend.commons,
 Bundle-ClassPath: .,
 fakejdbc_driver.jar
 Bundle-Vendor: .Talend SA.
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
+Import-Package: org.apache.xerces.jaxp
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/CommonsPlugin.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/CommonsPlugin.java
@@ -17,8 +17,10 @@ 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;
@@ -160,4 +162,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);
+    }
+
 }
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/utils/io/FileCopyUtils.java
+++ b/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;
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/xml/XSDValidator.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/xml/XSDValidator.java
@@ -15,10 +15,12 @@ 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;

+import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Document;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.InputSource;
@@ -37,12 +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 = DocumentBuilderFactory.newInstance();
-
+        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;
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/xml/XmlNodeRetriever.java
+++ b/main/plugins/org.talend.commons.runtime/src/org/talend/commons/runtime/xml/XmlNodeRetriever.java
@@ -30,6 +30,7 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
+import javax.xml.xpath.XPathFactoryConfigurationException;

 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.oro.text.regex.Pattern;
@@ -38,7 +39,9 @@ import org.apache.oro.text.regex.Perl5Matcher;
 import org.apache.oro.text.regex.Perl5Substitution;
 import org.apache.oro.text.regex.Util;
 import org.talend.commons.exception.CommonExceptionHandler;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.commons.i18n.internal.Messages;
+import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -160,12 +163,12 @@ public class XmlNodeRetriever {
     * @param filePath2
     */
    private synchronized void initSource(String filePath) {
-        // Parse document containing schemas and validation roots
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        DocumentBuilder db = null;
        File file = new File(filePath);
        InputSource inputSource = new InputSource(file.toURI().toASCIIString());
+        // Parse document containing schemas and validation roots
+        DocumentBuilder db = null;
        try {
+            DocumentBuilderFactory dbf = XmlUtils.getSecureDocumentBuilderFactory(false);
            dbf.setNamespaceAware(true);
            db = dbf.newDocumentBuilder();
            document = db.parse(inputSource);
@@ -193,6 +196,11 @@ public class XmlNodeRetriever {
                prefixHandler = new XPathPrefixHandler(document.getDocumentElement());
                // Create XPath factory for selecting schema and validation roots
                XPathFactory xpf = XPathFactory.newInstance();
+                try {
+                    xpf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+                } catch (XPathFactoryConfigurationException e) {
+                    ExceptionHandler.process(e);
+                }
                xpath = xpf.newXPath();
                // xpath.setNamespaceContext(namespaceContext);
                xpath.setNamespaceContext(prefixHandler.getNamespaceContext());
--- a/main/plugins/org.talend.commons.runtime/src/org/talend/commons/utils/database/SAPHanaDataBaseMetadata.java
+++ b/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) {
--- a/main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/gmf/util/DisplayUtils.java
+++ b/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++) {
--- a/main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/html/DynamicURLParser.java
+++ b/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("&amp;") != -1) {
            query = query.replaceAll("&amp;", "&");
        }
-        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);
--- a/main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/EventLoopProgressMonitor.java
+++ b/main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/EventLoopProgressMonitor.java
@@ -12,6 +12,8 @@
 // ============================================================================
 package org.talend.commons.ui.swt.dialogs;

+import java.io.File;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IProgressMonitorWithBlocking;
 import org.eclipse.core.runtime.IStatus;
@@ -48,6 +50,8 @@ public class EventLoopProgressMonitor extends ProgressMonitorWrapper implements
     * The task name is the name of the current task in the event loop.
     */
    private String taskName;
+    
+    private String originalTaskName;

    /**
     * Constructs a new instance of the receiver and forwards to monitor.
@@ -62,6 +66,12 @@ public class EventLoopProgressMonitor extends ProgressMonitorWrapper implements
     * @see IProgressMonitor#beginTask
     */
    public void beginTask(String name, int totalWork) {
+        if(originalTaskName != null){
+            String tname = originalTaskName.replace(File.separatorChar, '-');
+            if(name.contains(tname)){
+                name= name.replace(tname, originalTaskName);
+            }
+        }
        super.beginTask(name, totalWork);
        taskName = name;
        runEventLoop();
@@ -160,6 +170,7 @@ public class EventLoopProgressMonitor extends ProgressMonitorWrapper implements
     */
    public void setTaskName(String name) {
        super.setTaskName(name);
+        this.originalTaskName = name;
        taskName = name;
        runEventLoop();
    }
--- a/main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/SSLDialog.java
+++ b/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);
--- a/main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/utils/workbench/gef/SimpleHtmlFigure.java
+++ b/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();
        }
--- a/main/plugins/org.talend.core.repository/META-INF/MANIFEST.MF
+++ b/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
@@ -45,4 +46,3 @@ Bundle-Activator: org.talend.core.repository.CoreRepositoryPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
 Bundle-Vendor: .Talend SA.
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/i18n/messages.properties
+++ b/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
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/logintask/ReadOnlyProjectConfirm.java
+++ b/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();
    }
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/IRepositoryFactory.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/IRepositoryFactory.java
@@ -215,6 +215,9 @@ public interface IRepositoryFactory {
    public void deleteObjectPhysical(Project project, IRepositoryViewObject objToDelete, String version,
            boolean fromEmptyRecycleBin, boolean isDeleteOnRemote) throws PersistenceException;

+    public void batchDeleteObjectPhysical(Project project, List<IRepositoryViewObject> objToDeleteList, boolean isDeleteOnRemote)
+            throws PersistenceException;
+
    /**
     * Restore a logically deleted object. <code>isDeleted</code> on this object will now returned <code>false</code>.
     * 
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java
@@ -67,6 +67,7 @@ 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.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.CommonUIPlugin;
 import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
 import org.talend.commons.utils.data.container.RootContainer;
@@ -83,6 +84,7 @@ import org.talend.core.context.CommandLineContext;
 import org.talend.core.context.Context;
 import org.talend.core.context.RepositoryContext;
 import org.talend.core.exception.TalendInternalPersistenceException;
+import org.talend.core.hadoop.BigDataBasicUtil;
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.metadata.MetadataTalendType;
@@ -406,7 +408,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$
@@ -865,6 +867,80 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
        log.info(Messages.getString("ProxyRepositoryFactory.log.physicalDeletion", str)); //$NON-NLS-1$    }
    }

+    @Override
+    public void batchDeleteObjectPhysical4Remote(Project project, List<IRepositoryViewObject> objToDeleteList)
+            throws PersistenceException {
+        if (project == null || objToDeleteList == null || objToDeleteList.size() == 0) {
+            return;
+        }
+
+        List<String> idList = new ArrayList<String>();
+        List<IRepositoryViewObject> repositoryObjectList = new ArrayList<IRepositoryViewObject>();
+        for (IRepositoryViewObject objToDelete : objToDeleteList) {
+            IRepositoryViewObject object = new RepositoryObject(objToDelete.getProperty());
+            boolean isExtendPoint = false;
+
+            if (isFullLogonFinished()) {
+                fireRepositoryPropertyChange(ERepositoryActionName.DELETE_FOREVER.getName(), null, object);
+            }
+            idList.add(object.getProperty().getId());
+            ERepositoryObjectType repositoryObjectType = object.getRepositoryObjectType();
+
+            ICoreService coreService = getCoreService();
+            if (coreService != null) {
+                for (IRepositoryContentHandler handler : RepositoryContentManager.getHandlers()) {
+                    isExtendPoint = handler.isRepObjType(repositoryObjectType);
+                    if (isExtendPoint == true) {
+                        if (repositoryObjectType == handler.getProcessType()) {
+                            coreService.removeJobLaunch(object);
+                        }
+                        if (repositoryObjectType == handler.getCodeType()) {
+                            try {
+                                coreService.deleteBeanfile(object);
+                            } catch (Exception e) {
+                                ExceptionHandler.process(e);
+                            }
+                        }
+                        break;
+                    }
+                }
+                if (repositoryObjectType == ERepositoryObjectType.PROCESS) {
+                    // delete the job launch, for bug 8878
+                    coreService.removeJobLaunch(object);
+                }
+            }
+
+            if (repositoryObjectType == ERepositoryObjectType.ROUTINES || repositoryObjectType == ERepositoryObjectType.PIG_UDF) {
+                try {
+                    coreService.deleteRoutinefile(object);
+                } catch (Exception e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+
+            if (repositoryObjectType == ERepositoryObjectType.PROCESS && isFullLogonFinished()) {
+                if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
+                    IESBService service = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
+                    if (service != null) {
+                        service.refreshOperationLabel(object.getProperty().getId());
+                    }
+                }
+            }
+
+            repositoryObjectList.add(object);
+        }
+
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
+            IRunProcessService service = (IRunProcessService) GlobalServiceRegister.getDefault()
+                    .getService(IRunProcessService.class);
+            service.batchDeleteAllVersionTalendJobProject(idList);
+        }
+        this.repositoryFactoryFromProvider.batchDeleteObjectPhysical(project, repositoryObjectList, false);
+
+        // save project will handle git/svn update
+        this.repositoryFactoryFromProvider.saveProject(project);
+    }
+
    /*
     * (non-Javadoc)
     * 
@@ -1033,26 +1109,31 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
     */
    @Override
    public List<IRepositoryViewObject> getAllVersion(String id) throws PersistenceException {
-        String projectLabel = ProcessUtils.getProjectLabelFromItemId(id);
+        String objId = id;
+        String projectLabel = ProcessUtils.getProjectLabelFromItemId(objId);
        Project project = projectManager.getCurrentProject();
-        if (projectLabel != null) {
-            project = projectManager.getProjectFromProjectTechLabel(projectLabel);
-            id = ProcessUtils.getPureItemId(id);
+        if (projectLabel != null) {   
+            Project tempProject = projectManager.getProjectFromProjectTechLabel(projectLabel);
+            objId = ProcessUtils.getPureItemId(objId);
+            if (tempProject != null) {
+                project = tempProject;
+            }
        }
-        List<IRepositoryViewObject> allVersion = getAllRefVersion(project, id);
+        List<IRepositoryViewObject> allVersion = getAllRefVersion(project, objId);
        return allVersion;
    }

    @Override
    public List<IRepositoryViewObject> getAllVersion(String id, String folderPath, ERepositoryObjectType type)
            throws PersistenceException {
-        String projectLabel = ProcessUtils.getProjectLabelFromItemId(id);
+        String objId = id;
+        String projectLabel = ProcessUtils.getProjectLabelFromItemId(objId);
        Project project = projectManager.getCurrentProject();
        if (projectLabel != null) {
            project = projectManager.getProjectFromProjectTechLabel(projectLabel);
-            id = ProcessUtils.getPureItemId(id);
+            objId = ProcessUtils.getPureItemId(objId);
        }
-        List<IRepositoryViewObject> allVersion = getAllRefVersion(project, id, folderPath, type);
+        List<IRepositoryViewObject> allVersion = getAllRefVersion(project, objId, folderPath, type);
        return allVersion;
    }

@@ -1116,26 +1197,30 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {

    public IRepositoryViewObject getLastVersion(String id, String folderPath, ERepositoryObjectType type)
            throws PersistenceException {
-        String projectLabel = ProcessUtils.getProjectLabelFromItemId(id);
+        String objId = id;
+        String projectLabel = ProcessUtils.getProjectLabelFromItemId(objId);
        if (projectLabel != null) {
+            objId = ProcessUtils.getPureItemId(id);
            Project project = ProjectManager.getInstance().getProjectFromProjectTechLabel(projectLabel);
            if (project != null) {
-                return this.repositoryFactoryFromProvider.getLastVersion(project, ProcessUtils.getPureItemId(id), folderPath, type);
+                return this.repositoryFactoryFromProvider.getLastVersion(project, objId, folderPath, type);
            }
        }
-        return this.repositoryFactoryFromProvider.getLastVersion(projectManager.getCurrentProject(), id , folderPath, type);
+        return this.repositoryFactoryFromProvider.getLastVersion(projectManager.getCurrentProject(), objId , folderPath, type);
    }

    @Override
    public IRepositoryViewObject getLastVersion(String id) throws PersistenceException {
+        String objId = id;
        String projectLabel = ProcessUtils.getProjectLabelFromItemId(id);
        if (projectLabel != null) {
+            objId = ProcessUtils.getPureItemId(id);
            Project project = ProjectManager.getInstance().getProjectFromProjectTechLabel(projectLabel);
            if (project != null) {
-                return getLastVersion(project, ProcessUtils.getPureItemId(id));
+                return getLastVersion(project, objId);
            }
        }
-        IRepositoryViewObject lastRefVersion = getLastRefVersion(projectManager.getCurrentProject(), id);
+        IRepositoryViewObject lastRefVersion = getLastRefVersion(projectManager.getCurrentProject(), objId);
        return lastRefVersion;
    }

@@ -1973,6 +2058,10 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                this.repositoryFactoryFromProvider.beforeLogon(project);
                ProjectManager.getInstance().getBeforeLogonRecords().clear();
                ProjectManager.getInstance().getUpdatedRemoteHandlerRecords().clear();
+
+                // init dynamic distirbution after `beforeLogon`, before loading libraries.
+                initDynamicDistribution(monitor);
+
                // Check reference project setting problems
                checkReferenceProjectsProblems(project);
                if (isCancelled) {
@@ -2167,6 +2256,18 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
        }
    }

+    private void initDynamicDistribution(IProgressMonitor monitor) {
+        try {
+            if (BigDataBasicUtil.isDynamicDistributionLoaded(monitor)) {
+                BigDataBasicUtil.reloadAllDynamicDistributions(monitor);
+            } else {
+                BigDataBasicUtil.loadDynamicDistribution(monitor);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
    private void checkReferenceProjectsProblems(Project project) throws BusinessException, PersistenceException {
        if (ReferenceProjectProblemManager.getInstance().getAllInvalidProjectReferenceSet().size() > 0) {
            StringBuffer sb = new StringBuffer();
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ldap/AdvancedSocketFactory.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ldap/AdvancedSocketFactory.java
@@ -27,10 +27,9 @@ import javax.net.ssl.SSLSocketFactory;
 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;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;

 /**
 * This class is used for LDAP. <br/>
@@ -219,7 +218,7 @@ public class AdvancedSocketFactory extends SSLSocketFactory {
     */
    private void init(KeyStore ks, char password[]) {
        SSLContext ctx = null;
-        com.sun.net.ssl.KeyManager keyManagers[] = null;
+        javax.net.ssl.KeyManager keyManagers[] = null;
        TrustManager trustManagers[] = null;
        try {
            if (ks != null) {
@@ -238,6 +237,6 @@ public class AdvancedSocketFactory extends SSLSocketFactory {
    }

    static {
-        Security.addProvider(new Provider());
+        Security.addProvider(java.security.Security.getProvider("SUN"));
    }
 }
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ldap/LDAPCATruster.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/ldap/LDAPCATruster.java
@@ -24,13 +24,15 @@ 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 org.apache.log4j.Logger;
+import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.repository.i18n.Messages;

-import com.sun.net.ssl.TrustManagerFactory;
-import com.sun.net.ssl.X509TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;

 /**
 * This class is used for verifying CA for LDAP connection.
@@ -74,26 +76,6 @@ public class LDAPCATruster implements X509TrustManager {
        init();
    }

-    /**
-     * Comment method "deleteCert".
-     * 
-     * @param id
-     * @return
-     */
-    private boolean deleteCert(String id) {
-        try {
-            ks.deleteEntry(id);
-        } catch (KeyStoreException ex) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.sun.net.ssl.X509TrustManager#getAcceptedIssuers()
-     */
    public X509Certificate[] getAcceptedIssuers() {
        if (trustManager == null)
            return null;
@@ -177,7 +159,7 @@ public class LDAPCATruster implements X509TrustManager {
        TrustManagerFactory trustManagerFactory = null;
        trustManagerFactory = TrustManagerFactory.getInstance("SunX509"); //$NON-NLS-1$
        trustManagerFactory.init(ks);
-        com.sun.net.ssl.TrustManager trusts[] = trustManagerFactory.getTrustManagers();
+        javax.net.ssl.TrustManager trusts[] = trustManagerFactory.getTrustManagers();
        return (X509TrustManager) trusts[0];
    }

@@ -192,29 +174,24 @@ 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;
-        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;
-        }
+    public boolean isServerTrusted(X509Certificate chain[], String authType) {
+    	boolean isTrusted = false;
+    	if (trustManager != null) {
+    		try {
+        		trustManager.checkServerTrusted(chain, authType);
+        		isTrusted = true;
+    		}catch (CertificateException e) {
+    		    ExceptionHandler.process(e);
+			}
+    	}
+    	if (isTrusted) {
+    		return true;
+    	}
        X509Certificate ca = getCACert(chain);
        if (ca != null) {
            if (isAccepted(ca)) {
@@ -230,7 +207,16 @@ public class LDAPCATruster implements X509TrustManager {
                log.error(Messages.getString("LDAPCATruster.failedCreateTmp") + e.getMessage()); //$NON-NLS-1$
                return false;
            }
-            if (tmpTrustManager.isServerTrusted(chain)) {
+            boolean isTmpTrusted = false;
+        	if (tmpTrustManager != null) {
+        		try {
+        			tmpTrustManager.checkServerTrusted(chain, authType);
+        			isTmpTrusted = true;
+        		}catch (CertificateException e) {
+        		    ExceptionHandler.process(e);
+    			}
+        	}
+            if (isTmpTrusted) {
                if (this.isSaveCA) {
                    saveStore();
                    trustManager = tmpTrustManager;
@@ -279,4 +265,19 @@ public class LDAPCATruster implements X509TrustManager {
                }
        }
    }
+
+	@Override
+	public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+	    if (trustManager == null) {
+	        throw new CertificateException(Messages.getString("LDAPCATruster.failedInitialTrust"));
+	    }
+	    trustManager.checkClientTrusted(chain, authType);		
+	}
+
+	@Override
+	public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+	    if (!isServerTrusted(chain, authType)) {
+	        throw new CertificateException(Messages.getString("LDAPCATruster.sslError1"));
+	    }	
+	}
 }
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/DeleteAction.java
+++ b/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;
@@ -215,6 +216,7 @@ public class DeleteAction extends AContextualAction {
                        selectNodes = selectNodesFullList;
                    }
                }
+                List<IRepositoryViewObject> batchDeleteObjectList = new ArrayList<IRepositoryViewObject>();
                List<RepositoryNode> accessNodes = new ArrayList<RepositoryNode>();
                for (RepositoryNode node : selectNodes) {
                    try {
@@ -279,7 +281,8 @@ public class DeleteAction extends AContextualAction {
                            if (node.getProperties(EProperties.CONTENT_TYPE) == ERepositoryObjectType.JOBLET) {
                                needToUpdataPalette = true;
                            }
-                            boolean needReturn = deleteElements(factory, deleteActionCache, node);
+
+                            boolean needReturn = deleteElements(factory, deleteActionCache, node, batchDeleteObjectList);
                            if (needReturn) {
                                // TDI-31623: Access the rest nodes in select nodes if current node's delete has pb
                                if (accessNodes.containsAll(selectNodes)) {
@@ -331,7 +334,8 @@ public class DeleteAction extends AContextualAction {
                                types.add(ERepositoryObjectType.DOCUMENTATION);
                            }
                            deletedFolder.add(node);
-                            deleteFolder(node, factory, deleteActionCache);
+                            List<IRepositoryViewObject> deleteObjectList = new ArrayList<IRepositoryViewObject>();
+                            deleteFolder(node, factory, deleteActionCache, deleteObjectList);
                        }
                    } catch (PersistenceException e) {
                        MessageBoxExceptionHandler.process(e);
@@ -341,7 +345,13 @@ public class DeleteAction extends AContextualAction {
                }

                try {
-                    factory.saveProject(ProjectManager.getInstance().getCurrentProject());
+                    if (batchDeleteObjectList != null && batchDeleteObjectList.size() > 0) {
+                        // no need saveProject for remote, will do saveProject in batchDeleteObjectPhysical4Remote
+                        factory.batchDeleteObjectPhysical4Remote(ProjectManager.getInstance().getCurrentProject(),
+                                batchDeleteObjectList);
+                    } else {
+                        factory.saveProject(ProjectManager.getInstance().getCurrentProject());
+                    }
                } catch (PersistenceException e) {
                    ExceptionHandler.process(e);
                }
@@ -453,11 +463,11 @@ public class DeleteAction extends AContextualAction {
     * @param deleteActionCache
     */
    private void deleteFolder(final RepositoryNode node, final IProxyRepositoryFactory factory,
-            final DeleteActionCache deleteActionCache) {
+            final DeleteActionCache deleteActionCache, List<IRepositoryViewObject> batchDeleteObjectList) {
        if (node.getObject().isDeleted()) {
            // if folder has been deleted already
            try {
-                deleteElements(factory, deleteActionCache, node);
+                deleteElements(factory, deleteActionCache, node, batchDeleteObjectList);
            } catch (Exception e) {
                ExceptionHandler.process(e);
            }
@@ -702,7 +712,8 @@ public class DeleteAction extends AContextualAction {
            }
            factory.deleteObjectLogical(objToDelete);
            removeConnFromSQLExplorer(repositoryNode);
-            deleteTestCases(factory, deleteActionCache, repositoryNode, null);
+            List<IRepositoryViewObject> batchDeleteObjectList = new ArrayList<IRepositoryViewObject>();
+            deleteTestCases(factory, deleteActionCache, repositoryNode, null, batchDeleteObjectList);

            return true;
        }
@@ -1231,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();
                }
@@ -1285,14 +1297,16 @@ public class DeleteAction extends AContextualAction {
    }

    protected boolean deleteElements(IProxyRepositoryFactory factory, DeleteActionCache deleteActionCache,
-            RepositoryNode currentJobNode) throws PersistenceException, BusinessException {
-        return deleteElements(factory, deleteActionCache, currentJobNode, null);
+            RepositoryNode currentJobNode, List<IRepositoryViewObject> batchDeleteObjectList)
+            throws PersistenceException, BusinessException {
+        return deleteElements(factory, deleteActionCache, currentJobNode, null, batchDeleteObjectList);
    }

    protected boolean confirmFromDialog = false;

    protected boolean deleteElements(IProxyRepositoryFactory factory, DeleteActionCache deleteActionCache,
-            final RepositoryNode currentJobNode, Boolean confirm) throws PersistenceException, BusinessException {
+            final RepositoryNode currentJobNode, Boolean confirm, List<IRepositoryViewObject> batchDeleteObjectList)
+            throws PersistenceException, BusinessException {
        boolean needReturn = false;
        final boolean[] enableDeleting = new boolean[1];
        enableDeleting[0] = true;
@@ -1360,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;
@@ -1370,9 +1384,21 @@ public class DeleteAction extends AContextualAction {
                    deleteActionCache.closeOpenedEditor(objToDelete);
                    if (currentJobNode.getType() == ENodeType.SIMPLE_FOLDER) {
                        boolean success = true;
+                        List<IRepositoryViewObject> deleteObjectList = new ArrayList<IRepositoryViewObject>();
                        for (IRepositoryNode curNode : currentJobNode.getChildren()) {
                            try {
-                                deleteElements(factory, deleteActionCache, (RepositoryNode) curNode, confirm);
+                                deleteElements(factory, deleteActionCache, (RepositoryNode) curNode, confirm, deleteObjectList);
+                            } catch (Exception e) {
+                                ExceptionHandler.process(e);
+                                success = false;
+                            }
+                        }
+                        
+                        // for remote project, lazy batch delete physically
+                        if (deleteObjectList != null && deleteObjectList.size() > 0) {
+                            try {
+                                factory.batchDeleteObjectPhysical4Remote(ProjectManager.getInstance().getCurrentProject(),
+                                        deleteObjectList);
                            } catch (Exception e) {
                                ExceptionHandler.process(e);
                                success = false;
@@ -1425,9 +1451,24 @@ public class DeleteAction extends AContextualAction {
                                }
                            }
                        }
+                        
+                        if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
+                            ITestContainerProviderService testService = (ITestContainerProviderService) GlobalServiceRegister.getDefault()
+                                    .getService(ITestContainerProviderService.class);
+                            if(testService != null){
+                            	
+                            }
+                            testService.deleteDataFiles(objToDelete);
+                        }

-                        factory.deleteObjectPhysical(objToDelete);
+                        if (!ProjectManager.getInstance().getCurrentProject().isLocal()) {
+                            // if remote,batch delete later
+                            batchDeleteObjectList.add(objToDelete);
+                        } else {
+                            factory.deleteObjectPhysical(objToDelete);
+                        }
                        ExpressionPersistance.getInstance().jobDeleted(objToDelete.getLabel());
+                        
                    }
                    if (needToUpdataPalette) {
                        ICoreUIService coreUIService = (ICoreUIService) GlobalServiceRegister.getDefault().getService(
@@ -1441,15 +1482,17 @@ public class DeleteAction extends AContextualAction {
                factory.deleteObjectLogical(objToDelete);
                updateRelatedViews();
                removeConnFromSQLExplorer(currentJobNode);
-                deleteTestCases(factory, deleteActionCache, currentJobNode, confirm);
+                List<IRepositoryViewObject> deleteObjectList = new ArrayList<IRepositoryViewObject>();
+                deleteTestCases(factory, deleteActionCache, currentJobNode, confirm, null);
            }
        }

        return needReturn;
    }
-
+    
    private void deleteTestCases(IProxyRepositoryFactory factory, DeleteActionCache deleteActionCache,
-            final IRepositoryNode currentJobNode, Boolean confirm) throws PersistenceException, BusinessException {
+            final IRepositoryNode currentJobNode, Boolean confirm, List<IRepositoryViewObject> batchDeleteObjectList)
+            throws PersistenceException, BusinessException {
        if (currentJobNode.getType() != ENodeType.REPOSITORY_ELEMENT) {
            return;
        }
@@ -1457,8 +1500,12 @@ public class DeleteAction extends AContextualAction {
            return;
        }
        if (!currentJobNode.getChildren().isEmpty()) {
+            List<IRepositoryViewObject> deleteObjectList = new ArrayList<IRepositoryViewObject>();
            for (IRepositoryNode child : currentJobNode.getChildren()) {
-                deleteElements(factory, deleteActionCache, (RepositoryNode) child, confirm);
+                deleteElements(factory, deleteActionCache, (RepositoryNode) child, confirm, deleteObjectList);
+            }
+            if (deleteObjectList != null && deleteObjectList.size() > 0) {
+                factory.batchDeleteObjectPhysical4Remote(ProjectManager.getInstance().getCurrentProject(), deleteObjectList);
            }
            return;
        }
@@ -1473,6 +1520,7 @@ public class DeleteAction extends AContextualAction {
        if (junitObjects.isEmpty() || junitObjects.getMembers().isEmpty()) {
            return;
        }
+        List<IRepositoryViewObject> lazydeleteList = new ArrayList<IRepositoryViewObject>();
        for (IRepositoryViewObject viewNode : junitObjects.getMembers()) {
            if (viewNode.isDeleted()) {
                continue;
@@ -1480,7 +1528,10 @@ public class DeleteAction extends AContextualAction {
            RepositoryNode node = new RepositoryNode(viewNode, (RepositoryNode) currentJobNode, ENodeType.REPOSITORY_ELEMENT);
            node.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.TEST_CONTAINER);
            node.setProperties(EProperties.LABEL, viewNode.getLabel());
-            deleteElements(factory, deleteActionCache, node, confirm);
+            deleteElements(factory, deleteActionCache, node, confirm, lazydeleteList);
+        }
+        if (lazydeleteList != null && lazydeleteList.size() > 0) {
+            factory.batchDeleteObjectPhysical4Remote(ProjectManager.getInstance().getCurrentProject(), lazydeleteList);
        }
    }

@@ -1790,7 +1841,7 @@ public class DeleteAction extends AContextualAction {
            }
        }
        if (shell == null) {
-            shell = new Shell();
+            shell = DisplayUtils.getDefaultShell(false);
        }
        return shell;
    }
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/DeleteTableAction.java
+++ b/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();
                            }
                        });
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/EmptyRecycleBinAction.java
+++ b/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;
@@ -63,6 +64,7 @@ import org.talend.core.repository.utils.AbstractResourceChangesService;
 import org.talend.core.repository.utils.RepositoryNodeDeleteManager;
 import org.talend.core.repository.utils.TDQServiceRegister;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
+import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.designer.core.ICamelDesignerCoreService;
 import org.talend.designer.runprocess.IRunProcessService;
 import org.talend.repository.ProjectManager;
@@ -183,16 +185,23 @@ public class EmptyRecycleBinAction extends AContextualAction {

            @Override
            public void run(IProgressMonitor monitor) {
+                List<IRepositoryViewObject> batchDeleteObjectList = new ArrayList<IRepositoryViewObject>();
                IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
                for (IRepositoryNode child : children) {
                    try {
-                        deleteElements(factory, (RepositoryNode) child);
+                        deleteElements(factory, (RepositoryNode) child, batchDeleteObjectList);
                    } catch (Exception e) {
                        MessageBoxExceptionHandler.process(e);
                    }
                }
                try {
-                    factory.saveProject(ProjectManager.getInstance().getCurrentProject());
+                    if (batchDeleteObjectList != null && batchDeleteObjectList.size() > 0) {
+                        // no need saveProject for remote, will do saveProject in batchDeleteObjectPhysical4Remote
+                        factory.batchDeleteObjectPhysical4Remote(ProjectManager.getInstance().getCurrentProject(),
+                                batchDeleteObjectList);
+                    } else {
+                        factory.saveProject(ProjectManager.getInstance().getCurrentProject());
+                    }
                } catch (PersistenceException e) {
                    ExceptionHandler.process(e);
                }
@@ -250,12 +259,13 @@ public class EmptyRecycleBinAction extends AContextualAction {
            }
        }
        if (shell == null) {
-            shell = new Shell();
+            shell = DisplayUtils.getDefaultShell(false);
        }
        return shell;
    }

-    protected void deleteElements(final IProxyRepositoryFactory factory, final RepositoryNode currentNode)
+    protected void deleteElements(final IProxyRepositoryFactory factory, final RepositoryNode currentNode,
+            List<IRepositoryViewObject> batchDeleteObjectList)
            throws PersistenceException, BusinessException {
        if (!validElement(currentNode)) {
            return;
@@ -289,46 +299,58 @@ public class EmptyRecycleBinAction extends AContextualAction {
                                page.closeEditor(editors.getEditor(false), false);
                            }
                        }
-                        if (objToDelete.getRepositoryObjectType() != ERepositoryObjectType.JOB_DOC
-                                && objToDelete.getRepositoryObjectType() != ERepositoryObjectType.JOBLET_DOC) {
-                            if (currentNode.getType() == ENodeType.SIMPLE_FOLDER) {
-                                for (IRepositoryNode curNode : currentNode.getChildren()) {
-                                    deleteElements(factory, (RepositoryNode) curNode);
-
-                                }
-                                factory.deleteFolder(ProjectManager.getInstance().getCurrentProject(),
-                                        currentNode.getContentType(),
-                                        RepositoryNodeUtilities.getFolderPath(currentNode.getObject().getProperty().getItem()),
-                                        true);
-                            } else {
-                                // Handle nodes from extension point.
-                                for (IRepositoryContentHandler handler : RepositoryContentManager.getHandlers()) {
-                                    handler.deleteNode(objToDelete);
-                                }
-                                ERepositoryObjectType nodeType = (ERepositoryObjectType) currentNode
-                                        .getProperties(EProperties.CONTENT_TYPE);
-                                if (nodeType == ERepositoryObjectType.ROUTINES || nodeType == ERepositoryObjectType.PIG_UDF) {
-                                    forceBuild = true;
-                                }
-                                if (!forceBuild) {
-                                    if (GlobalServiceRegister.getDefault().isServiceRegistered(ICamelDesignerCoreService.class)) {
-                                        ICamelDesignerCoreService camelService = (ICamelDesignerCoreService) GlobalServiceRegister
-                                                .getDefault().getService(ICamelDesignerCoreService.class);
-                                        if (nodeType == camelService.getBeansType()) {
-                                            forceBuild = true;
-                                        }
-                                    }
-                                }
-                                factory.deleteObjectPhysical(ProjectManager.getInstance().getCurrentProject(), objToDelete, null,
-                                        true);
-                            }
-                        }
-
                    } catch (Exception e) {
                        ExceptionHandler.process(e);
                    }
                }
            });
+            if (objToDelete.getRepositoryObjectType() != ERepositoryObjectType.JOB_DOC
+                    && objToDelete.getRepositoryObjectType() != ERepositoryObjectType.JOBLET_DOC) {
+                List<IRepositoryViewObject> deleteObjectList = new ArrayList<IRepositoryViewObject>();
+                if (currentNode.getType() == ENodeType.SIMPLE_FOLDER) {
+                    for (IRepositoryNode curNode : currentNode.getChildren()) {
+                        deleteElements(factory, (RepositoryNode) curNode, deleteObjectList);
+                    }
+                    if (deleteObjectList != null && deleteObjectList.size() > 0) {
+                        factory.batchDeleteObjectPhysical4Remote(ProjectManager.getInstance().getCurrentProject(),
+                                deleteObjectList);
+                    }
+                    factory.deleteFolder(ProjectManager.getInstance().getCurrentProject(), currentNode.getContentType(),
+                            RepositoryNodeUtilities.getFolderPath(currentNode.getObject().getProperty().getItem()), true);
+                } else {
+                    // Handle nodes from extension point.
+                    for (IRepositoryContentHandler handler : RepositoryContentManager.getHandlers()) {
+                        handler.deleteNode(objToDelete);
+                    }
+                    ERepositoryObjectType nodeType = (ERepositoryObjectType) currentNode.getProperties(EProperties.CONTENT_TYPE);
+                    if (nodeType == ERepositoryObjectType.ROUTINES || nodeType == ERepositoryObjectType.PIG_UDF) {
+                        forceBuild = true;
+                    }
+                    if (!forceBuild) {
+                        if (GlobalServiceRegister.getDefault().isServiceRegistered(ICamelDesignerCoreService.class)) {
+                            ICamelDesignerCoreService camelService = (ICamelDesignerCoreService) GlobalServiceRegister
+                                    .getDefault().getService(ICamelDesignerCoreService.class);
+                            if (nodeType == camelService.getBeansType()) {
+                                forceBuild = true;
+                            }
+                        }
+                    }
+
+                    if (GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
+                        ITestContainerProviderService testService = (ITestContainerProviderService) GlobalServiceRegister
+                                .getDefault().getService(ITestContainerProviderService.class);
+                        if (testService != null) {
+                            testService.deleteDataFiles(objToDelete);
+                        }
+                    }
+                    if (!ProjectManager.getInstance().getCurrentProject().isLocal()) {
+                        // if remote, batch delete later
+                        batchDeleteObjectList.add(objToDelete);
+                    } else {
+                        factory.deleteObjectPhysical(ProjectManager.getInstance().getCurrentProject(), objToDelete, null, true);
+                    }
+                }
+            }

        }
    }
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/PasteAction.java
+++ b/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);
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/view/RepositoryDropAdapter.java
+++ b/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) {
--- a/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/ProjectDataJsonProvider.java
+++ b/main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/utils/ProjectDataJsonProvider.java
@@ -70,7 +70,7 @@ public class ProjectDataJsonProvider {

    public static final int CONTENT_ALL = 15;

-    public static final String FAKE_TASK = "org.talend.repository.model.migration.CheckProductVersionMigrationTask";
+    public static final String FAKE_TASK = "org.talend.repository.model.migration.CheckProductVersionMigrationTask"; //$NON-NLS-1$

    public static String getRelationshipIndexPath() {
        StringBuilder strBuilder = new StringBuilder();
--- a/main/plugins/org.talend.core.runtime/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.core.runtime/META-INF/MANIFEST.MF
@@ -127,4 +127,3 @@ Bundle-ClassPath: .,
 lib/resty-0.3.2.jar,
 lib/json_simple-1.1.jar
 Eclipse-RegisterBuddy: org.talend.testutils
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
--- a/main/plugins/org.talend.core.runtime/mappings/mapping_AmazonAurora.xml
+++ b/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>
--- a/main/plugins/org.talend.core.runtime/mappings/mapping_Hive.xml
+++ b/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"/>
--- a/main/plugins/org.talend.core.runtime/mappings/mapping_Vertica.xml
+++ b/main/plugins/org.talend.core.runtime/mappings/mapping_Vertica.xml
@@ -32,7 +32,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"/>
@@ -55,7 +56,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 +66,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 +91,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>
--- a/main/plugins/org.talend.core.runtime/plugin.xml
+++ b/main/plugins/org.talend.core.runtime/plugin.xml
@@ -19,12 +19,6 @@
   <extension-point id="hadoopConnectionCreator" name="Hadoop Connection Creator" schema="schema/hadoopConnectionCreator.exsd"/>
   <extension-point id="artifact_handler" name="Artifact Repository Handler" schema="schema/artifact_handler.exsd"/>
   <extension-point id="actionFilterDelegate" name="Action Filter delegate" schema="schema/actionFilterDelegate.exsd"/>
-   <extension
-         point="org.eclipse.ui.views">
-               <category
-            id="org.talend.core.root"
-            name="Talend"/>
-   </extension>

      <extension
         point="org.talend.core.runtime.repositoryComponent_provider">
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/commons/utils/io/FilesUtils.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/commons/utils/io/FilesUtils.java
@@ -67,6 +67,7 @@ import org.talend.commons.utils.encoding.CharsetToolkit;
 import org.talend.commons.utils.network.NetworkUtil;
 import org.talend.core.model.metadata.builder.connection.FileConnection;
 import org.talend.core.model.repository.SVNConstant;
+import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -1048,7 +1049,7 @@ public class FilesUtils {
        if (file == null || !file.exists()) {
            return null;
        }
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilderFactory dbf = XmlUtils.getSecureDocumentBuilderFactory(false);
        DocumentBuilder db = dbf.newDocumentBuilder();
        Document domTree = db.parse(file);
        return domTree;
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/GlobalServiceRegister.java
+++ b/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);
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ILibraryManagerService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ILibraryManagerService.java
@@ -203,5 +203,7 @@ public interface ILibraryManagerService extends IService {
    public boolean isJarNeedToBeDeployed(File jarFile);

    public void checkModuleStatus(ModuleNeeded module);
+    
+    public String getJarNameFromMavenuri(String mavenURI);

 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/IRepositoryContextService.java
+++ b/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);

--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/PluginChecker.java
+++ b/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);
    }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/context/RepositoryContext.java
+++ b/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;
+    }
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabaseTypeName.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabaseTypeName.java
@@ -22,98 +22,105 @@ import org.talend.core.runtime.projectsetting.IProjectSettingPreferenceConstants
 */
 public enum EDatabaseTypeName {
    MYSQL(
-          "MySQL", "MySQL", Boolean.FALSE, "MYSQL", "MYSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "MySQL", "MySQL", Boolean.FALSE, "MYSQL", "MYSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    AMAZON_AURORA(
-                  "Amazon Aurora", "Amazon Aurora", Boolean.FALSE, "AMAZON_AURORA", "AMAZON_AURORA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "Amazon Aurora", "Amazon Aurora", Boolean.FALSE, "AMAZON_AURORA", "AMAZON_AURORA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    PSQL(
-         "PostgreSQL", "PostgreSQL", Boolean.TRUE, "POSTGRESQL", "POSTGRE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "PostgreSQL", "PostgreSQL", Boolean.TRUE, "POSTGRESQL", "POSTGRE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    PLUSPSQL(
-             "PostgresPlus", "PostgresPlus", Boolean.TRUE, "POSTGRESPLUS", "POSTGREPLUS", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "PostgresPlus", "PostgresPlus", Boolean.TRUE, "POSTGRESPLUS", "POSTGREPLUS", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    ORACLEFORSID(
-                 "ORACLE_SID", "Oracle with SID", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "ORACLE_SID", "Oracle with SID", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    ORACLESN(
-             "ORACLE_SERVICE_NAME", "Oracle with service name", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "ORACLE_SERVICE_NAME", "Oracle with service name", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    ORACLE_OCI(
-               "ORACLE_OCI", "Oracle OCI", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "ORACLE_OCI", "Oracle OCI", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    ORACLE_CUSTOM(
-                  "ORACLE_CUSTOM", "Oracle Custom", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$    
+            "ORACLE_CUSTOM", "Oracle Custom", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$    
    /**
     * @deprecated odbc is not supported in java8
     */
    GODBC(
-          "Generic ODBC", "Generic ODBC (Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Generic ODBC", "Generic ODBC (Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    /**
     * @deprecated odbc is not supported in java8
     */
    MSODBC(
-           "Microsoft SQL (Odbc driver)", "Microsoft SQL Server (Odbc driver, Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Microsoft SQL (Odbc driver)", "Microsoft SQL Server (Odbc driver, Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    IBMDB2(
-           "IBM DB2", "IBM DB2", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "IBM DB2", "IBM DB2", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    IBMDB2ZOS(
-              "IBM DB2 ZOS", "IBM DB2 ZOS", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "IBM DB2 ZOS", "IBM DB2 ZOS", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    SYBASEASE(
-              "SybaseASE", "Sybase (ASE and IQ)", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "SybaseASE", "Sybase (ASE and IQ)", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

    // this Sybase IQ not used.
    SYBASEIQ(
-             "Sybase IQ", "Sybase IQ", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Sybase IQ", "Sybase IQ", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    MSSQL(
-          "MSSQL", "Microsoft SQL Server", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "MSSQL", "Microsoft SQL Server", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    MSSQL05_08(
-               "MSSQL", "Microsoft SQL Server 2005/2008", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "MSSQL", "Microsoft SQL Server 2005/2008", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    // this don't use in Branch 2.0
-    HSQLDB("HSQLDB", "HSQLDB", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    HSQLDB(
+            "HSQLDB", "HSQLDB", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    HSQLDB_SERVER(
-                  "HSQLDB Server", "HSQLDB Server", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "HSQLDB Server", "HSQLDB Server", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    HSQLDB_WEBSERVER(
-                     "HSQLDB WebServer", "HSQLDB WebServer", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "HSQLDB WebServer", "HSQLDB WebServer", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    HSQLDB_IN_PROGRESS(
-                       "HSQLDB In-Process", "HSQLDB In-Process", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "HSQLDB In-Process", "HSQLDB In-Process", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-    JAVADB("JavaDB", "JavaDB", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    JAVADB(
+            "JavaDB", "JavaDB", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    INGRES(
-           "Ingres", "Ingres", Boolean.FALSE, "INGRES", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "INGRES"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Ingres", "Ingres", Boolean.FALSE, "INGRES", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "INGRES"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    INTERBASE(
-              "Interbase", "Interbase", Boolean.FALSE, "INTERBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INTERBASE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    SQLITE("SQLite", "SQLite", Boolean.FALSE, "SQLITE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "SQLITE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Interbase", "Interbase", Boolean.FALSE, "INTERBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INTERBASE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    SQLITE(
+            "SQLite", "SQLite", Boolean.FALSE, "SQLITE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "SQLITE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    FIREBIRD(
-             "FireBird", "FireBird", Boolean.FALSE, "FIREBIRD", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "FIREBIRD"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "FireBird", "FireBird", Boolean.FALSE, "FIREBIRD", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "FIREBIRD"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    INFORMIX(
-             "Informix", "Informix", Boolean.TRUE, "INFORMIX", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INFORMIX"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Informix", "Informix", Boolean.TRUE, "INFORMIX", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INFORMIX"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    VECTORWISE(
-               "VectorWise", "VectorWise", Boolean.FALSE, "VECTORWISE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
+            "VectorWise", "VectorWise", Boolean.FALSE, "VECTORWISE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$

    ACCESS(
-           "Access", "Access", Boolean.FALSE, "ACCESS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Default_Name), // "ACCESS"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Access", "Access", Boolean.FALSE, "ACCESS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Default_Name), // "ACCESS"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    TERADATA(
-             "Teradata", "Teradata", Boolean.TRUE, "TERADATA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "TERADATA"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    AS400("AS400", "AS400", Boolean.FALSE, "AS400", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Login), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Teradata", "Teradata", Boolean.TRUE, "TERADATA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "TERADATA"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    AS400(
+            "AS400", "AS400", Boolean.FALSE, "AS400", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Login), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

    JAVADB_EMBEDED(
-                   "JavaDB Embeded", "JavaDB Embeded", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "JavaDB Embeded", "JavaDB Embeded", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    JAVADB_JCCJDBC(
-                   "JavaDB JCCJDBC", "JavaDB JCCJDBC", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "JavaDB JCCJDBC", "JavaDB JCCJDBC", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    JAVADB_DERBYCLIENT(
-                       "JavaDB DerbyClient", "JavaDB DerbyClient", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "JavaDB DerbyClient", "JavaDB DerbyClient", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

    VERTICA(
            "Vertica", "Vertica", Boolean.TRUE, "VERTICA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-    MAXDB("MAXDB", "MaxDB", Boolean.FALSE, "MAXDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    MAXDB(
+            "MAXDB", "MaxDB", Boolean.FALSE, "MAXDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

    GREENPLUM(
-              "Greenplum", "Greenplum", Boolean.TRUE, "GREENPLUM", "GREENPLUM", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "Greenplum", "Greenplum", Boolean.TRUE, "GREENPLUM", "GREENPLUM", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    PARACCEL(
-             "ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
    NETEZZA(
            "Netezza", "Netezza", Boolean.FALSE, "NETEZZA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    SAS("SAS", "SAS", Boolean.TRUE, "SAS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
    // General JDBC not support schema defalut
    GENERAL_JDBC(
-                 "General JDBC", "General JDBC", Boolean.FALSE, "JDBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    EXASOL("Exasol", "Exasol", Boolean.TRUE, "Exasol", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "General JDBC", "General JDBC", Boolean.FALSE, "JDBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    EXASOL(
+            "Exasol", "Exasol", Boolean.TRUE, "Exasol", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

-    HIVE("Hive", "Hive", Boolean.FALSE, "HIVE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    HIVE(
+            "Hive", "Hive", Boolean.FALSE, "HIVE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

    SAPHana(
            "SAPHana", "SAPHana", Boolean.TRUE, "SAPHANA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -121,24 +128,23 @@ public enum EDatabaseTypeName {
    H2("H2", "H2", Boolean.FALSE, "H2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

    REDSHIFT(
-             "Redshift", "Redshift", Boolean.TRUE, "REDSHIFT", "REDSHIFT", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    REDSHIFT_SSO(
-                 "Redshift SSO", //$NON-NLS-1$
-                 "Redshift SSO", //$NON-NLS-1$
-                 Boolean.TRUE,
-                 "REDSHIFT", //$NON-NLS-1$
-                 "REDSHIFT SSO", //$NON-NLS-1$
-                 EDatabaseSchemaOrCatalogMapping.Sid,
-                 EDatabaseSchemaOrCatalogMapping.Schema),
+            "Redshift", "Redshift", Boolean.TRUE, "REDSHIFT", "REDSHIFT", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    REDSHIFT_SSO("Redshift SSO", //$NON-NLS-1$
+            "Redshift SSO", //$NON-NLS-1$
+            Boolean.TRUE,
+            "REDSHIFT", //$NON-NLS-1$
+            "REDSHIFT SSO", //$NON-NLS-1$
+            EDatabaseSchemaOrCatalogMapping.Sid,
+            EDatabaseSchemaOrCatalogMapping.Schema),

    IMPALA(
-           "IMPALA", "Impala", Boolean.TRUE, "IMPALA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
+            "IMPALA", "Impala", Boolean.TRUE, "IMPALA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 

    HBASE(
-          "HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

    MAPRDB(
-           "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

    // displayName is used in Java code.
    private String displayName;
@@ -322,11 +328,24 @@ public enum EDatabaseTypeName {
        boolean isSupport = true;

        if (EDatabaseTypeName.GODBC == this || EDatabaseTypeName.MSODBC == this) {
-            boolean isSupportODBC = CoreRuntimePlugin.getInstance().getProjectPreferenceManager()
-                    .getBoolean(IProjectSettingPreferenceConstants.METADATA_DBCONNECTION_ODBC_ENABLE);
+            boolean isSupportODBC =
+                    CoreRuntimePlugin
+                            .getInstance()
+                            .getProjectPreferenceManager()
+                            .getBoolean(IProjectSettingPreferenceConstants.METADATA_DBCONNECTION_ODBC_ENABLE);
            isSupport = isSupportODBC;
        }

        return isSupport;
    }
+
+    /**
+     * Getter for dbType.
+     * 
+     * @return the dbType
+     */
+    public String getDbType() {
+        return this.dbType;
+    }
+
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/ConnParameterKeys.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/ConnParameterKeys.java
@@ -271,4 +271,35 @@ public class ConnParameterKeys {
    public static final String CONN_PARA_KEY_DEFINE_PATH_TO_GOOGLE_CREDENTIALS = "CONN_PARA_KEY_DEFINE_PATH_TO_GOOGLE_CREDENTIALS"; //$NON-NLS-1$

    public static final String CONN_PARA_KEY_PATH_TO_GOOGLE_CREDENTIALS = "CONN_PARA_KEY_PATH_TO_GOOGLE_CREDENTIALS"; //$NON-NLS-1$
+    
+    /** Qubole */
+    public static final String CONN_PARA_KEY_QUBOLE_API_TOKEN = "CONN_PARA_KEY_QUBOLE_API_TOKEN";
+
+    public static final String CONN_PARA_KEY_QUBOLE_CLUSTER = "CONN_PARA_KEY_QUBOLE_CLUSTER";
+
+    public static final String CONN_PARA_KEY_QUBOLE_CLUSTER_LABEL = "CONN_PARA_KEY_QUBOLE_CLUSTER_LABEL";
+
+    public static final String CONN_PARA_KEY_QUBOLE_ENDPOINT = "CONN_PARA_KEY_QUBOLE_ENDPOINT";
+
+    public static final String CONN_PARA_KEY_QUBOLE_ENDPOINT_URL = "CONN_PARA_KEY_QUBOLE_ENDPOINT_URL";
+
+    public static final String CONN_PARA_KEY_QUBOLE_S3_ACCESS_KEY = "CONN_PARA_KEY_QUBOLE_S3_ACCESS_KEY";
+
+    public static final String CONN_PARA_KEY_QUBOLE_S3_SECRET_KEY = "CONN_PARA_KEY_QUBOLE_S3_SECRET_KEY";
+
+    public static final String CONN_PARA_KEY_QUBOLE_S3_BUCKET_NAME = "CONN_PARA_KEY_QUBOLE_S3_BUCKET_NAME";
+
+    public static final String CONN_PARA_KEY_QUBOLE_S3_BUCKET_KEY = "CONN_PARA_KEY_QUBOLE_S3_BUCKET_KEY";
+
+    public static final String CONN_PARA_KEY_QUBOLE_S3_REGION = "CONN_PARA_KEY_QUBOLE_S3_REGION";
+    
+    /**DataBricks*/
+    public static final String CONN_PARA_KEY_DATABRICKS_ENDPOINT="CONN_PARA_KEY_DATABRICKS_ENDPOINT";
+    
+    public static final String CONN_PARA_KEY_DATABRICKS_CLUSTER_ID="CONN_PARA_KEY_DATABRICKS_CLUSTER_ID";
+    
+    public static final String CONN_PARA_KEY_DATABRICKS_TOKEN="CONN_PARA_KEY_DATABRICKS_TOKEN";
+    
+    public static final String CONN_PARA_KEY_DATABRICKS_DBFS_DEP_FOLDER="CONN_PARA_KEY_DATABRICKS_DBFS_DEP_FOLDER";
+    
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/template/EDatabaseConnTemplate.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/template/EDatabaseConnTemplate.java
@@ -93,30 +93,30 @@ public enum EDatabaseConnTemplate {
            "jdbc:sybase:Tds:<host>:<port>/<sid>?<property>", //$NON-NLS-1$ 
            "5001")), //$NON-NLS-1$
    SYBASEASE_16_SA(new DbConnStr(EDatabaseTypeName.SYBASEASE, //
-            "jdbc:sqlanywhere:Host=<host>:<port>;DatabaseName=<sid>", //$NON-NLS-1$ 
+            "jdbc:sqlanywhere:Host=<host>:<port>;DatabaseName=<sid>;<property>", //$NON-NLS-1$
            "2638")), //$NON-NLS-1$
    IBMDB2(new DbConnStr(EDatabaseTypeName.IBMDB2, //
-            "jdbc:db2://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:db2://<host>:<port>/<sid>:<property>", //$NON-NLS-1$
            "50000")), //$NON-NLS-1$

    IBMDB2_ZOS(new DbConnStr(EDatabaseTypeName.IBMDB2ZOS, //
-            "jdbc:db2://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:db2://<host>:<port>/<sid>:<property>", //$NON-NLS-1$
            "557")), //$NON-NLS-1$

    SQLITE(new DbConnStr(EDatabaseTypeName.SQLITE, //
            "jdbc:sqlite:/<filename>")), //$NON-NLS-1$

    INGRES(new DbConnStr(EDatabaseTypeName.INGRES, //
-            "jdbc:ingres://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
            "II7")), //$NON-NLS-1$
    VECTORWISE(new DbConnStr(EDatabaseTypeName.VECTORWISE, //
-            "jdbc:ingres://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
            "II7")), //$NON-NLS-1$
    INTERBASE(new DbConnStr(EDatabaseTypeName.INTERBASE, //
-            "jdbc:interbase://<host>/<sid>")), //$NON-NLS-1$
+            "jdbc:interbase://<host>/<sid>?<property>")), //$NON-NLS-1$

    FIREBIRD(new DbConnStr(EDatabaseTypeName.FIREBIRD, //
-            "jdbc:firebirdsql:<host>/<port>:<filename>", //$NON-NLS-1$
+            "jdbc:firebirdsql:<host>/<port>:<filename>?<property>", //$NON-NLS-1$
            "3050")), //$NON-NLS-1$

    INFORMIX(new DbConnStr(EDatabaseTypeName.INFORMIX, //
@@ -134,22 +134,22 @@ public enum EDatabaseConnTemplate {
            "prompt=false")), //$NON-NLS-1$

    JAVADB_EMBEDED(new DbConnStr(EDatabaseTypeName.JAVADB_EMBEDED, //
-            "jdbc:derby:<dbRootPath>")), //$NON-NLS-1$
+            "jdbc:derby:<dbRootPath>;<property>")), //$NON-NLS-1$

    JAVADB_JCCJDBC(new DbConnStr(EDatabaseTypeName.JAVADB_JCCJDBC, //
-            "jdbc:derby:net://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:derby:net://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
            "1527")), //$NON-NLS-1$

    JAVADB_DERBYCLIENT(new DbConnStr(EDatabaseTypeName.JAVADB_DERBYCLIENT, //
-            "jdbc:derby://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:derby://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
            "1527")), //$NON-NLS-1$

    HSQLDB_SERVER(new DbConnStr(EDatabaseTypeName.HSQLDB_SERVER, //
-            "jdbc:hsqldb:hsql://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:hsqldb:hsql://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
            "9001")), //$NON-NLS-1$

    HSQLDB_WEBSERVER(new DbConnStr(EDatabaseTypeName.HSQLDB_WEBSERVER, //
-            "jdbc:hsqldb:http://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:hsqldb:http://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
            "9001")), //$NON-NLS-1$

    HSQLDB_IN_PROGRESS(new DbConnStr(EDatabaseTypeName.HSQLDB_IN_PROGRESS, //
@@ -157,7 +157,7 @@ public enum EDatabaseConnTemplate {
            null, "ifexists=true")), //$NON-NLS-1$

    MAXDB(new DbConnStr(EDatabaseTypeName.MAXDB, //
-            "jdbc:sapdb://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:sapdb://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
            "7210")), //$NON-NLS-1$

    SAS(new DbConnStr(EDatabaseTypeName.SAS, //
@@ -170,11 +170,11 @@ public enum EDatabaseConnTemplate {
            "")), //$NON-NLS-1$

    PARACCEL(new DbConnStr(EDatabaseTypeName.PARACCEL, //
-            "jdbc:paraccel://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:paraccel://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
            "5439")), //$NON-NLS-1$

    REDSHIFT(new DbConnStr(EDatabaseTypeName.REDSHIFT, //
-            "jdbc:redshift://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:redshift://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
            "5439",//$NON-NLS-1$
            "")), //$NON-NLS-1$
    REDSHIFT_SSO(new DbConnStr(EDatabaseTypeName.REDSHIFT_SSO, //
@@ -182,7 +182,7 @@ public enum EDatabaseConnTemplate {
            "5439",//$NON-NLS-1$
            "")), //$NON-NLS-1$
    NETEZZA(new DbConnStr(EDatabaseTypeName.NETEZZA, //
-            "jdbc:netezza://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:netezza://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
            "5480")), //$NON-NLS-1$

    VERTICA(new DbConnStr(EDatabaseTypeName.VERTICA, //
@@ -306,7 +306,7 @@ public enum EDatabaseConnTemplate {
        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){
@@ -411,6 +411,20 @@ public enum EDatabaseConnTemplate {
            case PSQL:
            case PLUSPSQL:
            case GREENPLUM:
+            case PARACCEL:
+            case INGRES:
+            case VECTORWISE:
+            case INTERBASE:
+            case FIREBIRD:
+            case JAVADB_EMBEDED:
+            case JAVADB_JCCJDBC:
+            case JAVADB_DERBYCLIENT:
+            case MAXDB:
+            case IBMDB2:
+            case IBMDB2_ZOS:
+            case HSQLDB_SERVER:
+            case HSQLDB_WEBSERVER:
+            case NETEZZA:
                return true;
            default:
            }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java
@@ -64,7 +64,7 @@ public enum EDatabaseVersion4Drivers {
    SQLITE(new DbVersion4Drivers(EDatabaseTypeName.SQLITE, "sqlitejdbc-v056.jar")), //$NON-NLS-1$
    FIREBIRD(new DbVersion4Drivers(EDatabaseTypeName.FIREBIRD, "jaybird-full-2.1.1.jar")), //$NON-NLS-1$
    TERADATA(new DbVersion4Drivers(EDatabaseTypeName.TERADATA,
-            new String[] { "terajdbc4-15.10.00.14.jar", "tdgssconfig-15.10.00.14.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            new String[] { "terajdbc4-16.20.00.02.jar", "tdgssconfig-16.20.00.02.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
    JAVADB_DERBYCLIENT(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_DERBYCLIENT, "derbyclient.jar")), //$NON-NLS-1$
    NETEZZA(new DbVersion4Drivers(EDatabaseTypeName.NETEZZA, "nzjdbc.jar")), //$NON-NLS-1$
    INFORMIX(new DbVersion4Drivers(EDatabaseTypeName.INFORMIX, "ifxjdbc.jar")), //$NON-NLS-1$
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/BigDataBasicUtil.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/BigDataBasicUtil.java
@@ -16,12 +16,15 @@ import java.util.Collection;
 import java.util.HashSet;

 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.common.util.EMap;
+import org.talend.commons.exception.CommonExceptionHandler;
 import org.talend.commons.exception.ExceptionHandler;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.Property;
 import org.talend.core.runtime.hd.IDynamicDistributionManager;
+import org.talend.core.runtime.i18n.Messages;

 /**
 * created by cmeng on Jul 20, 2015 Detailled comment
@@ -48,42 +51,61 @@ public class BigDataBasicUtil {
        return null;
    }

-    public static void reloadAllDynamicDistributions(IProgressMonitor monitor) {
+    private static IDynamicDistributionManager getDynamicDistributionManager(IProgressMonitor monitor) throws Exception {
        if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopDistributionService.class)) {
            IHadoopDistributionService hdService = (IHadoopDistributionService) GlobalServiceRegister.getDefault()
                    .getService(IHadoopDistributionService.class);
            if (hdService != null) {
-                IDynamicDistributionManager ddManager = hdService.getDynamicDistributionManager();
-                if (ddManager != null && ddManager.isLoaded()) {
-                    try {
-                        ddManager.reloadAllDynamicDistributions(monitor);
-                    } catch (Exception e) {
-                        ExceptionHandler.process(e);
-                    }
-                }
+                return hdService.getDynamicDistributionManager();
            }
        }
+        return null;
+    }
+
+    public static boolean isDynamicDistributionLoaded(IProgressMonitor monitor) throws Exception {
+        IDynamicDistributionManager dynDistriManager = getDynamicDistributionManager(monitor);
+        if (dynDistriManager != null) {
+            return dynDistriManager.isLoaded();
+        } else {
+            return false;
+        }
+    }
+
+    public static void loadDynamicDistribution(IProgressMonitor monitor) throws Exception {
+        IDynamicDistributionManager ddManager = getDynamicDistributionManager(monitor);
+        if (ddManager != null) {
+            ddManager.load(monitor, false);
+        } else {
+            CommonExceptionHandler
+                    .warn(Messages.getString("BigDataBasicUtil.loadDynamicDistribution.IDynamicDistributionManager.notFound", //$NON-NLS-1$
+                            IDynamicDistributionManager.class.getSimpleName()));
+        }
+    }
+
+    public static void reloadAllDynamicDistributions(IProgressMonitor monitor) {
+        try {
+            IDynamicDistributionManager ddManager = getDynamicDistributionManager(monitor);
+            if (ddManager != null && ddManager.isLoaded()) {
+                ddManager.reloadAllDynamicDistributions(monitor);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        }
    }

    public static Collection<String> getDynamicDistributionPaths() {
-        // if (dynamicDistributionPaths == null || dynamicDistributionPaths.isEmpty()) {
        Collection<String> dynamicDistributionPaths = new HashSet<>();
-        IDynamicDistributionManager ddManager = null;
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopDistributionService.class)) {
-            IHadoopDistributionService hdService = (IHadoopDistributionService) GlobalServiceRegister.getDefault()
-                    .getService(IHadoopDistributionService.class);
-            if (hdService != null) {
-                ddManager = hdService.getDynamicDistributionManager();
-                if (ddManager != null) {
-                    String dynamicDistrPath = ddManager.getUserStoragePath();
-                    dynamicDistributionPaths.add(dynamicDistrPath);
-                    Collection<String> preferencePaths = ddManager.getPreferencePaths();
-                    dynamicDistributionPaths.addAll(preferencePaths);
-                }
+        try {
+            IDynamicDistributionManager ddManager = getDynamicDistributionManager(new NullProgressMonitor());
+            if (ddManager != null) {
+                String dynamicDistrPath = ddManager.getUserStoragePath();
+                dynamicDistributionPaths.add(dynamicDistrPath);
+                Collection<String> preferencePaths = ddManager.getPreferencePaths();
+                dynamicDistributionPaths.addAll(preferencePaths);
            }
-
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
        }
-        // }
        return dynamicDistributionPaths;
    }

@@ -98,21 +120,15 @@ public class BigDataBasicUtil {
        }
        return false;
    }
-    
+
    public static String getDynamicDistributionCacheVersion() {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IHadoopDistributionService.class)) {
-            IHadoopDistributionService hdService = (IHadoopDistributionService) GlobalServiceRegister.getDefault()
-                    .getService(IHadoopDistributionService.class);
-            if (hdService != null) {
-                IDynamicDistributionManager ddManager = hdService.getDynamicDistributionManager();
-                if (ddManager != null && ddManager.isLoaded()) {
-                    try {
-                       return ddManager.getDynamicDistributionCacheVersion();
-                    } catch (Exception e) {
-                        ExceptionHandler.process(e);
-                    }
-                }
+        try {
+            IDynamicDistributionManager ddManager = getDynamicDistributionManager(new NullProgressMonitor());
+            if (ddManager != null && ddManager.isLoaded()) {
+                return ddManager.getDynamicDistributionCacheVersion();
            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
        }
        return null;
    }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopProperties.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopProperties.java
@@ -101,7 +101,22 @@ public enum EHadoopProperties {
    HD_AZURE_DEPLOYBOLB,

    HD_JOB_RESULT_FOLDER,
-    ;
+    
+    QUBOLE_API_TOKEN,
+    QUBOLE_CLUSTER,
+    QUBOLE_CLUSTER_LABEL,
+    QUBOLE_ENDPOINT,
+    QUBOLE_ENDPOINT_URL,
+    QUBOLE_S3_ACCESS_KEY,
+    QUBOLE_S3_SECRET_KEY,
+    QUBOLE_S3_BUCKET_NAME,
+    QUBOLE_S3_BUCKET_KEY,
+    QUBOLE_S3_REGION,
+
+    DATABRICKS_ENDPOINT,
+    DATABRICKS_CLUSTER_ID,
+    DATABRICKS_TOKEN,
+    DATABRICKS_DBFS_DEP_FOLDER;

    public String getName() {
        return this.name();
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/custom/HadoopCustomLibrariesUtil.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/custom/HadoopCustomLibrariesUtil.java
@@ -47,6 +47,8 @@ import org.talend.core.ILibraryManagerService;
 import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.repository.ProjectManager;
+import org.talend.utils.files.FileUtils;
+import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -57,9 +59,6 @@ import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;

-import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
-
 /**
 * created by wchen on 2013-3-27 Detailled comment
 * 
@@ -188,7 +187,7 @@ public class HadoopCustomLibrariesUtil {
            Map<File, IPath> toExport) throws Exception {
        OutputStreamWriter output = null;
        try {
-            final DocumentBuilderFactory docBuilder = DocumentBuilderFactory.newInstance();
+            final DocumentBuilderFactory docBuilder = XmlUtils.getSecureDocumentBuilderFactory();
            String indexFileName = "index.xml";//$NON-NLS-1$
            File indexFile = new File(tempFolder, indexFileName);
            final DocumentBuilder analyseur = docBuilder.newDocumentBuilder();
@@ -238,14 +237,15 @@ public class HadoopCustomLibrariesUtil {

            // save index
            if (document != null) {
-                XMLSerializer serializer = new XMLSerializer();
-                OutputFormat outputFormat = new OutputFormat();
-                outputFormat.setIndenting(true);
-                serializer.setOutputFormat(outputFormat);
+//                XMLSerializer serializer = new XMLSerializer();
+//                OutputFormat outputFormat = new OutputFormat();
+//                outputFormat.setIndenting(true);
+//                serializer.setOutputFormat(outputFormat);

                output = new OutputStreamWriter(new FileOutputStream(indexFile), "UTF-8"); //$NON-NLS-1$
-                serializer.setOutputCharStream(output);
-                serializer.serialize(document);
+//                serializer.setOutputCharStream(output);
+//                serializer.serialize(document);
+                FileUtils.writeXMLFile(document, output);
                toExport.put(indexFile.getAbsoluteFile(), new Path(indexFileName));
            }
        } finally {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ConnectionBean.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ConnectionBean.java
@@ -54,6 +54,8 @@ public class ConnectionBean implements Cloneable {

    private Map<String, String> dynamicFields = new HashMap<String, String>();

+    private static final String TOKEN = "token"; //$NON-NLS-1$
+
    /**
     * DOC smallet ConnectionBean constructor comment.
     */
@@ -281,6 +283,25 @@ public class ConnectionBean implements Cloneable {
        }
    }

+    public boolean isToken() {
+        try {
+            if (conDetails.has(TOKEN)) {
+                return (Boolean) conDetails.get(TOKEN);
+            }
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+        return false;
+    }
+
+    public void setToken(boolean token) {
+        try {
+            conDetails.put(TOKEN, token);
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
    @Override
    public ConnectionBean clone() throws CloneNotSupportedException {
        return writeFromJSON(this.getConDetails());
@@ -303,6 +324,7 @@ public class ConnectionBean implements Cloneable {
            toReturn.setPassword(st[i++]);
            toReturn.setWorkSpace(st[i++]);
            toReturn.setComplete(new Boolean(st[i++]));
+            toReturn.setToken(new Boolean(st[i++]));
            JSONObject dynamicJson = new JSONObject();
            toReturn.getConDetails().put(DYNAMICFIELDS, dynamicJson);
            while (i < st.length) {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ModuleNeeded.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ModuleNeeded.java
@@ -434,9 +434,9 @@ public class ModuleNeeded {
        if (this.getModuleLocaion() != null) {
            hashCode *= this.getModuleLocaion().hashCode();
        }
-
-        hashCode *= this.getDefaultMavenURI().hashCode();
-
+        if(this.getDefaultMavenURI() != null){
+            hashCode *= this.getDefaultMavenURI().hashCode();
+        }
        return hashCode;
    }

@@ -519,8 +519,16 @@ public class ModuleNeeded {
        }

        // maven uri
-        if (!other.getDefaultMavenURI().equals(this.getDefaultMavenURI())) {
-            return false;
+        if (other.getDefaultMavenURI() == null) {
+            if (this.getDefaultMavenURI() != null) {
+                return false;
+            }
+        } else {
+            if (this.getDefaultMavenURI() == null) {
+                return false;
+            } else if (!other.getDefaultMavenURI().equals(this.getDefaultMavenURI())) {
+                return false;
+            }
        }

        return true;
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MappingFileLoader.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MappingFileLoader.java
@@ -31,6 +31,7 @@ import org.talend.core.model.metadata.types.DBTypeUtil;
 import org.talend.core.model.metadata.types.JavaType;
 import org.talend.core.model.metadata.types.JavaTypesManager;
 import org.talend.core.runtime.i18n.Messages;
+import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -77,7 +78,7 @@ public class MappingFileLoader {
        StringBuffer stringBuff = new StringBuffer();

        try {
-            DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory documentBuilderFactory = XmlUtils.getSecureDocumentBuilderFactory();
            DocumentBuilder analyser = documentBuilderFactory.newDocumentBuilder();
            Document document = analyser.parse(file);
            stringBuff.append("language=" + codeLanguage + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MappingTypeRetriever.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MappingTypeRetriever.java
@@ -16,6 +16,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;

 import org.apache.commons.collections.MultiMap;
@@ -334,7 +335,7 @@ public class MappingTypeRetriever {
        return mappingType.getDbType();

    }
-
+    
    /**
     * Getter for the current loaded dbms.
     * 
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataSchema.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataSchema.java
@@ -16,6 +16,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -37,6 +38,8 @@ import org.talend.core.model.metadata.builder.connection.ConnectionFactory;
 import org.talend.core.model.metadata.builder.connection.SchemaTarget;
 import org.talend.core.model.metadata.types.PerlTypesManager;
 import org.talend.cwm.helper.TaggedValueHelper;
+import org.talend.utils.files.FileUtils;
+import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -46,10 +49,8 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
-import orgomg.cwm.objectmodel.core.TaggedValue;

-import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
+import orgomg.cwm.objectmodel.core.TaggedValue;

 /**
 * Metadata Schema.
@@ -280,7 +281,7 @@ public class MetadataSchema {
        final List<org.talend.core.model.metadata.builder.connection.MetadataColumn> listColumns = new ArrayList<org.talend.core.model.metadata.builder.connection.MetadataColumn>();
        String dbmsId = null;
        if (file != null) {
-            final DocumentBuilderFactory fabrique = DocumentBuilderFactory.newInstance();
+            final DocumentBuilderFactory fabrique = XmlUtils.getSecureDocumentBuilderFactory();

            final Bundle b = Platform.getBundle(CORE_RUNTIME_PLUGIN_ID);
            final URL url = FileLocator.toFileURL(FileLocator.find(b, new Path(SCHEMA_XSD), null));
@@ -671,9 +672,9 @@ public class MetadataSchema {
            }

            // use specific Xerces class to write DOM-data to a file:
-            XMLSerializer serializer = new XMLSerializer();
-            serializer.setOutputCharStream(new java.io.FileWriter(file));
-            serializer.serialize(document);
+            Writer writer = new java.io.FileWriter(file);
+            FileUtils.writeXMLFile(document, writer);
+            writer.close();
            return true;
        }
        return false;
@@ -862,10 +863,7 @@ public class MetadataSchema {
            return;
        }
        // use specific Xerces class to write DOM-data to a file:
-        XMLSerializer serializer = new XMLSerializer();
-        OutputFormat outputFormat = new OutputFormat();
-        outputFormat.setIndenting(true);
-        serializer.setOutputFormat(outputFormat);
+

        // java.io.FileWriter fileWriter = new java.io.FileWriter(file);
        // serializer.setOutputCharStream(fileWriter);
@@ -884,9 +882,7 @@ public class MetadataSchema {
        // fileWriter.close();
        // fileWriter = null;
        OutputStreamWriter output = new OutputStreamWriter(new FileOutputStream(file), "UTF-8"); //$NON-NLS-1$
-        serializer.setOutputCharStream(output);
-        serializer.serialize(document);
+        FileUtils.writeXMLFile(document, output);
        output.close();
-
    }
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataTable.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataTable.java
@@ -153,7 +153,7 @@ public class MetadataTable implements IMetadataTable, Cloneable {
            List<IMetadataColumn> temp = new ArrayList<IMetadataColumn>();
            temp.addAll(this.listColumns);
            temp.addAll(this.unusedColumns);
-            if (isRepository && originalColumns != null) {
+            if (originalColumns != null) {
                Collections.sort(temp, new Comparator<IMetadataColumn>() {

                    @Override
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataTalendType.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataTalendType.java
@@ -53,6 +53,7 @@ import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.core.utils.TalendQuoteUtils;
 import org.talend.repository.ProjectManager;
+import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -218,7 +219,7 @@ public final class MetadataTalendType {
        defaultvalue = new HashMap<String, Map<String, String>>();

        try {
-            DocumentBuilderFactory fabrique = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory fabrique = XmlUtils.getSecureDocumentBuilderFactory();
            DocumentBuilder analyseur = fabrique.newDocumentBuilder();

            Bundle b = Platform.getBundle(CoreRuntimePlugin.PLUGIN_ID);
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataToolAvroHelper.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataToolAvroHelper.java
@@ -213,6 +213,7 @@ public final class MetadataToolAvroHelper {
            //ignore it now as we can't process the complex expression for the default value, and the default value is not useful for runtime like the old javajet tjdbcxxx
            //TODO support the expression calculate, not sure it's necessary and sometimes, more complex like globalMap.get(xxx) which only have meaning after running the job.
            ExceptionHandler.process(e, Level.WARN);
+            defaultValue = null;
        }

        // Types with Document/Unknown elements, store as binary
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataToolHelper.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataToolHelper.java
@@ -614,7 +614,12 @@ public final class MetadataToolHelper {
        target.getListColumns().addAll(columnsTAdd);
        target.sortCustomColumns();
        target.setLabel(source.getLabel());
-        target.setOriginalColumns(source.getOriginalColumns());
+        List<String> originalColumnsList = null;
+        if (source.getOriginalColumns() != null) {
+            originalColumnsList = new ArrayList<String>();
+            originalColumnsList.addAll(source.getOriginalColumns());
+        }
+        target.setOriginalColumns(originalColumnsList);
        Map<String, String> targetProperties = target.getAdditionalProperties();
        Map<String, String> sourceProperties = source.getAdditionalProperties();
        for (Entry<String, String> entry : sourceProperties.entrySet()) {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/types/JavaTypesManager.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/types/JavaTypesManager.java
@@ -94,8 +94,8 @@ public final class JavaTypesManager {

    public static final JavaType PASSWORD = new JavaType(String.class, true, "Password"); //$NON-NLS-1$

-    public static final JavaType[] JAVA_TYPES = new JavaType[] { BOOLEAN, BYTE, BYTE_ARRAY, CHARACTER, DATE, DOUBLE, FLOAT,
-            BIGDECIMAL, INTEGER, LONG, OBJECT, SHORT, STRING, LIST };
+    public static final JavaType[] JAVA_TYPES = new JavaType[] { BOOLEAN, BYTE, BYTE_ARRAY, CHARACTER, DATE, DOUBLE,
+            FLOAT, BIGDECIMAL, INTEGER, LONG, OBJECT, SHORT, STRING, LIST };

    private static Map<String, Map<String, List<DBTypeUtil>>> javaTypeMappingFromExtension;

@@ -144,12 +144,16 @@ public final class JavaTypesManager {
                    for (IConfigurationElement configurationElement : configurationElements) {
                        try {
                            String className = configurationElement.getAttribute("nullableClass");
-                            Class myClass = Platform.getBundle(configurationElement.getContributor().getName()).loadClass(
-                                    className);
-                            boolean isGenerateWithCanonicalName = configurationElement.getAttribute("generateWithCanonicalName") == null ? false
-                                    : Boolean.valueOf(configurationElement.getAttribute("generateWithCanonicalName"));
-                            boolean isObjectBased = configurationElement.getAttribute("objectBased") == null ? false : Boolean
-                                    .valueOf(configurationElement.getAttribute("objectBased"));
+                            Class myClass =
+                                    Platform.getBundle(configurationElement.getContributor().getName()).loadClass(
+                                            className);
+                            boolean isGenerateWithCanonicalName =
+                                    configurationElement.getAttribute("generateWithCanonicalName") == null ? false
+                                            : Boolean.valueOf(configurationElement
+                                                    .getAttribute("generateWithCanonicalName"));
+                            boolean isObjectBased =
+                                    configurationElement.getAttribute("objectBased") == null ? false : Boolean
+                                            .valueOf(configurationElement.getAttribute("objectBased"));
                            JavaType javaType = new JavaType(myClass, isGenerateWithCanonicalName, isObjectBased);
                            addJavaType(javaType);

@@ -160,14 +164,18 @@ public final class JavaTypesManager {
                                IConfigurationElement[] dbTypeElements = dbMappingElement.getChildren();
                                List<DBTypeUtil> dbTypes = new ArrayList<DBTypeUtil>();
                                for (IConfigurationElement dbTypeElement : dbTypeElements) {
-                                    boolean isDefault = dbTypeElement.getAttribute("default") == null ? false : Boolean
-                                            .valueOf(dbTypeElement.getAttribute("default"));
-                                    boolean isIgnoreLen = dbTypeElement.getAttribute("ignoreLen") == null ? false : Boolean
-                                            .valueOf(dbTypeElement.getAttribute("ignoreLen"));
-                                    boolean isIgnorePre = dbTypeElement.getAttribute("ignorePre") == null ? false : Boolean
-                                            .valueOf(dbTypeElement.getAttribute("ignorePre"));
-                                    DBTypeUtil dbType = new DBTypeUtil(dbTypeElement.getAttribute("DbType"), isDefault,
-                                            isIgnoreLen, isIgnorePre);
+                                    boolean isDefault =
+                                            dbTypeElement.getAttribute("default") == null ? false : Boolean
+                                                    .valueOf(dbTypeElement.getAttribute("default"));
+                                    boolean isIgnoreLen =
+                                            dbTypeElement.getAttribute("ignoreLen") == null ? false : Boolean
+                                                    .valueOf(dbTypeElement.getAttribute("ignoreLen"));
+                                    boolean isIgnorePre =
+                                            dbTypeElement.getAttribute("ignorePre") == null ? false : Boolean
+                                                    .valueOf(dbTypeElement.getAttribute("ignorePre"));
+                                    DBTypeUtil dbType =
+                                            new DBTypeUtil(dbTypeElement.getAttribute("DbType"), isDefault,
+                                                    isIgnoreLen, isIgnorePre);
                                    dbTypes.add(dbType);
                                }
                                dbAndDBType.put(mappingId, dbTypes);
@@ -519,16 +527,16 @@ public final class JavaTypesManager {
    /**
     * the numerical types with id_.
     */
-    public final static String[] NUMBERS = new String[] { JavaTypesManager.INTEGER.getId(), JavaTypesManager.FLOAT.getId(),
-            JavaTypesManager.DOUBLE.getId(), JavaTypesManager.LONG.getId(), JavaTypesManager.SHORT.getId(),
-            JavaTypesManager.BIGDECIMAL.getId(), JavaTypesManager.BYTE.getId() };
+    public final static String[] NUMBERS = new String[] { JavaTypesManager.INTEGER.getId(),
+            JavaTypesManager.FLOAT.getId(), JavaTypesManager.DOUBLE.getId(), JavaTypesManager.LONG.getId(),
+            JavaTypesManager.SHORT.getId(), JavaTypesManager.BIGDECIMAL.getId(), JavaTypesManager.BYTE.getId() };

    public static boolean isNumber(String type) {
        return ArrayUtils.contains(NUMBERS, type);
    }

    public static boolean isString(String type) {
-        return JavaTypesManager.STRING.getId().equals(type);
+        return JavaTypesManager.STRING.getId().equals(type) || JavaTypesManager.CHARACTER.getId().equals(type);
    }

    public static boolean isBoolean(String type) {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/types/TypesManager.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/types/TypesManager.java
@@ -77,6 +77,9 @@ public class TypesManager {
        return MetadataTalendType.getMappingTypeRetriever(dbms).getDefaultSelectedDbType(talendType);
    }

+    public static String getTalendTypeFromDBType(String dbms, String DBType) {
+        return MetadataTalendType.getMappingTypeRetriever(dbms).getDefaultSelectedTalendType(DBType);
+    }
    public static boolean checkDBType(String dbms, String talendType, String dbType) {
        MappingTypeRetriever mappingTypeRetriever = MetadataTalendType.getMappingTypeRetriever(dbms);
        return mappingTypeRetriever.isAdvicedTalendToDbType(talendType, dbType);
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/AbstractNode.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/AbstractNode.java
@@ -308,7 +308,8 @@ public abstract class AbstractNode implements INode {
                        return mapMerge.keySet().iterator().next().getSubProcessStartNode(withConditions);
                    }
                }
-                if ((getCurrentActiveLinksNbInput(EConnectionType.MAIN) == 0)) {
+                if ((getCurrentActiveLinksNbInput(EConnectionType.MAIN) == 0)
+                        && !checkIfCurrentActiveLinksIsLookup()) {
                    return this; // main branch here, so we got the correct sub
                                 // process start.
                }
@@ -327,6 +328,8 @@ public abstract class AbstractNode implements INode {

        for (IConnection connec : getIncomingConnections()) {
            if (((AbstractNode) connec.getSource()).isOnMainMergeBranch()) {
+                // with lookup, tMap incoming connection contains FLOW_MAIN and FLOW_REF,
+                // should take care of FLOW_MAIN only
                if (!connec.getLineStyle().equals(EConnectionType.FLOW_REF)) {
                    return connec.getSource().getSubProcessStartNode(withConditions);
                }
@@ -345,6 +348,27 @@ public abstract class AbstractNode implements INode {
        return nb;
    }

+    private boolean checkIfCurrentActiveLinksIsLookup() {
+        boolean flag = false;
+        int input = 0;
+        for (IConnection inConnection : getIncomingConnections()) {
+            // refer to DataProcess.checkFlowRefLink() added RUN_AFTER for incoming connection
+            if (inConnection.isActivate() && inConnection.getLineStyle().getId() == EConnectionType.RUN_AFTER.getId()) {
+                input++;
+            }
+        }
+        // check if run_after is for lookup
+        if (input > 0) {
+            for (IConnection outConnection : getOutgoingConnections()) {
+                if (outConnection.isActivate() && outConnection.getLineStyle().getId() == EConnectionType.FLOW_REF.getId()) {
+                    flag = true;
+                    break;
+                }
+            }
+        }
+        return flag;
+    }
+
    /*
     * (non-Javadoc)
     * 
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/BigDataNode.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/BigDataNode.java
@@ -29,13 +29,13 @@ import org.talend.core.model.metadata.MetadataTable;
 */
 public class BigDataNode extends AbstractNode implements IBigDataNode {

-    private boolean dummy = false;
+    protected boolean dummy = false;

-    private String outputType = null;
+    protected String outputType = null;

-    private String inputType = null;
+    protected String inputType = null;

-    private Map<String, List<IMetadataColumn>> keyList = new java.util.HashMap<String, List<IMetadataColumn>>();
+    protected Map<String, List<IMetadataColumn>> keyList = new HashMap<String, List<IMetadataColumn>>();

    /**
     * Default constructor for the BigDataNode
@@ -149,7 +149,7 @@ public class BigDataNode extends AbstractNode implements IBigDataNode {
        return "IDENTITY".equals(getRequiredInputType()) && "IDENTITY".equals(getRequiredOutputType()); //$NON-NLS-1$ //$NON-NLS-2$
    }

-    private IElementParameter getNodeElemForList(IElementParameter parTableNode) {
+    protected IElementParameter getNodeElemForList(IElementParameter parTableNode) {
        // Iterate over the table columns and make sure one of them is a COLUMN_LIST or a CHECKBOX.
        for (Object nodeItemList : parTableNode.getListItemsValue()) {
            if (((IElementParameter) nodeItemList).getFieldType().equals(EParameterFieldType.PREV_COLUMN_LIST)
@@ -161,7 +161,7 @@ public class BigDataNode extends AbstractNode implements IBigDataNode {
        return null;
    }

-    private IElementParameter getPartitionTableNode(IBigDataNode bigDataNode, String rootPartitionKey) {
+    protected IElementParameter getPartitionTableNode(IBigDataNode bigDataNode, String rootPartitionKey) {
        // if the partition key is valid, get the first element of the key, which must be a table.
        IElementParameter partitionTableNode = bigDataNode.getElementParameter(rootPartitionKey);
        if (partitionTableNode == null) {
@@ -346,4 +346,19 @@ public class BigDataNode extends AbstractNode implements IBigDataNode {
    public void addOutput(IConnection connection) {
        ((List<IConnection>) getOutgoingConnections()).add(connection);
    }
+    
+    @Override
+    public boolean shouldGenerateDatasetCode() {
+        return false;
+    }
+
+    @Override
+    public void loadDatasetConditions(){
+        // BigDataNode does not do anything related to Dataset, only anabled from SparkNode
+    }
+    
+    @Override
+    public void processDatasetConditions(){
+        // BigDataNode does not do anything related to Dataset, only anabled from SparkNode
+    }
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/EParameterFieldType.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/EParameterFieldType.java
@@ -119,6 +119,7 @@ public enum EParameterFieldType {
    TACOKIT_INPUT_SCHEMA,
    TACOKIT_GUESS_SCHEMA,
    TACOKIT_BUTTON,
+    TACOKIT_SUGGESTABLE_TABLE,
    TACOKIT_VALUE_SELECTION;

    public String getName() {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/Element.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/Element.java
@@ -187,8 +187,12 @@ public abstract class Element implements Cloneable, IElement {

    @Override
    public void setElementParameters(List<? extends IElementParameter> parameters) {
-        this.listParam.clear();
-        this.listParam.addAll(parameters);
+        listParam.removeListener(listenableListener);
+        listParam = new ListenableList<IElementParameter>(
+                new ArrayList<IElementParameter>());
+        listParam.addPostOperationListener(listenableListener);
+        listParam.clear();
+        listParam.addAll(parameters);
    }

    @Override
@@ -309,4 +313,13 @@ public abstract class Element implements Cloneable, IElement {

    }

+    /**
+     * <font color="red">Currently only used by junit</font>
+     * 
+     * @return
+     */
+    @Deprecated
+    protected Map<String, IElementParameter> getMapNameToParam() {
+        return mapNameToParam;
+    }
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/IBigDataNode.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/IBigDataNode.java
@@ -122,5 +122,24 @@ public interface IBigDataNode extends INode {
     * @param dummy true if this node has to be declared as a dummy, else false.
     */
    public void setDummy(boolean dummy);
+    
+    /**
+     * Returns if node will generate Dataset or RDD code.
+     * 
+     * @return a boolean telling if Dataset code will be generated.
+     */
+    public boolean shouldGenerateDatasetCode();
+
+    /**
+     * Method to load Dataset conditions.
+     */
+    public void loadDatasetConditions();
+    
+    /**
+     * Method to process previously loaded Dataset conditions and determine if Dataset code can be generated.
+     * 
+     * Loading and processing should be separated because conditions can be dependent on future component (in subjob order)
+     */
+    public void processDatasetConditions();

 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/IGenericElementParameter.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/process/IGenericElementParameter.java
@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.core.model.process;

+import org.talend.daikon.properties.property.Property;

 /**
 * DOC cmeng  class global comment. Detailled comment
@@ -20,4 +21,5 @@ public interface IGenericElementParameter extends IElementParameter {

    public void setAskPropagate(Boolean askPropagate);

+    public Property getProperty();
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/relationship/RelationshipItemBuilder.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/relationship/RelationshipItemBuilder.java
@@ -23,6 +23,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;

 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Level;
@@ -129,8 +130,6 @@ public class RelationshipItemBuilder {

    private Map<Relation, Set<Relation>> referencesItemsRelations;

-    private Map<String, String> hadoopItemReferences = new HashMap<String, String>();
-
    private boolean loaded = false;

    private boolean loading = false;
@@ -670,8 +669,8 @@ public class RelationshipItemBuilder {
            return;
        }
        loading = true;
-        currentProjectItemsRelations = new HashMap<Relation, Set<Relation>>();
-        referencesItemsRelations = new HashMap<Relation, Set<Relation>>();
+        currentProjectItemsRelations = new ConcurrentHashMap<Relation, Set<Relation>>();
+        referencesItemsRelations = new ConcurrentHashMap<Relation, Set<Relation>>();

        loadRelations(currentProjectItemsRelations, getAimProject());

@@ -1126,10 +1125,11 @@ public class RelationshipItemBuilder {
            Map<Relation, Set<Relation>> relations = handler.find(item);
            mergeRelationship(itemRelations, relations);
        }
-
-        if (oldProjectRelations != null) {
-            // check if there is any changes on the relations.
-            Set<Relation> newProjectRelations = currentProjectItemsRelations.get(relation);
+        // check if there is any changes on the relations.
+        Set<Relation> newProjectRelations = currentProjectItemsRelations.get(relation);
+        if (oldProjectRelations == null && newProjectRelations == null) {
+            relationsModified = false;
+        } else if (oldProjectRelations != null) {
            if (oldProjectRelations.size() == newProjectRelations.size()) {
                relationsModified = false;
                for (Relation newRelation : newProjectRelations) {
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/ContextParameterUtils.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/ContextParameterUtils.java
@@ -378,7 +378,7 @@ public final class ContextParameterUtils {
        String wordPattern = "\\b"; //$NON-NLS-1$
        pattern = wordPattern + replaceCharForRegex(prefix) + varPattern + wordPattern;
        if (pattern != null) {
-            Pattern regex = Pattern.compile(pattern, Pattern.CANON_EQ);
+            Pattern regex = Pattern.compile(pattern, Pattern.UNICODE_CHARACTER_CLASS);
            Matcher regexMatcher = regex.matcher(code);
            if (regexMatcher.find()) {
                try {
@@ -595,7 +595,11 @@ public final class ContextParameterUtils {
            if (ContextUtils.isJavaKeyWords(name)) {
                return false;
            }
-            return Pattern.matches(RepositoryConstants.CONTEXT_AND_VARIABLE_PATTERN, name);
+
+            Pattern regex = Pattern.compile(RepositoryConstants.CONTEXT_AND_VARIABLE_PATTERN, Pattern.UNICODE_CHARACTER_CLASS);
+            Matcher regexMatcher = regex.matcher(name);
+
+            return regexMatcher.matches();
        }
        return false;
    }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java
@@ -35,7 +35,7 @@ public final class TalendPropertiesUtil {
     * @return
     */
    public static boolean isHideExchange() {
-        return isEnabled("talend.hide.exchange"); //$NON-NLS-1$
+        return isEnabled("talend.hide.exchange") || isEnabled("talend.disable.internet"); //$NON-NLS-1$ //$NON-NLS-2$
    }

    /**
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/XSDValidater.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/XSDValidater.java
@@ -33,12 +33,11 @@ import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;

 import org.talend.core.runtime.i18n.Messages;
+import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.helpers.DefaultHandler;

-import com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl;
-
 /**
 * bqian Use xml xsd file to validate the xml file. <br/>
 * 
@@ -47,6 +46,8 @@ public class XSDValidater {

    File xsdFile = null;

+    private final String DISALLOW_DOCTYPE_DECL = "http://apache.org/xml/features/disallow-doctype-decl"; //$NON-NLS-1$
+
    /**
     * Sets the xsdFile.
     * 
@@ -73,7 +74,7 @@ public class XSDValidater {
     */
    public void validateWithDom(Reader xsd, Reader xml) throws Exception {
        // Load up the document
-        DocumentBuilderFactory factory = new DocumentBuilderFactoryImpl();
+        DocumentBuilderFactory factory = XmlUtils.getSecureDocumentBuilderFactory(true);
        factory.setNamespaceAware(true);
        // Set up an XML Schema validator, using the supplied schema
        Source schemaSource = new StreamSource(xsd);
@@ -99,6 +100,8 @@ public class XSDValidater {
     */
    public void validateWithSax(Reader xsd, Reader xml) throws Exception {
        SAXParserFactory spf = SAXParserFactory.newInstance();
+        spf.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+        spf.setFeature(DISALLOW_DOCTYPE_DECL, true);
        SAXParser parser = null;
        spf.setNamespaceAware(true);
        SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/xml/XmlArray.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/xml/XmlArray.java
@@ -24,6 +24,7 @@ import javax.xml.parsers.ParserConfigurationException;
 import org.talend.core.prefs.ITalendCorePrefConstants;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.i18n.Messages;
+import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -110,7 +111,7 @@ public class XmlArray {
    public static XmlArray createFrom(InputStream is) throws IOException, ParserConfigurationException, SAXException {
        XmlArray array = new XmlArray();

-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        DocumentBuilderFactory factory = XmlUtils.getSecureDocumentBuilderFactory();
        DocumentBuilder builder = factory.newDocumentBuilder();
        Document document = builder.parse(is);
        Node root = document.getFirstChild();
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/ArtifactRepositoryBean.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/ArtifactRepositoryBean.java
@@ -79,6 +79,11 @@ public class ArtifactRepositoryBean implements Cloneable {
                if (index > 0) {
                    nexusUrl = url.substring(0, index + ARTIFACT_MIDDLE_PATH.length());
                    repoId = StringUtilities.removeEndingString(url.substring(index + ARTIFACT_MIDDLE_PATH.length()), "/");
+                } else {
+                    // can be non-default contextpath or root
+                    String tempurl = StringUtilities.removeEndingString(url, "/");
+                    repoId = tempurl.substring(tempurl.lastIndexOf("/") + 1);
+                    nexusUrl = url.substring(0, url.indexOf(repoId));
                }
            }
            return new String[] { nexusUrl, repoId };
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/TalendMavenResolver.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/TalendMavenResolver.java
@@ -14,6 +14,7 @@ package org.talend.core.nexus;

 import java.io.File;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Dictionary;
 import java.util.Hashtable;

@@ -84,15 +85,18 @@ public class TalendMavenResolver {
            props = new Hashtable<String, String>();
        }
        final BundleContext context = CoreRuntimePlugin.getInstance().getBundle().getBundleContext();
-        ServiceReference<ManagedService> managedServiceRef = context.getServiceReference(ManagedService.class);
-        if (managedServiceRef != null) {
-            ManagedService managedService = context.getService(managedServiceRef);
+        Collection<ServiceReference<ManagedService>> managedServiceRefs = context.getServiceReferences(ManagedService.class,
+                "(service.pid=org.ops4j.pax.url.mvn)");
+        for (ServiceReference<ManagedService> managedServiceRef : managedServiceRefs) {
+            if (managedServiceRef != null) {
+                ManagedService managedService = context.getService(managedServiceRef);

-            managedService.updated(props);
-            talendResolverKey = resolverKey;
-            mavenResolver = null;
-        } else {
-            throw new RuntimeException("Failed to load the service :" + ManagedService.class.getCanonicalName()); //$NON-NLS-1$
+                managedService.updated(props);
+                talendResolverKey = resolverKey;
+                mavenResolver = null;
+            } else {
+                throw new RuntimeException("Failed to load the service :" + ManagedService.class.getCanonicalName()); //$NON-NLS-1$
+            }
        }

    }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/hd/IDynamicDistributionManager.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/hd/IDynamicDistributionManager.java
@@ -33,6 +33,8 @@ public interface IDynamicDistributionManager {

    public boolean isLoaded();

+    public void load(IProgressMonitor monitor, boolean resetModulesCache) throws Exception;
+
    public boolean isBuiltinDynamicDistribution(String dynamicDistributionId);

    public boolean isUsersDynamicDistribution(String dynamicDistributionId);
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/hd/hive/HiveMetadataHelper.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/hd/hive/HiveMetadataHelper.java
@@ -250,4 +250,7 @@ public class HiveMetadataHelper {
        return false;
    }

+    public static boolean isHiveWizardCheckEnabled(String hiveDistribution, String hiveVersion, boolean byDisplay) {
+        return doSupportMethod(hiveDistribution, hiveVersion, byDisplay, "isHiveWizardCheckEnabled");//$NON-NLS-1$
+    }
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages.properties
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/i18n/messages.properties
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/LastGenerationInfo.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/LastGenerationInfo.java
@@ -33,7 +33,7 @@ public class LastGenerationInfo {

    private HashMap<String, Set<ModuleNeeded>> modulesNeededWithSubjobPerJob;
    
-    private Set<ModuleNeeded> highPriorityModuleNeeded;
+    private HashMap<String, Set<ModuleNeeded>> highPriorityModuleNeeded;

    private HashMap<String, Set<String>> routinesNeededWithSubjobPerJob;

@@ -55,7 +55,7 @@ public class LastGenerationInfo {
        modulesNeededPerJob = new HashMap<String, Set<ModuleNeeded>>();
        contextPerJob = new HashMap<String, Set<String>>();
        modulesNeededWithSubjobPerJob = new HashMap<String, Set<ModuleNeeded>>();
-        highPriorityModuleNeeded = new LinkedHashSet<ModuleNeeded>();
+        highPriorityModuleNeeded = new HashMap<>();
        lastGeneratedjobs = new HashSet<JobInfo>();
        routinesNeededPerJob = new HashMap<String, Set<String>>();
        pigudfNeededPerJob = new HashMap<String, Set<String>>();
@@ -257,13 +257,29 @@ public class LastGenerationInfo {
        }
        return routinesNeededPerJob.get(key);
    }
-    
-    public Set<ModuleNeeded> getHighPriorityModuleNeeded() {
-        return highPriorityModuleNeeded;
+
+    public Set<ModuleNeeded> getHighPriorityModuleNeeded(String jobId, String jobVersion) {
+        String key = getProcessKey(jobId, jobVersion);
+        if (!highPriorityModuleNeeded.containsKey(key)) {
+            highPriorityModuleNeeded.put(key, new LinkedHashSet<>());
+        }
+        return highPriorityModuleNeeded.get(key);
    }
-    
-    public void setHighPriorityModuleNeeded(ModuleNeeded moduleNeeded) {
-        highPriorityModuleNeeded.add(moduleNeeded);
+
+    public void setHighPriorityModuleNeeded(String jobId, String jobVersion, Set<ModuleNeeded> moduleNeeded) {
+        String key = getProcessKey(jobId, jobVersion);
+        if (!highPriorityModuleNeeded.containsKey(key)) {
+            highPriorityModuleNeeded.put(key, new LinkedHashSet<>());
+        }
+        highPriorityModuleNeeded.get(key).addAll(moduleNeeded);
+    }
+
+    public void clearHighPriorityModuleNeeded() {
+        highPriorityModuleNeeded.clear();
+    }
+
+    private String getProcessKey(String jobId, String jobVersion) {
+        return jobId + "_" + jobVersion; //$NON-NLS-1$
    }

    /**
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/repository/build/BuildExportManager.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/repository/build/BuildExportManager.java
@@ -44,7 +44,7 @@ public/* final */class BuildExportManager {
        return instance;
    }

-    IBuildExportDependenciesProvider[] getDependenciesProviders() {
+    public IBuildExportDependenciesProvider[] getDependenciesProviders() {
        return reader.getDependenciesProviders();
    }

--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/IJobletProviderService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/IJobletProviderService.java
@@ -84,7 +84,7 @@ public interface IJobletProviderService extends IService {

    public void loadComponentsFromProviders();

-    public IComponent setPropertyForJobletComponent(String id, String version);
+    public IComponent setPropertyForJobletComponent(String projectTechLabel, String id, String version);

    public void updateParametersFromJoblet(INode node, IComponent newComponent);

--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/ITestContainerProviderService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/ITestContainerProviderService.java
@@ -129,5 +129,7 @@ public interface ITestContainerProviderService extends IService {
    boolean isTestContainerEditor(IEditorPart editor);

    Set<ModuleNeeded> getAllJobTestcaseModules(ProcessItem item) throws PersistenceException;
+    
+    public void deleteDataFiles(Object deleteObj);

 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/core/ICamelDesignerCoreService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/core/ICamelDesignerCoreService.java
@@ -12,6 +12,8 @@
 // ============================================================================
 package org.talend.designer.core;

+import java.util.Collection;
+
 import org.dom4j.Element;
 import org.talend.core.IService;
 import org.talend.core.model.process.EConnectionType;
@@ -60,4 +62,12 @@ public interface ICamelDesignerCoreService extends IService {

    public FileItem newRouteDocumentationItem();

+    /**
+     * DOC sunchaoqun Comment method "getUnselectDependenciesBundle".
+     * 
+     * @param processItem
+     * @return
+     */
+    Collection<String> getUnselectDependenciesBundle(ProcessItem processItem);
+
 }
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/IRunProcessService.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/IRunProcessService.java
@@ -220,6 +220,8 @@ public interface IRunProcessService extends IService {

    void clearProjectRelatedSettings();

+    void batchDeleteAllVersionTalendJobProject(List<String> idList);
+
    boolean isExportConfig();

    boolean isdebug();
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/ItemCacheManager.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/ItemCacheManager.java
@@ -92,7 +92,8 @@ public class ItemCacheManager {
    }

    public static ProcessItem getProcessItem(String projectLabel, String processId, String version) {
-        if (ProjectManager.getInstance().getCurrentProject().getTechnicalLabel().equals(projectLabel)) {
+        if (ProjectManager.getInstance().getCurrentProject().getTechnicalLabel().equals(projectLabel)
+                || ProjectManager.getInstance().getProjectFromProjectTechLabel(projectLabel) == null) {
            return getProcessItem(ProjectManager.getInstance().getCurrentProject(), processId, version);
        } else {
            Project project = ProjectManager.getInstance().getProjectFromProjectTechLabel(projectLabel);
@@ -106,7 +107,8 @@ public class ItemCacheManager {
    public static ProcessItem getProcessItem(String processId, String version) {
        String[] parsedArray = parseProcessId(processId);
        ProcessItem refProcessItem = null;
-        if (StringUtils.isEmpty(parsedArray[0])) {
+        if (StringUtils.isEmpty(parsedArray[0])
+                || ProjectManager.getInstance().getProjectFromProjectTechLabel(parsedArray[0]) == null) {
            refProcessItem = getRefProcessItem(ProjectManager.getInstance().getCurrentProject(), parsedArray[1], version);
        } else {
            Project project = ProjectManager.getInstance().getProjectFromProjectTechLabel(parsedArray[0]);
@@ -198,6 +200,12 @@ public class ItemCacheManager {
        return null;
    }

+    /**
+     * It would be better to use <b>getJobletProcessItem(Project project, String jobletId)</b>
+     * 
+     * @param jobletId
+     * @return
+     */
    public static JobletProcessItem getJobletProcessItem(String jobletId) {
        ProjectManager projectManager = ProjectManager.getInstance();
        JobletProcessItem jobletProcessItem = getJobletProcessItem(projectManager.getCurrentProject(), jobletId);
@@ -218,7 +226,7 @@ public class ItemCacheManager {
            return null;
        }
        if (version == null || LATEST_VERSION.equals(version)) {
-            return getJobletProcessItem(jobletId);
+            return getJobletProcessItem(project, jobletId);
        }
        JobletProcessItem selectedProcessItem = null;

@@ -240,9 +248,16 @@ public class ItemCacheManager {
        return null;
    }

-    public static JobletProcessItem getJobletProcessItem(String jobletId, String version) {
+    public static JobletProcessItem getJobletProcessItem(String projectTechLabel, String jobletId, String version) {
        ProjectManager projectManager = ProjectManager.getInstance();
-        JobletProcessItem jobletProcessItem = getJobletProcessItem(projectManager.getCurrentProject(), jobletId, version);
+        Project project = null;
+        if (StringUtils.isNotBlank(projectTechLabel)) {
+            project = projectManager.getProjectFromProjectTechLabel(projectTechLabel);
+        }
+        if (project == null) {
+            project = projectManager.getCurrentProject();
+        }
+        JobletProcessItem jobletProcessItem = getJobletProcessItem(project, jobletId, version);

        if (jobletProcessItem == null) {
            for (Project p : projectManager.getReferencedProjects()) {
--- a/Show More
+++ b/Show More