TBD-1375 feature: Check possible wizards to add Couch DB

https://jira.talendforge.org/browse/TBD-1375 Done: 1. Add the CouchDB wizard 2. Change the tCouchDB* components to make them D&Dable
2014-12-26 12:26:30 +08:00
3013 changed files with 74872 additions and 5234 deletions
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 http://www.talend.com


-![alt text](http://www.talend.com/sites/all/themes/talend_responsive/images/logo.png "Talend")
+![alt text](http://www.talend.com/sites/default/files/logo-talend.jpg "Talend")


 ## Contents
@@ -42,6 +42,6 @@ Feel free to share your Talend components on [Talend Exchange](http://www.talend

 ## License

-Copyright (c) 2006-2015 Talend
+Copyright (c) 2006-2014 Talend

-Licensed under the Apache V2 License
+Licensed under the LPGLv3 License
--- a/i18n/features/org.talend.babel.all.tos.feature/feature.xml
+++ b/i18n/features/org.talend.babel.all.tos.feature/feature.xml
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.babel.all.tos.feature"
-      label="Babel feature with all languages for TOS"
-      version="6.0.0.qualifier">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <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>
--- a/i18n/features/org.talend.babel.all.tos.feature/pom.xml
+++ b/i18n/features/org.talend.babel.all.tos.feature/pom.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-	<groupId>org.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <groupId>org.talend.studio</groupId>
-  <artifactId>org.talend.babel.all.tos.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
--- a/i18n/plugins/org.talend.common.ui.runtime.nl/pom.xml
+++ b/i18n/plugins/org.talend.common.ui.runtime.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.common.ui.runtime.nl</artifactId>
--- a/i18n/plugins/org.talend.commons.runtime.nl/pom.xml
+++ b/i18n/plugins/org.talend.commons.runtime.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.runtime.nl</artifactId>
--- a/i18n/plugins/org.talend.commons.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.commons.ui.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.commons.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.core.nl/pom.xml
+++ b/i18n/plugins/org.talend.core.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.nl</artifactId>
--- a/i18n/plugins/org.talend.core.repository.nl/pom.xml
+++ b/i18n/plugins/org.talend.core.repository.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.repository.nl</artifactId>
--- a/i18n/plugins/org.talend.core.runtime.nl/pom.xml
+++ b/i18n/plugins/org.talend.core.runtime.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.runtime.nl</artifactId>
--- a/i18n/plugins/org.talend.core.runtime.nl/src/main/java/org/talend/core/runtime/i18n/messages_en.properties
+++ b/i18n/plugins/org.talend.core.runtime.nl/src/main/java/org/talend/core/runtime/i18n/messages_en.properties
@@ -541,7 +541,7 @@ PigFunctionParser.checkMethod=Pig : "{0}.{1}\\" parse failed. please check your
 GenerateSelectSQLAction.NewQuery=new Query {0}
 AbstractTalendFunctionParser.checkMethod=Runtines : "{0}.{1}\\" parse failed. please check your the Method.
 UpdatesConstants.MR=Map_Reduce
-AbstractBrandingService.routines_license_header_content2014=Copyright (c) 2006-2015, Talend Inc.\n//\n// This source code has been automatically generated by_{0}\n// CodeGenerator version {1}\n// You can find more information about Talend products at www.talend.com.\n// You may distribute this code under the terms of the GNU LGPL license\n// http://www.gnu.org/licenses/lgpl.html).
+AbstractBrandingService.routines_license_header_content2014=Copyright (c) 2006-2014, Talend Inc.\n//\n// This source code has been automatically generated by_{0}\n// CodeGenerator version {1}\n// You can find more information about Talend products at www.talend.com.\n// You may distribute this code under the terms of the GNU LGPL license\n// http://www.gnu.org/licenses/lgpl.html).
 repository.tdqelement.sourceFile=Source Files
 repository.tdqelement.jrxml=JRXML Template
 repository.dataprofiling=Data Profiling
--- a/i18n/plugins/org.talend.core.runtime.nl/src/main/java/org/talend/core/runtime/i18n/messages_ja.properties
+++ b/i18n/plugins/org.talend.core.runtime.nl/src/main/java/org/talend/core/runtime/i18n/messages_ja.properties
@@ -498,7 +498,7 @@ LibrariesListSelectionDialog.selectLibFromOS=\u30E9\u30A4\u30D6\u30E9\u30EA\u907
 LibrariesListSelectionDialog.browseButton.text=\u30D6\u30E9\u30A6\u30BA...
 LibrariesListSelectionDialog.deployLibs=\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u30C7\u30D7\u30ED\u30A4...
 GenerateSelectSQLAction.NewQuery=\u65B0\u898F\u30AF\u30A8\u30EA {0}
-AbstractBrandingService.routines_license_header_content2014=Copyright (c) 2006-2015, Talend Inc.\n//\n// \u672C\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306F\u4EE5\u4E0B\u306E\u6A5F\u80FD\u3067\u81EA\u52D5\u4F5C\u6210\u3055\u308C\u305F\u3082\u306E\u3067\u3042\u308B_{0}\n// CodeGenerator version {1}\n// Talend\u88FD\u54C1\u306B\u95A2\u3057\u3066\u306E\u8A73\u7D30\u306A\u60C5\u5831\u306F\u4EE5\u4E0B\u306E\u30B5\u30A4\u30C8\u306B\u8A18\u8F09\u3055\u308C\u3066\u3044\u308B www.talend.com.\n// GNU LGPL \u30E9\u30A4\u30BB\u30F3\u30B9\u306B\u3088\u308A\u672C\u30B3\u30FC\u30C9\u3092\u914D\u5E03\u3059\u308B\u3053\u3068\u304C\u53EF\u80FD\u3067\u3042\u308B\n// http://www.gnu.org/licenses/lgpl.html).
+AbstractBrandingService.routines_license_header_content2014=Copyright (c) 2006-2014, Talend Inc.\n//\n// \u672C\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306F\u4EE5\u4E0B\u306E\u6A5F\u80FD\u3067\u81EA\u52D5\u4F5C\u6210\u3055\u308C\u305F\u3082\u306E\u3067\u3042\u308B_{0}\n// CodeGenerator version {1}\n// Talend\u88FD\u54C1\u306B\u95A2\u3057\u3066\u306E\u8A73\u7D30\u306A\u60C5\u5831\u306F\u4EE5\u4E0B\u306E\u30B5\u30A4\u30C8\u306B\u8A18\u8F09\u3055\u308C\u3066\u3044\u308B www.talend.com.\n// GNU LGPL \u30E9\u30A4\u30BB\u30F3\u30B9\u306B\u3088\u308A\u672C\u30B3\u30FC\u30C9\u3092\u914D\u5E03\u3059\u308B\u3053\u3068\u304C\u53EF\u80FD\u3067\u3042\u308B\n// http://www.gnu.org/licenses/lgpl.html).
 repository.tdqelement.sourceFile=\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB
 repository.tdqelement.jrxml=JRXML\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
 repository.dataprofiling=\u30C7\u30FC\u30BF\u30D7\u30ED\u30D5\u30A1\u30A4\u30EA\u30F3\u30B0
--- a/i18n/plugins/org.talend.core.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.core.ui.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.core.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.cwm.mip.edit.nl/pom.xml
+++ b/i18n/plugins/org.talend.cwm.mip.edit.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.cwm.mip.edit.nl</artifactId>
--- a/i18n/plugins/org.talend.cwm.mip.nl/pom.xml
+++ b/i18n/plugins/org.talend.cwm.mip.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.cwm.mip.nl</artifactId>
--- a/i18n/plugins/org.talend.help.nl/pom.xml
+++ b/i18n/plugins/org.talend.help.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.help.nl</artifactId>
--- a/i18n/plugins/org.talend.helpers.nl/pom.xml
+++ b/i18n/plugins/org.talend.helpers.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.helpers.nl</artifactId>
--- a/i18n/plugins/org.talend.librariesmanager.nl/pom.xml
+++ b/i18n/plugins/org.talend.librariesmanager.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.librariesmanager.nl</artifactId>
--- a/i18n/plugins/org.talend.librariesmanager.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.librariesmanager.ui.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.librariesmanager.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.metadata.managment.nl/pom.xml
+++ b/i18n/plugins/org.talend.metadata.managment.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.metadata.managment.nl</artifactId>
--- a/i18n/plugins/org.talend.metadata.managment.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.metadata.managment.ui.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.metadata.managment.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.migrationTool.nl/pom.xml
+++ b/i18n/plugins/org.talend.migrationTool.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.migrationTool.nl</artifactId>
--- a/i18n/plugins/org.talend.model.edit.nl/pom.xml
+++ b/i18n/plugins/org.talend.model.edit.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.model.edit.nl</artifactId>
--- a/i18n/plugins/org.talend.model.migration.nl/pom.xml
+++ b/i18n/plugins/org.talend.model.migration.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.model.migration.nl</artifactId>
--- a/i18n/plugins/org.talend.model.nl/pom.xml
+++ b/i18n/plugins/org.talend.model.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.model.nl</artifactId>
--- a/i18n/plugins/org.talend.rcp.nl/pom.xml
+++ b/i18n/plugins/org.talend.rcp.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.nl</artifactId>
--- a/i18n/plugins/org.talend.registration.nl/pom.xml
+++ b/i18n/plugins/org.talend.registration.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.registration.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.items.importexport.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.items.importexport.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.items.importexport.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.items.importexport.ui.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.items.importexport.ui.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.localprovider.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.localprovider.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.localprovider.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.localprovider.nl/src/main/java/org/talend/repository/localprovider/i18n/Messages.java
+++ b/i18n/plugins/org.talend.repository.localprovider.nl/src/main/java/org/talend/repository/localprovider/i18n/Messages.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/i18n/plugins/org.talend.repository.mdm.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.mdm.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.mdm.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.metadata.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.metadata.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.metadata.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.view.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.view.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.view.nl</artifactId>
--- a/i18n/plugins/org.talend.resources.nl/pom.xml
+++ b/i18n/plugins/org.talend.resources.nl/pom.xml
@@ -5,7 +5,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.resources.nl</artifactId>
--- a/main/features/org.talend.commons-feature/.checkstyle
+++ b/main/features/org.talend.commons-feature/.checkstyle
--- a/main/features/org.talend.commons-feature/.project
+++ b/main/features/org.talend.commons-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.talend.commons.feature</name>
+	<name>org.talend.commons-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- a/i18n/features/org.talend.babel.all.tos.feature/build.properties
+++ b/i18n/features/org.talend.babel.all.tos.feature/build.properties
--- a/main/features/org.talend.commons-feature/feature.xml
+++ b/main/features/org.talend.commons-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.talend.commons.feature"
+      id="org.talend.commons_feature"
      label="Commons Feature"
      version="6.0.0.qualifier"
      provider-name=".Talend SA.">
@@ -22,7 +22,7 @@
   </url>

   <includes
-         id="org.talend.model.migration.feature"
+         id="org.talend.model.migration_feature"
         version="0.0.0"/>

   <requires>
--- a/main/features/org.talend.fragment.jars.feature/pom.xml
+++ b/main/features/org.talend.fragment.jars.feature/pom.xml
@@ -5,9 +5,9 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
-  <artifactId>org.talend.fragment.jars.feature</artifactId>
+  <artifactId>org.talend.commons_feature</artifactId>
  <packaging>eclipse-feature</packaging>
 </project>
--- a/main/features/org.talend.core-feature/.checkstyle
+++ b/main/features/org.talend.core-feature/.checkstyle
--- a/main/features/org.talend.core-feature/.project
+++ b/main/features/org.talend.core-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.talend.core.feature</name>
+	<name>org.talend.core-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- a/main/features/org.talend.commons.feature/build.properties
+++ b/main/features/org.talend.commons.feature/build.properties
--- a/main/features/org.talend.core-feature/feature.xml
+++ b/main/features/org.talend.core-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.talend.core.feature"
+      id="org.talend.core_feature"
      label="Core Feature"
      version="6.0.0.qualifier"
      provider-name=".Talend SA.">
@@ -34,7 +34,7 @@
         version="0.0.0"/>

   <includes
-         id="org.talend.tos.libraries.feature"
+         id="org.talend.tos.libraries_feature"
         version="0.0.0"/>

   <requires>
--- a/main/features/org.talend.commons.feature/pom.xml
+++ b/main/features/org.talend.commons.feature/pom.xml
@@ -5,9 +5,9 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
-  <artifactId>org.talend.commons.feature</artifactId>
+  <artifactId>org.talend.core_feature</artifactId>
  <packaging>eclipse-feature</packaging>
 </project>
--- a/main/features/org.talend.fragment.jars.feature/feature.xml
+++ b/main/features/org.talend.fragment.jars.feature/feature.xml
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.fragment.jars.feature"
-      version="6.0.0.qualifier"
-      provider-name=".Talend SA.">
-
-   <plugin
-         id="org.talend.libraries.javacsv.jars"
-         download-size="0"
-         install-size="0"
-         version="0.0.0" />
- 
-	<plugin
-         id="org.talend.libraries.jdbc.jtds.jars"
-         download-size="0"
-         install-size="0"
-         version="0.0.0" />
-		 
-	<plugin
-         id="org.talend.libraries.jfreechart.jars"
-         download-size="0"
-         install-size="0"
-         version="0.0.0" />		
-		 
-	<plugin
-         id="org.talend.libraries.hl7.jars"
-         download-size="0"
-         install-size="0"
-         version="0.0.0" />
-		 
-	<plugin
-         id="org.talend.libraries.jboss.jars"
-         download-size="0"
-         install-size="0"
-         version="0.0.0" />
-
-</feature>
--- a/main/features/org.talend.help-feature/.project
+++ b/main/features/org.talend.help-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.talend.help.feature</name>
+	<name>org.talend.help-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- a/main/features/org.talend.fragment.jars.feature/build.properties
+++ b/main/features/org.talend.fragment.jars.feature/build.properties
--- a/main/features/org.talend.help-feature/feature.xml
+++ b/main/features/org.talend.help-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.talend.help.feature"
+      id="org.talend.help_feature"
      label="Help Feature"
      version="6.0.0.qualifier"
      provider-name=".Talend SA.">
--- a/main/features/org.talend.help-feature/pom.xml
+++ b/main/features/org.talend.help-feature/pom.xml
@@ -5,9 +5,9 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
-  <artifactId>org.talend.help.feature</artifactId>
+  <artifactId>org.talend.help_feature</artifactId>
  <packaging>eclipse-feature</packaging>
 </project>
--- a/main/features/org.talend.help.feature/build.properties
+++ b/main/features/org.talend.help.feature/build.properties
@@ -1,2 +0,0 @@
-bin.includes = feature.xml
-generateFeatureVersionSuffix="true"
--- a/main/features/org.talend.libraries.jdbc-feature/.project
+++ b/main/features/org.talend.libraries.jdbc-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.talend.babel.all.tos.feature</name>
+	<name>org.talend.libraries.jdbc-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- a/main/features/org.talend.libraries.jdbc-feature/build.properties
+++ b/main/features/org.talend.libraries.jdbc-feature/build.properties
--- a/main/features/org.talend.libraries.jdbc-feature/feature.xml
+++ b/main/features/org.talend.libraries.jdbc-feature/feature.xml
@@ -1,92 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.libraries.jdbc.feature"
-      label="Jdbc_feature Feature"
-      version="6.0.0.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.jtds"
-         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.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"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.talend.libraries.jdbc_feature"
+      label="Jdbc_feature Feature"
+      version="6.0.0.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.jtds"
+         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.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"/>
+
+</feature>
--- a/main/features/org.talend.libraries.jdbc-feature/pom.xml
+++ b/main/features/org.talend.libraries.jdbc-feature/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.libraries.jdbc_feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.libraries.jdbc.feature/.project
+++ b/main/features/org.talend.libraries.jdbc.feature/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.talend.libraries.jdbc.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
--- a/main/features/org.talend.libraries.jdbc.feature/pom.xml
+++ b/main/features/org.talend.libraries.jdbc.feature/pom.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.libraries.jdbc.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
--- a/main/features/org.talend.model.migration-feature/.project
+++ b/main/features/org.talend.model.migration-feature/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.talend.fragment.jars.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.model.migration-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
--- a/main/features/org.talend.model.migration-feature/build.properties
+++ b/main/features/org.talend.model.migration-feature/build.properties
@@ -1 +1 @@
-bin.includes = feature.xml
+bin.includes = feature.xml
--- a/main/features/org.talend.model.migration-feature/feature.xml
+++ b/main/features/org.talend.model.migration-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.talend.model.migration.feature"
+      id="org.talend.model.migration_feature"
      label="model Migration feature"
      version="6.0.0.qualifier">

--- a/main/features/org.talend.model.migration-feature/pom.xml
+++ b/main/features/org.talend.model.migration-feature/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.model.migration_feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.model.migration.feature/.project
+++ b/main/features/org.talend.model.migration.feature/.project
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.talend.model.migration.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
--- a/main/features/org.talend.model.migration.feature/pom.xml
+++ b/main/features/org.talend.model.migration.feature/pom.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.model.migration.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
--- a/main/features/org.talend.rcp-feature/.checkstyle
+++ b/main/features/org.talend.rcp-feature/.checkstyle
--- a/main/features/org.talend.rcp-feature/.project
+++ b/main/features/org.talend.rcp-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.talend.rcp.feature</name>
+	<name>org.talend.rcp-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- a/main/features/org.talend.libraries.jdbc.feature/build.properties
+++ b/main/features/org.talend.libraries.jdbc.feature/build.properties
--- a/main/features/org.talend.rcp-feature/feature.xml
+++ b/main/features/org.talend.rcp-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.talend.rcp.feature"
+      id="org.talend.rcp_feature"
      label="RCP Feature"
      version="6.0.0.qualifier"
      provider-name=".Talend SA.">
--- a/main/features/org.talend.rcp-feature/pom.xml
+++ b/main/features/org.talend.rcp-feature/pom.xml
@@ -5,9 +5,9 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
-  <artifactId>org.talend.rcp.feature</artifactId>
+  <artifactId>org.talend.rcp_feature</artifactId>
  <packaging>eclipse-feature</packaging>
 </project>
--- a/main/features/org.talend.update.p2-feature/.project
+++ b/main/features/org.talend.update.p2-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.talend.update.p2.feature</name>
+	<name>org.talend.update.p2-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- a/main/features/org.talend.model.migration.feature/build.properties
+++ b/main/features/org.talend.model.migration.feature/build.properties
--- a/main/features/org.talend.update.p2-feature/feature.xml
+++ b/main/features/org.talend.update.p2-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.talend.update.p2.feature"
+      id="org.talend.update.p2-feature"
      label="P2-feature"
      version="6.0.0.qualifier">

--- a/main/features/org.talend.update.p2-feature/pom.xml
+++ b/main/features/org.talend.update.p2-feature/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.update.p2-feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.update.p2.feature/pom.xml
+++ b/main/features/org.talend.update.p2.feature/pom.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.update.p2.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
--- a/main/features/org.talend.updates-feature/.project
+++ b/main/features/org.talend.updates-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.talend.updates.feature</name>
+	<name>org.talend.updates-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- a/main/features/org.talend.updates-feature/build.properties
+++ b/main/features/org.talend.updates-feature/build.properties
--- a/main/features/org.talend.updates-feature/feature.xml
+++ b/main/features/org.talend.updates-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.talend.updates.feature"
+      id="org.talend.updates-feature"
      label="Updates-feature"
      version="6.0.0.qualifier"
      provider-name=".Talend SA.">
--- a/main/features/org.talend.updates-feature/pom.xml
+++ b/main/features/org.talend.updates-feature/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.talend.studio</groupId>
+    <artifactId>tcommon-studio-se</artifactId>
+    <version>6.0.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.updates-feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
--- a/main/features/org.talend.updates.feature/pom.xml
+++ b/main/features/org.talend.updates.feature/pom.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.updates.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
--- a/main/features/org.talend.utils-feature/.project
+++ b/main/features/org.talend.utils-feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.talend.utils.feature</name>
+	<name>org.talend.utils-feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
--- a/main/features/org.talend.update.p2.feature/build.properties
+++ b/main/features/org.talend.update.p2.feature/build.properties
--- a/main/features/org.talend.utils-feature/feature.xml
+++ b/main/features/org.talend.utils-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.talend.utils.feature"
+      id="org.talend.utils-feature"
      label="Utils_feature Feature"
      version="6.0.0.qualifier">

--- a/main/features/org.talend.utils-feature/pom.xml
+++ b/main/features/org.talend.utils-feature/pom.xml
@@ -5,9 +5,9 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
-  <artifactId>org.talend.core.feature</artifactId>
+  <artifactId>org.talend.utils-feature</artifactId>
  <packaging>eclipse-feature</packaging>
 </project>
--- a/main/features/org.talend.utils.feature/build.properties
+++ b/main/features/org.talend.utils.feature/build.properties
@@ -1 +0,0 @@
-bin.includes = feature.xml
--- a/main/features/org.talend.utils.feature/pom.xml
+++ b/main/features/org.talend.utils.feature/pom.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.talend.studio</groupId>
-    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.utils.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
--- a/main/plugins/org.talend.common.ui.runtime/icons1/map.gif
+++ b/main/plugins/org.talend.common.ui.runtime/icons1/map.gif
--- a/main/plugins/org.talend.common.ui.runtime/icons1/reduce.gif
+++ b/main/plugins/org.talend.common.ui.runtime/icons1/reduce.gif
--- a/main/plugins/org.talend.common.ui.runtime/pom.xml
+++ b/main/plugins/org.talend.common.ui.runtime/pom.xml
@@ -5,23 +5,9 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tcommon-studio-se</artifactId>
-    <version>6.0.0-M1</version>
+    <version>6.0.0-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.common.ui.runtime</artifactId>
  <packaging>eclipse-plugin</packaging>
-  <build>
-	<plugins>
-	  <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-	</plugins>
-  </build>
 </project>
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/CommonUIPlugin.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/CommonUIPlugin.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/ExceptionHandler.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/ExceptionHandler.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/ExceptionMessageDialog.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/ExceptionMessageDialog.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/ExceptionServiceImpl.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/ExceptionServiceImpl.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/MessageBoxExceptionHandler.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/MessageBoxExceptionHandler.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/RuntimeExceptionHandler.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/exception/RuntimeExceptionHandler.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/expressionbuilder/ICellEditorDialog.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/expressionbuilder/ICellEditorDialog.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/expressionbuilder/IExpressionBuilderDialogController.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/expressionbuilder/IExpressionBuilderDialogController.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/expressionbuilder/IExpressionDataBean.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/expressionbuilder/IExpressionDataBean.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/expressionbuilder/IExtendedCellEditorBehavior.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/expressionbuilder/IExtendedCellEditorBehavior.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/geometry/Curve.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/geometry/Curve.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/geometry/Curve2D.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/geometry/Curve2D.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/geometry/Curve2DBezier.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/geometry/Curve2DBezier.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/geometry/Curve2DBezierFixed.java
+++ b/main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/geometry/Curve2DBezierFixed.java
@@ -1,6 +1,6 @@
 // ============================================================================
 //
-// Copyright (C) 2006-2015 Talend Inc. - www.talend.com
+// Copyright (C) 2006-2014 Talend Inc. - www.talend.com
 //
 // This source code is available under agreement available at
 // %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
--- a/Show More
+++ b/Show More