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

* Replace internal sun classes with java API classes

* Use default security algorithm instead of X509

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>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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>

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

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

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>

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

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

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>

main/features/org.talend.fragment.jars.common.feature/build.properties

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

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>

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

@@ -4,9 +4,9 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tcommon-studio-se</artifactId>
-    <version>7.2.1-M1</version>
+    <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>

main/features/org.talend.fragment.jars.feature/build.properties

@@ -1,2 +0,0 @@
-bin.includes = feature.xml
-generateFeatureVersionSuffix="true"

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>

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-M1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.fragment.jars.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>

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>

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

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

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>

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

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

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>

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

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

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>

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

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

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>

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

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

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>

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

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

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>

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

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

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>

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

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

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>

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

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

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>

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,175 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.commons.ui.runtime.utils;
+
+/**
+ * DOC Administrator class global comment. Detailled comment
+ */
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+
+import org.apache.tools.zip.ZipEntry;
+import org.apache.tools.zip.ZipFile;
+import org.talend.commons.ui.runtime.exception.ExceptionHandler;
+
+public class ZipFileUtils {
+
+    private static int bufSize = 2048; // size of bytes
+
+    public static String zip(String zipDirectory) {
+        File zipDir = new File(zipDirectory);
+        return zip(zipDirectory, zipDir.getPath(), false);
+    }
+
+    public static String zip(String zipDirectory, String zipFileName, boolean includeSelfDir) {
+        File zipDir = new File(zipDirectory);
+        File[] willZipFileArr;
+        if (includeSelfDir || zipDir.isFile()) {
+            willZipFileArr = new File[] { zipDir };
+        } else {
+            willZipFileArr = zipDir.listFiles();
+        }
+        return zip(willZipFileArr, zipFileName);
+    }
+
+    public static String zip(File[] files, String zipFileName) {
+
+        JarOutputStream jarOutput = null;
+        try {
+            jarOutput = new JarOutputStream(new FileOutputStream(zipFileName));
+
+            for (File file : files) {
+                zipFiles(file, jarOutput, "");
+            }
+
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        } finally {
+            if (jarOutput != null) {
+                try {
+                    jarOutput.close();
+                } catch (IOException e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+        }
+        return null;
+    }
+
+    private static void zipFiles(File file, JarOutputStream jos, String pathName) throws Exception {
+        String fileName = pathName + file.getName();
+        if (file.isDirectory()) {
+            fileName = fileName + "/";
+            jos.putNextEntry(new JarEntry(fileName));
+            String fileNames[] = file.list();
+            if (fileNames != null) {
+                for (int i = 0; i < fileNames.length; i++) {
+                    zipFiles(new File(file, fileNames[i]), jos, fileName);
+                }
+                jos.closeEntry();
+            }
+        } else {
+            JarEntry jarEntry = new JarEntry(fileName);
+            BufferedInputStream in = new BufferedInputStream(new FileInputStream(file));
+            jos.putNextEntry(jarEntry);
+
+            byte[] buf = new byte[bufSize];
+            int len;
+            while ((len = in.read(buf)) >= 0) {
+                jos.write(buf, 0, len);
+            }
+            in.close();
+            jos.closeEntry();
+        }
+    }
+
+    public static String unZip(File unZipFile) {
+        return unZip(unZipFile.getPath(), null);
+    }
+
+    public static String unZip(File unZipFile, String destFileName) {
+        return unZip(unZipFile.getPath(), destFileName);
+    }
+
+    public static String unZip(String unZipFileName) {
+        return unZip(unZipFileName, null);
+    }
+
+    public static String unZip(String unZipFileName, String destFileName) {
+        File unzipFile = new File(unZipFileName);
+
+        if (destFileName == null || destFileName.trim().length() == 0) {
+            destFileName = unzipFile.getParent();
+        }
+
+        File destFile;
+        ZipFile zipFile = null;
+        try {
+            zipFile = new ZipFile(unzipFile, "GBK");
+            for (Enumeration entries = zipFile.getEntries(); entries.hasMoreElements();) {
+                ZipEntry entry = (ZipEntry) entries.nextElement();
+                destFile = new File(destFileName, entry.getName());
+
+                unZipFile(destFile, zipFile, entry);
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+            return e.getMessage();
+        } finally {
+            try {
+                assert zipFile != null;
+                zipFile.close();
+            } catch (Exception e) {
+                ExceptionHandler.process(e);
+            }
+        }
+        return null;
+    }
+
+    private static void unZipFile(File destFile, ZipFile zipFile, ZipEntry entry) throws IOException {
+        InputStream inputStream;
+        FileOutputStream fileOut;
+        if (entry.isDirectory()) {
+            destFile.mkdirs();
+        } else {
+            File parent = destFile.getParentFile();
+            if (parent != null && !parent.exists()) {
+                parent.mkdirs();
+            }
+
+            inputStream = zipFile.getInputStream(entry);
+
+            fileOut = new FileOutputStream(destFile);
+            byte[] buf = new byte[bufSize];
+            int readedBytes;
+            while ((readedBytes = inputStream.read(buf)) > 0) {
+                fileOut.write(buf, 0, readedBytes);
+            }
+            fileOut.close();
+
+            inputStream.close();
+        }
+    }
+
+    public void setBufSize(int bufSize) {
+        ZipFileUtils.bufSize = bufSize;
+    }
+}

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

@@ -11,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

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

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

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

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

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);
+    }
+
 }

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

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

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

@@ -15,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;

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());

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

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

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

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

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

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

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

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

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

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

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

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

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

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

main/plugins/org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/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();
     }

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

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

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

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

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

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

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

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

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

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

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

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

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/model/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>.
      * 

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

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

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

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

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

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

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

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

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

@@ -48,6 +48,7 @@ import org.eclipse.ui.actions.ActionFactory;
 import org.talend.commons.exception.BusinessException;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
 import org.talend.commons.ui.runtime.image.EImage;
@@ -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;
     }

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

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

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

@@ -40,6 +40,7 @@ import org.eclipse.ui.PlatformUI;
 import org.talend.commons.exception.BusinessException;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.runtime.model.repository.ERepositoryStatus;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
 import org.talend.commons.ui.runtime.image.ECoreImage;
@@ -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);
+                    }
+                }
+            }
 
         }
     }

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

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

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

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