TUP-5410: added MS SQL proprietary driver support.

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

@@ -1,13 +1,13 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  
-  <artifactId>org.talend.babel.all.tos.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  
+  <artifactId>org.talend.babel.all.tos.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.common.ui.runtime.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.common.ui.runtime.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.commons.runtime.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.commons.runtime.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.commons.ui.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.commons.ui.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.repository.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.repository.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.runtime.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.runtime.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.ui.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.ui.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.cwm.mip.edit.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.cwm.mip.edit.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.cwm.mip.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.cwm.mip.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.designer.maven.ui.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.designer.maven.ui.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.help.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.help.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.helpers.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.helpers.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.librariesmanager.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.librariesmanager.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.librariesmanager.ui.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.librariesmanager.ui.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.metadata.managment.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.metadata.managment.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.metadata.managment.ui.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.metadata.managment.ui.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.migrationTool.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.migrationTool.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.model.edit.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.model.edit.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.model.migration.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.model.migration.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.model.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.model.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.presentation.onboarding.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.presentation.onboarding.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.rcp.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.rcp.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.registration.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.registration.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.items.importexport.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.items.importexport.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.localprovider.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.localprovider.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.mdm.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.mdm.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

i18n/plugins/org.talend.repository.mdm.nl/src/main/java/messages_en.properties

@@ -12,7 +12,7 @@ MdmConceptWizardPage3_mdm_entity=MDM Entity
 MDMForm_check=Check
 MDMForm_connect_successful=MDM connected successfully\!
 MDMForm_link_para=Link Parameter
-MDMForm_pass=Password
+MDMForm_pass=password
 MDMForm_pass_null=Password can not be null\!
 MDMForm_port_null=Port can not be null\!
 MDMForm_server=Server

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.metadata.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.metadata.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.repository.view.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.repository.view.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.resources.nl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.resources.nl</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.commons.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.commons.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.fragment.jars.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.fragment.jars.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.help.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.help.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.jdt.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.jdt.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.libraries.jdbc.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.libraries.jdbc.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.m2e.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.m2e.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.model.migration.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.model.migration.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -1,13 +1,13 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  
-  <artifactId>org.talend.platform.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  
+  <artifactId>org.talend.platform.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.rcp.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.rcp.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.update.p2.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.update.p2.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.updates.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.updates.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.utils.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.utils.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>

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

@@ -30,7 +30,6 @@ Export-Package:
  org.talend.commons.ui.runtime.swt.tableviewer.sort,
  org.talend.commons.ui.runtime.swt.tableviewer.tableeditor,
  org.talend.commons.ui.runtime.thread,
- org.talend.commons.ui.runtime.update,
  org.talend.commons.ui.runtime.utils,
  org.talend.commons.ui.runtime.ws
 Import-Package: org.eclipse.jface.bindings.keys,

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

@@ -1,27 +1,27 @@
-<?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>6.3.0-RC1</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>
-		<version>2.8.2</version>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-	</plugins>
-  </build>
-</project>
+<?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>6.3.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>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+	</plugins>
+  </build>
+</project>

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

@@ -34,8 +34,6 @@ public class ExceptionMessageDialog extends MessageDialog {
 
     private Throwable ex;
 
-    private String exceptionString = null;
-
     public ExceptionMessageDialog(Shell parentShell, String dialogTitle, Image dialogTitleImage, String dialogMessage,
             int dialogImageType, String[] dialogButtonLabels, int defaultIndex, Throwable ex) {
         super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
@@ -44,18 +42,15 @@ public class ExceptionMessageDialog extends MessageDialog {
 
     @Override
     protected Control createCustomArea(Composite parent) {
-        if (exceptionString == null || exceptionString.isEmpty()) {
-            StringWriter stringWriter = new StringWriter();
-            ex.printStackTrace(new PrintWriter(stringWriter));
-            exceptionString = stringWriter.toString();
-        }
+        StringWriter stringWriter = new StringWriter();
+        ex.printStackTrace(new PrintWriter(stringWriter));
+        String exceptionString = stringWriter.toString();
 
         ExpandableComposite errorComposite = new ExpandableComposite(parent, ExpandableComposite.COMPACT);
-        errorComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 1, 1));
+        errorComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, true, 1, 1));
         errorComposite.setText(Messages.getString("ExceptionMessageDialog.log")); //$NON-NLS-1$
         errorComposite.addExpansionListener(new IExpansionListener() {
 
-            @Override
             public void expansionStateChanged(ExpansionEvent e) {
                 int delta = 300;
                 if (!e.getState()) {
@@ -66,7 +61,6 @@ public class ExceptionMessageDialog extends MessageDialog {
                 getShell().setSize(newSize);
             }
 
-            @Override
             public void expansionStateChanging(ExpansionEvent e) {
             }
 
@@ -114,12 +108,4 @@ public class ExceptionMessageDialog extends MessageDialog {
         return;
     }
 
-    public String getExceptionString() {
-        return this.exceptionString;
-    }
-
-    public void setExceptionString(String exceptionString) {
-        this.exceptionString = exceptionString;
-    }
-
 }

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

@@ -186,8 +186,6 @@ public enum ECoreImage implements IImage {
     PALETTE_OK_ICON("/icons1/palette_ok.png"), //$NON-NLS-1$
     PALETTE_CLEAR_ICON("/icons1/clear_toolbox.png"), //$NON-NLS-1$
     JOBLET_COMPONENT_ICON("/icons1/joblet_component.png"), //$NON-NLS-1$
-    SPARK_JOBLET_COMPONENT_ICON("/icons1/spark_joblet_component.png"), //$NON-NLS-1$
-    SPARK_STREAMING_JOBLET_COMPONENT_ICON("/icons1/spark_streaming_joblet_component.png"), //$NON-NLS-1$
     UNKNOWN(),
     PROGRESSBAR("/icons1/progressBar.gif"), //$NON-NLS-1$
     PROGRESSBARBlACK("/icons1/progressBar2.gif"), //$NON-NLS-1$

main/plugins/org.talend.common.ui.runtime/src/main/java/org/talend/commons/ui/runtime/update/PreferenceKeys.java

@@ -1,21 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 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.update;
-
-/**
- * DOC ggu class global comment. Detailled comment
- */
-public interface PreferenceKeys {
-
-    static final String NEED_OSGI_CLEAN = "need_osgi_clean"; //$NON-NLS-1$
-}

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

@@ -1,36 +1,36 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.commons.runtime</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-	<plugins>
-	  <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-		<version>2.8.2</version>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-	</plugins>
-  </build>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.commons.runtime</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+	</plugins>
+  </build>
+</project>

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

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

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

@@ -48,9 +48,6 @@ public class CommonsPlugin implements BundleActivator {
 
     private static boolean isWorkbenchCreated = false;
 
-    // TESB-17856: For commandline builds ESB Micorservice bundle
-    private static boolean isESBMicorservice = false;
-
     public static boolean isWorkbenchCreated() {
         return isWorkbenchCreated;
     }
@@ -142,12 +139,4 @@ public class CommonsPlugin implements BundleActivator {
         return service;
     }
 
-    public static boolean isESBMicorservice() {
-        return isESBMicorservice;
-    }
-
-    public static void setESBMicorservice(boolean isESBMicorservice) {
-        CommonsPlugin.isESBMicorservice = isESBMicorservice;
-    }
-
 }

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

@@ -42,8 +42,6 @@ public class EclipseCommandLine {
 
     static final String NEW_LINE = "\n"; //$NON-NLS-1$
 
-    static public final String CLEAN = "-clean"; //$NON-NLS-1$
-
     /**
      * Use it to specify the type of project that will be use to configure the studio when relaunched
      */

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.commons.ui</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.commons.ui</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,36 +1,36 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.repository</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-	<plugins>
-	  <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-		<version>2.8.2</version>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-	</plugins>
-  </build>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.repository</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+	</plugins>
+  </build>
+</project>

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

@@ -621,19 +621,10 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         Collections.sort(folders);
         for (String fullPath : folders) {
             String path = null;
-            
-            String comparePath = fullPath;
-            if(fullPath!=null){
-                String[] paths = fullPath.split("/");
-                if(paths.length>0){
-                    comparePath = paths[0];
-                }
-            }
-            
             ERepositoryObjectType currentType = null;
             for (DynaEnum<? extends DynaEnum<?>> type : ERepositoryObjectType.values()) {
                 ERepositoryObjectType objectType = (ERepositoryObjectType) type;
-                if (objectType.isResouce() && comparePath.equals(objectType.getFolder())) {
+                if (objectType.isResouce() && fullPath.startsWith(objectType.getFolder())) {
                     path = fullPath.substring(objectType.getFolder().length() + 1);
                     currentType = objectType;
                     break;

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

@@ -56,8 +56,6 @@ import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.services.IGenericWizardService;
 import org.talend.core.ui.ICDCProviderService;
 import org.talend.core.ui.IReferencedProjectService;
-import org.talend.core.ui.ISparkJobletProviderService;
-import org.talend.core.ui.ISparkStreamingJobletProviderService;
 import org.talend.core.ui.ITestContainerProviderService;
 import org.talend.core.ui.branding.IBrandingService;
 import org.talend.core.ui.images.RepositoryImageProvider;
@@ -308,24 +306,6 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
     public static Image getDefaultJobletImage() {
         return ImageProvider.getImage(ECoreImage.JOBLET_COMPONENT_ICON);
     }
-    
-    public static Image getDefaultJobletImage(Item item) {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(ISparkJobletProviderService.class)) {
-            ISparkJobletProviderService sparkJobletService = (ISparkJobletProviderService) GlobalServiceRegister
-                    .getDefault().getService(ISparkJobletProviderService.class);
-            if (sparkJobletService != null && sparkJobletService.isSparkJobletItem(item)) {
-                return  ImageProvider.getImage(ECoreImage.SPARK_JOBLET_COMPONENT_ICON);
-            }
-        }
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(ISparkStreamingJobletProviderService.class)) {
-            ISparkStreamingJobletProviderService sparkStreamingJobletService = (ISparkStreamingJobletProviderService) GlobalServiceRegister
-                    .getDefault().getService(ISparkStreamingJobletProviderService.class);
-            if (sparkStreamingJobletService != null && sparkStreamingJobletService.isSparkStreamingJobletItem(item)) {
-                return  ImageProvider.getImage(ECoreImage.SPARK_STREAMING_JOBLET_COMPONENT_ICON);
-            }
-        }
-        return ImageProvider.getImage(ECoreImage.JOBLET_COMPONENT_ICON);
-    }
 
     /**
      * DOC bqian Comment method "getJobletCustomIcon".
@@ -337,7 +317,14 @@ public class RepositoryLabelProvider extends LabelProvider implements IColorProv
         JobletProcessItem item = (JobletProcessItem) property.getItem();
         Image image = null;
         if (item.getIcon() == null || item.getIcon().getInnerContent() == null || item.getIcon().getInnerContent().length == 0) {
-            image = getDefaultJobletImage(item);
+            // File image = RepositoryLabelProvider.getDefaultJobletImage();
+            // try {
+            // item.getIcon().setInnerContentFromFile(image);
+            // } catch (Exception e) {
+            // ExceptionHandler.process(e);
+            // }
+
+            image = getDefaultJobletImage();
         } else {
 
             ImageDescriptor imageDesc = ImageUtils.createImageFromData(item.getIcon().getInnerContent());

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

@@ -52,7 +52,6 @@ Export-Package: org.talend.commons.utils.generation,
  org.talend.core.prefs,
  org.talend.core.repository,
  org.talend.core.runtime,
- org.talend.core.runtime.evaluator,
  org.talend.core.runtime.hd,
  org.talend.core.runtime.hd.hive,
  org.talend.core.runtime.maven,

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

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <mapping>
-	<dbms product="SAPHANA" id="saphana_id" label="Mapping SAPHana" default="true">
+	<dbms product="SAPHANA" id="saphana_id" label="Mapping SAP Hana" default="true">
 		<dbTypes>
 			<dbType type="TIMESTAMP" ignoreLen="true" ignorePre="true"/>
 			<dbType type="SECONDDATE" ignoreLen="true" ignorePre="true"/>

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

@@ -1,36 +1,36 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.runtime</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-	<plugins>
-	  <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-		<version>2.8.2</version>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-	</plugins>
-  </build>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.runtime</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+	</plugins>
+  </build>
+</project>

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabase4DriverClassName.java

@@ -46,6 +46,7 @@ public enum EDatabase4DriverClassName {
     MSODBC(EDatabaseTypeName.MSODBC, "sun.jdbc.odbc.JdbcOdbcDriver"), //$NON-NLS-1$
     MSSQL(EDatabaseTypeName.MSSQL, "net.sourceforge.jtds.jdbc.Driver"), //$NON-NLS-1$
     MSSQL2(EDatabaseTypeName.MSSQL05_08, "com.microsoft.sqlserver.jdbc.SQLServerDriver"), //$NON-NLS-1$
+    MSSQL_PROPRIETARY(EDatabaseTypeName.MSSQL_PROPRIETARY, "com.microsoft.sqlserver.jdbc.SQLServerDriver"), //$NON-NLS-1$
 
     MYSQL(EDatabaseTypeName.MYSQL, "org.gjt.mm.mysql.Driver"), //$NON-NLS-1$
     MYSQL2(EDatabaseTypeName.MYSQL, "com.mysql.jdbc.Driver"), //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/EDatabaseTypeName.java

@@ -1,324 +1,323 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.database;
-
-import org.talend.core.model.metadata.builder.database.EDatabaseSchemaOrCatalogMapping;
-import org.talend.core.runtime.CoreRuntimePlugin;
-import org.talend.core.runtime.projectsetting.IProjectSettingPreferenceConstants;
-
-/**
- * qzhang class global comment. Detailled comment <br/>
- * 
- */
-public enum EDatabaseTypeName {
-    MYSQL(
-          "MySQL", "MySQL", Boolean.FALSE, "MYSQL", "MYSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    AMAZON_AURORA(
-                  "Amazon Aurora", "Amazon Aurora", Boolean.FALSE, "AMAZON_AURORA", "AMAZON_AURORA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    PSQL(
-         "PostgreSQL", "PostgreSQL", Boolean.TRUE, "POSTGRESQL", "POSTGRE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    PLUSPSQL(
-             "PostgresPlus", "PostgresPlus", Boolean.TRUE, "POSTGRESPLUS", "POSTGREPLUS", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    ORACLEFORSID(
-                 "ORACLE_SID", "Oracle with SID", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    ORACLESN(
-             "ORACLE_SERVICE_NAME", "Oracle with service name", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    ORACLE_OCI(
-               "ORACLE_OCI", "Oracle OCI", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    ORACLE_CUSTOM(
-                  "ORACLE_CUSTOM", "Oracle Custom", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$    
-    /**
-     * @deprecated odbc is not supported in java8
-     */
-    GODBC(
-          "Generic ODBC", "Generic ODBC (Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    /**
-     * @deprecated odbc is not supported in java8
-     */
-    MSODBC(
-           "Microsoft SQL (Odbc driver)", "Microsoft SQL Server (Odbc driver, Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    IBMDB2(
-           "IBM DB2", "IBM DB2", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    IBMDB2ZOS(
-              "IBM DB2 ZOS", "IBM DB2 ZOS", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    SYBASEASE(
-              "SybaseASE", "Sybase (ASE and IQ)", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    // this Sybase IQ not used.
-    SYBASEIQ(
-             "Sybase IQ", "Sybase IQ", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    MSSQL(
-          "MSSQL", "Microsoft SQL Server", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    MSSQL05_08(
-               "MSSQL", "Microsoft SQL Server 2005/2008", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    // this don't use in Branch 2.0
-    HSQLDB("HSQLDB", "HSQLDB", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    HSQLDB_SERVER(
-                  "HSQLDB Server", "HSQLDB Server", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    HSQLDB_WEBSERVER(
-                     "HSQLDB WebServer", "HSQLDB WebServer", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    HSQLDB_IN_PROGRESS(
-                       "HSQLDB In-Process", "HSQLDB In-Process", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    JAVADB("JavaDB", "JavaDB", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    INGRES(
-           "Ingres", "Ingres", Boolean.FALSE, "INGRES", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "INGRES"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    INTERBASE(
-              "Interbase", "Interbase", Boolean.FALSE, "INTERBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INTERBASE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    SQLITE("SQLite", "SQLite", Boolean.FALSE, "SQLITE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "SQLITE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    FIREBIRD(
-             "FireBird", "FireBird", Boolean.FALSE, "FIREBIRD", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "FIREBIRD"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    INFORMIX(
-             "Informix", "Informix", Boolean.TRUE, "INFORMIX", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INFORMIX"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    VECTORWISE(
-               "VectorWise", "VectorWise", Boolean.FALSE, "VECTORWISE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
-
-    ACCESS(
-           "Access", "Access", Boolean.FALSE, "ACCESS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Default_Name), // "ACCESS"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    TERADATA(
-             "Teradata", "Teradata", Boolean.TRUE, "TERADATA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "TERADATA"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    AS400("AS400", "AS400", Boolean.FALSE, "AS400", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Login), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    JAVADB_EMBEDED(
-                   "JavaDB Embeded", "JavaDB Embeded", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    JAVADB_JCCJDBC(
-                   "JavaDB JCCJDBC", "JavaDB JCCJDBC", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    JAVADB_DERBYCLIENT(
-                       "JavaDB DerbyClient", "JavaDB DerbyClient", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    VERTICA(
-            "Vertica", "Vertica", Boolean.TRUE, "VERTICA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    MAXDB("MAXDB", "MaxDB", Boolean.FALSE, "MAXDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    GREENPLUM(
-              "Greenplum", "Greenplum", Boolean.TRUE, "GREENPLUM", "GREENPLUM", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    PARACCEL(
-             "ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    NETEZZA(
-            "Netezza", "Netezza", Boolean.FALSE, "NETEZZA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    SAS("SAS", "SAS", Boolean.TRUE, "SAS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    // General JDBC not support schema defalut
-    GENERAL_JDBC(
-                 "General JDBC", "General JDBC", Boolean.FALSE, "JDBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    EXASOL("Exasol", "Exasol", Boolean.TRUE, "Exasol", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    HIVE("Hive", "Hive", Boolean.FALSE, "HIVE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    SAPHana(
-            "SAPHana", "SAPHana", Boolean.TRUE, "SAPHANA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    H2("H2", "H2", Boolean.FALSE, "H2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    REDSHIFT(
-             "Redshift", "Redshift", Boolean.TRUE, "REDSHIFT", "REDSHIFT", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
-    IMPALA(
-           "IMPALA", "Impala", Boolean.TRUE, "IMPALA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-
-    HBASE(
-          "HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    MAPRDB(
-           "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-    // displayName is used in Java code.
-    private String displayName;
-
-    private Boolean isNeedSchema;
-
-    // dbType is used in compnonent XML file.
-    private String dbType;
-
-    // product used for the mappings.
-    private String product;
-
-    // needs a mapping for bug 0004305
-    private String xmlType;
-
-    private boolean useProvider = false;
-
-    private EDatabaseSchemaOrCatalogMapping catalogMappingField;
-
-    private EDatabaseSchemaOrCatalogMapping schemaMappingField;
-
-    public EDatabaseSchemaOrCatalogMapping getCatalogMappingField() {
-        return this.catalogMappingField;
-    }
-
-    public EDatabaseSchemaOrCatalogMapping getSchemaMappingField() {
-        return this.schemaMappingField;
-    }
-
-    public String getDisplayName() {
-        return this.displayName;
-    }
-
-    public Boolean isNeedSchema() {
-        return this.isNeedSchema;
-    }
-
-    public String getXmlName() {
-        return this.dbType;
-    }
-
-    public String getProduct() {
-        return this.product;
-    }
-
-    public String getXMLType() {
-        return this.xmlType;
-    }
-
-    EDatabaseTypeName(String dbType, String displayName, Boolean isNeedSchema, String product,
-            EDatabaseSchemaOrCatalogMapping catalogMappingField, EDatabaseSchemaOrCatalogMapping schemaMappingField) {
-        this.displayName = displayName;
-        this.isNeedSchema = isNeedSchema;
-        this.dbType = dbType;
-        this.product = product;
-        this.xmlType = product;
-        this.catalogMappingField = catalogMappingField;
-        this.schemaMappingField = schemaMappingField;
-    }
-
-    EDatabaseTypeName(String dbType, String displayName, Boolean isNeedSchema, String product,
-            EDatabaseSchemaOrCatalogMapping catalogMappingField, EDatabaseSchemaOrCatalogMapping schemaMappingField,
-            boolean useProvider) {
-        this(dbType, displayName, isNeedSchema, product, catalogMappingField, schemaMappingField);
-        this.useProvider = useProvider;
-    }
-
-    EDatabaseTypeName(String dbType, String displayName, Boolean isNeedSchema, String product, String xmlType,
-            EDatabaseSchemaOrCatalogMapping catalogMappingField, EDatabaseSchemaOrCatalogMapping schemaMappingField) {
-        this.displayName = displayName;
-        this.isNeedSchema = isNeedSchema;
-        this.dbType = dbType;
-        this.product = product;
-        this.xmlType = xmlType;
-        this.catalogMappingField = catalogMappingField;
-        this.schemaMappingField = schemaMappingField;
-    }
-
-    public static EDatabaseTypeName getTypeFromDbType(String dbType) {
-        if (dbType == null) {
-            return getTypeFromDispalyNameOriginal(dbType);
-        }
-        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
-            if (typename.getXmlName().toUpperCase().equals(dbType.toUpperCase())) {
-                return typename;
-            }
-            if (typename.getProduct().toUpperCase().equals(dbType.toUpperCase())) {
-                return typename;
-            }
-        }
-        return getTypeFromDispalyNameOriginal(dbType);
-    }
-
-    public static EDatabaseTypeName getTypeFromDbType(String dbType, boolean isDefault) {
-        if (dbType == null) {
-            return getTypeFromDisplayNameOriginal(dbType, isDefault);
-        }
-        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
-            if (typename.getXmlName().toUpperCase().equals(dbType.toUpperCase())) {
-                return typename;
-            }
-            if (typename.getProduct().toUpperCase().equals(dbType.toUpperCase())) {
-                return typename;
-            }
-        }
-        return getTypeFromDisplayNameOriginal(dbType, isDefault);
-    }
-
-    public static EDatabaseTypeName getTypeFromDisplayName(String displayName) {
-        return getTypeFromDbType(displayName);
-    }
-
-    private static EDatabaseTypeName getTypeFromDispalyNameOriginal(String displayName) {
-        if (displayName == null) {
-            return MYSQL;
-        }
-        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
-            if (typename.getDisplayName().toLowerCase().equals(displayName.toLowerCase())) {
-                return typename;
-            }
-        }
-        return MYSQL;
-    }
-
-    public static EDatabaseTypeName getTypeFromDisplayName(String displayName, boolean isDefault) {
-        return getTypeFromDisplayNameOriginal(displayName, isDefault);
-    }
-
-    private static EDatabaseTypeName getTypeFromDisplayNameOriginal(String displayName, boolean isDefault) {
-        if (displayName == null && isDefault) {
-            return MYSQL;
-        } else if (displayName == null) {
-            return null;
-        }
-        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
-            if (typename.getDisplayName().toLowerCase().equals(displayName.toLowerCase())) {
-                return typename;
-            }
-        }
-        return isDefault ? MYSQL : null;
-    }
-
-    /**
-     * DOC zli Comment method "getTypeFromProductName".
-     * 
-     * @param productName
-     * @return
-     */
-    public static EDatabaseTypeName getTypeFromProductName(String productName) {
-        if (productName == null) {
-            return MYSQL;
-        }
-        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
-            if (typename.getProduct().equals(productName)) {
-                return typename;
-            }
-        }
-        return MYSQL;
-    }
-
-    /**
-     * This is only for the component type, not for the repository.
-     * 
-     * @param dbType
-     * @return
-     */
-    public static boolean supportDbType(String dbType) {
-        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
-            if (typename.getXmlName().equals(dbType)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean isUseProvider() {
-        return useProvider;
-    }
-
-    public boolean isSupport() {
-        boolean isSupport = true;
-
-        if (EDatabaseTypeName.GODBC == this || EDatabaseTypeName.MSODBC == this) {
-            boolean isSupportODBC = CoreRuntimePlugin.getInstance().getProjectPreferenceManager()
-                    .getBoolean(IProjectSettingPreferenceConstants.METADATA_DBCONNECTION_ODBC_ENABLE);
-            isSupport = isSupportODBC;
-        }
-
-        return isSupport;
-    }
-}
+// ============================================================================
+//
+// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.core.database;
+
+import org.talend.core.model.metadata.builder.database.EDatabaseSchemaOrCatalogMapping;
+import org.talend.core.runtime.CoreRuntimePlugin;
+import org.talend.core.runtime.projectsetting.IProjectSettingPreferenceConstants;
+
+/**
+ * qzhang class global comment. Detailled comment <br/>
+ * 
+ */
+public enum EDatabaseTypeName {
+    MYSQL(
+          "MySQL", "MySQL", Boolean.FALSE, "MYSQL", "MYSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    AMAZON_AURORA(
+                  "Amazon Aurora", "Amazon Aurora", Boolean.FALSE, "AMAZON_AURORA", "AMAZON_AURORA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    PSQL(
+         "PostgreSQL", "PostgreSQL", Boolean.TRUE, "POSTGRESQL", "POSTGRE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    PLUSPSQL(
+             "PostgresPlus", "PostgresPlus", Boolean.TRUE, "POSTGRESPLUS", "POSTGREPLUS", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    ORACLEFORSID(
+                 "ORACLE_SID", "Oracle with SID", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    ORACLESN(
+             "ORACLE_SERVICE_NAME", "Oracle with service name", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    ORACLE_OCI(
+               "ORACLE_OCI", "Oracle OCI", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    ORACLE_CUSTOM(
+                  "ORACLE_CUSTOM", "Oracle Custom", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$    
+    /**
+     * @deprecated odbc is not supported in java8
+     */
+    GODBC(
+          "Generic ODBC", "Generic ODBC (Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    /**
+     * @deprecated odbc is not supported in java8
+     */
+    MSODBC(
+           "Microsoft SQL (Odbc driver)", "Microsoft SQL Server (Odbc driver, Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    IBMDB2(
+           "IBM DB2", "IBM DB2", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    IBMDB2ZOS(
+              "IBM DB2 ZOS", "IBM DB2 ZOS", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    SYBASEASE(
+              "SybaseASE", "Sybase (ASE and IQ)", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    // this Sybase IQ not used.
+    SYBASEIQ(
+             "Sybase IQ", "Sybase IQ", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    MSSQL(
+          "MSSQL", "Microsoft SQL Server", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    MSSQL05_08(
+               "MSSQL", "Microsoft SQL Server 2005/2008", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    MSSQL_PROPRIETARY(
+            "MSSQL_PROPRIETARY", "Microsoft SQL Server(Proprietary Driver)", Boolean.TRUE, "SQL_SERVER", "MSSQL_PROPRIETARY", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema),
+    // this don't use in Branch 2.0
+    HSQLDB("HSQLDB", "HSQLDB", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    HSQLDB_SERVER(
+                  "HSQLDB Server", "HSQLDB Server", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    HSQLDB_WEBSERVER(
+                     "HSQLDB WebServer", "HSQLDB WebServer", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    HSQLDB_IN_PROGRESS(
+                       "HSQLDB In-Process", "HSQLDB In-Process", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    JAVADB("JavaDB", "JavaDB", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    INGRES(
+           "Ingres", "Ingres", Boolean.FALSE, "INGRES", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "INGRES"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    INTERBASE(
+              "Interbase", "Interbase", Boolean.FALSE, "INTERBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INTERBASE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    SQLITE("SQLite", "SQLite", Boolean.FALSE, "SQLITE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "SQLITE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    FIREBIRD(
+             "FireBird", "FireBird", Boolean.FALSE, "FIREBIRD", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "FIREBIRD"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    INFORMIX(
+             "Informix", "Informix", Boolean.TRUE, "INFORMIX", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INFORMIX"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    VECTORWISE(
+               "VectorWise", "VectorWise", Boolean.FALSE, "VECTORWISE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
+
+    ACCESS(
+           "Access", "Access", Boolean.FALSE, "ACCESS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Default_Name), // "ACCESS"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    TERADATA(
+             "Teradata", "Teradata", Boolean.TRUE, "TERADATA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "TERADATA"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    AS400("AS400", "AS400", Boolean.FALSE, "AS400", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Login), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    JAVADB_EMBEDED(
+                   "JavaDB Embeded", "JavaDB Embeded", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    JAVADB_JCCJDBC(
+                   "JavaDB JCCJDBC", "JavaDB JCCJDBC", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    JAVADB_DERBYCLIENT(
+                       "JavaDB DerbyClient", "JavaDB DerbyClient", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    VERTICA(
+            "Vertica", "Vertica", Boolean.TRUE, "VERTICA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    MAXDB("MAXDB", "MaxDB", Boolean.FALSE, "MAXDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    GREENPLUM(
+              "Greenplum", "Greenplum", Boolean.TRUE, "GREENPLUM", "GREENPLUM", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    PARACCEL(
+             "ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    NETEZZA(
+            "Netezza", "Netezza", Boolean.FALSE, "NETEZZA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    SAS("SAS", "SAS", Boolean.TRUE, "SAS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    // General JDBC not support schema defalut
+    GENERAL_JDBC(
+                 "General JDBC", "General JDBC", Boolean.FALSE, "JDBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    EXASOL("Exasol", "Exasol", Boolean.TRUE, "Exasol", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    HIVE("Hive", "Hive", Boolean.FALSE, "HIVE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    SAPHana(
+            "SAPHana", "SAPHana", Boolean.TRUE, "SAPHANA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    H2("H2", "H2", Boolean.FALSE, "H2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    REDSHIFT(
+             "Redshift", "Redshift", Boolean.TRUE, "REDSHIFT", "REDSHIFT", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
+    IMPALA(
+           "IMPALA", "Impala", Boolean.TRUE, "IMPALA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
+
+    HBASE(
+          "HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+    // displayName is used in Java code.
+    private String displayName;
+
+    private Boolean isNeedSchema;
+
+    // dbType is used in compnonent XML file.
+    private String dbType;
+
+    // product used for the mappings.
+    private String product;
+
+    // needs a mapping for bug 0004305
+    private String xmlType;
+
+    private boolean useProvider = false;
+
+    private EDatabaseSchemaOrCatalogMapping catalogMappingField;
+
+    private EDatabaseSchemaOrCatalogMapping schemaMappingField;
+
+    public EDatabaseSchemaOrCatalogMapping getCatalogMappingField() {
+        return this.catalogMappingField;
+    }
+
+    public EDatabaseSchemaOrCatalogMapping getSchemaMappingField() {
+        return this.schemaMappingField;
+    }
+
+    public String getDisplayName() {
+        return this.displayName;
+    }
+
+    public Boolean isNeedSchema() {
+        return this.isNeedSchema;
+    }
+
+    public String getXmlName() {
+        return this.dbType;
+    }
+
+    public String getProduct() {
+        return this.product;
+    }
+
+    public String getXMLType() {
+        return this.xmlType;
+    }
+
+    EDatabaseTypeName(String dbType, String displayName, Boolean isNeedSchema, String product,
+            EDatabaseSchemaOrCatalogMapping catalogMappingField, EDatabaseSchemaOrCatalogMapping schemaMappingField) {
+        this.displayName = displayName;
+        this.isNeedSchema = isNeedSchema;
+        this.dbType = dbType;
+        this.product = product;
+        this.xmlType = product;
+        this.catalogMappingField = catalogMappingField;
+        this.schemaMappingField = schemaMappingField;
+    }
+
+    EDatabaseTypeName(String dbType, String displayName, Boolean isNeedSchema, String product,
+            EDatabaseSchemaOrCatalogMapping catalogMappingField, EDatabaseSchemaOrCatalogMapping schemaMappingField,
+            boolean useProvider) {
+        this(dbType, displayName, isNeedSchema, product, catalogMappingField, schemaMappingField);
+        this.useProvider = useProvider;
+    }
+
+    EDatabaseTypeName(String dbType, String displayName, Boolean isNeedSchema, String product, String xmlType,
+            EDatabaseSchemaOrCatalogMapping catalogMappingField, EDatabaseSchemaOrCatalogMapping schemaMappingField) {
+        this.displayName = displayName;
+        this.isNeedSchema = isNeedSchema;
+        this.dbType = dbType;
+        this.product = product;
+        this.xmlType = xmlType;
+        this.catalogMappingField = catalogMappingField;
+        this.schemaMappingField = schemaMappingField;
+    }
+
+    public static EDatabaseTypeName getTypeFromDbType(String dbType) {
+        if (dbType == null) {
+            return getTypeFromDispalyNameOriginal(dbType);
+        }
+        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
+            if (typename.getXmlName().toUpperCase().equals(dbType.toUpperCase())) {
+                return typename;
+            }
+            if (typename.getProduct().toUpperCase().equals(dbType.toUpperCase())) {
+                return typename;
+            }
+        }
+        return getTypeFromDispalyNameOriginal(dbType);
+    }
+
+    public static EDatabaseTypeName getTypeFromDbType(String dbType, boolean isDefault) {
+        if (dbType == null) {
+            return getTypeFromDisplayNameOriginal(dbType, isDefault);
+        }
+        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
+            if (typename.getXmlName().toUpperCase().equals(dbType.toUpperCase())) {
+                return typename;
+            }
+            if (typename.getProduct().toUpperCase().equals(dbType.toUpperCase())) {
+                return typename;
+            }
+        }
+        return getTypeFromDisplayNameOriginal(dbType, isDefault);
+    }
+
+    public static EDatabaseTypeName getTypeFromDisplayName(String displayName) {
+        return getTypeFromDbType(displayName);
+    }
+
+    private static EDatabaseTypeName getTypeFromDispalyNameOriginal(String displayName) {
+        if (displayName == null) {
+            return MYSQL;
+        }
+        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
+            if (typename.getDisplayName().toLowerCase().equals(displayName.toLowerCase())) {
+                return typename;
+            }
+        }
+        return MYSQL;
+    }
+
+    public static EDatabaseTypeName getTypeFromDisplayName(String displayName, boolean isDefault) {
+        return getTypeFromDisplayNameOriginal(displayName, isDefault);
+    }
+
+    private static EDatabaseTypeName getTypeFromDisplayNameOriginal(String displayName, boolean isDefault) {
+        if (displayName == null && isDefault) {
+            return MYSQL;
+        } else if (displayName == null) {
+            return null;
+        }
+        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
+            if (typename.getDisplayName().toLowerCase().equals(displayName.toLowerCase())) {
+                return typename;
+            }
+        }
+        return isDefault ? MYSQL : null;
+    }
+
+    /**
+     * DOC zli Comment method "getTypeFromProductName".
+     * 
+     * @param productName
+     * @return
+     */
+    public static EDatabaseTypeName getTypeFromProductName(String productName) {
+        if (productName == null) {
+            return MYSQL;
+        }
+        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
+            if (typename.getProduct().equals(productName)) {
+                return typename;
+            }
+        }
+        return MYSQL;
+    }
+
+    /**
+     * This is only for the component type, not for the repository.
+     * 
+     * @param dbType
+     * @return
+     */
+    public static boolean supportDbType(String dbType) {
+        for (EDatabaseTypeName typename : EDatabaseTypeName.values()) {
+            if (typename.getXmlName().equals(dbType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isUseProvider() {
+        return useProvider;
+    }
+
+    public boolean isSupport() {
+        boolean isSupport = true;
+
+        if (EDatabaseTypeName.GODBC == this || EDatabaseTypeName.MSODBC == this) {
+            boolean isSupportODBC = CoreRuntimePlugin.getInstance().getProjectPreferenceManager()
+                    .getBoolean(IProjectSettingPreferenceConstants.METADATA_DBCONNECTION_ODBC_ENABLE);
+            isSupport = isSupportODBC;
+        }
+
+        return isSupport;
+    }
+}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/ConnParameterKeys.java

@@ -205,29 +205,6 @@ public class ConnParameterKeys {
 
     public static final String CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_DURATION = "CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_DURATION";//$NON-NLS-1$
 
-    /**
-     * MapR-DB keys.
-     */
-    public static final String CONN_PARA_KEY_MAPRDB_DISTRIBUTION = "CONN_PARA_KEY_MAPRDB_DISTRIBUTION"; //$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_MAPRDB_VERSION = "CONN_PARA_KEY_MAPRDB_VERSION"; //$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_MAPRDB_PROPERTIES = "CONN_PARA_KEY_MAPRDB_PROPERTIES"; //$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MASTERPRINCIPAL = "CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MASTERPRINCIPAL";//$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_MAPRDB_AUTHENTICATION_REGIONSERVERPRINCIPAL = "CONN_PARA_KEY_MAPRDB_AUTHENTICATION_REGIONSERVERPRINCIPAL";//$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_MAPRDB_AUTHENTICATION_USE_MAPRTICKET = "CONN_PARA_KEY_MAPRDB_AUTHENTICATION_USE_MAPRTICKET";//$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_MAPRDB_AUTHENTICATION_USERNAME = "CONN_PARA_KEY_MAPRDB_AUTHENTICATION_USERNAME";//$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_PASSWORD = "CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_PASSWORD";//$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_CLUSTER = "CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_CLUSTER";//$NON-NLS-1$
-
-    public static final String CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_DURATION = "CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_DURATION";//$NON-NLS-1$
-
     /**
      * Impala keys.
      */

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/template/DbConnStrForMSSQL.java

@@ -1,75 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.database.conn.template;
-
-import org.talend.core.database.EDatabaseTypeName;
-import org.talend.core.database.conn.version.EDatabaseVersion4Drivers;
-
-/**
- * @author hWang
- * @version 1.0 jdk1.6
- * @date Aug 8, 2016
- */
-public class DbConnStrForMSSQL extends DbConnStr {
-
-    private static final String URL_MSSQL = "jdbc:jtds:sqlserver://<host>:<port>/<sid>;<property>"; //$NON-NLS-1$
-
-    public static final String URL_MSSQL_2012 = "jdbc:jtds:sqlserver://<host>:<port>/<sid>;<property>";//$NON-NLS-1$
-
-    private static final String URL_MSSQL_PROP = "jdbc:sqlserver://<host>:<port>;DatabaseName=<sid>;<property>";//$NON-NLS-1$
-
-    /**
-     * DOC Marvin DbConnStrForHive constructor comment.
-     * 
-     * @param dbType
-     * @param urlTemplate
-     */
-    DbConnStrForMSSQL(EDatabaseTypeName dbType, String urlTemplate) {
-        super(dbType, urlTemplate);
-    }
-
-    public DbConnStrForMSSQL(EDatabaseTypeName dbType, String urlTemplate,String port, EDatabaseVersion4Drivers[] hiveModes) {
-        super(dbType, urlTemplate,port, hiveModes);
-    }
-
-    @Override
-    String getUrlTemplate(EDatabaseVersion4Drivers version) {
-        if (version == null) {
-            return super.getUrlTemplate(version);
-        }
-        switch (version) {
-        case MSSQL:
-            return URL_MSSQL;
-        case MSSQL_2012:
-            return URL_MSSQL_2012;
-        case MSSQL_PROP:
-            return URL_MSSQL_PROP;
-        default:
-            return super.getUrlTemplate(version);
-        }
-    }
-
-    @Override
-    String getUrlPattern(EDatabaseVersion4Drivers version) {
-        switch (version) {
-        case MSSQL:
-            return calcPattern(URL_MSSQL);
-        case MSSQL_2012:
-            return calcPattern(URL_MSSQL_2012);
-        case MSSQL_PROP:
-            return calcPattern(URL_MSSQL_PROP);
-        default:
-            return super.getUrlPattern(version);
-        }
-    }
-}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/template/EDatabaseConnTemplate.java

@@ -66,14 +66,17 @@ public enum EDatabaseConnTemplate {
             "<host>")), //$NON-NLS-1$  
 
     ORACLE_OCI(new DbConnStr(EDatabaseTypeName.ORACLE_OCI, //
-            "jdbc:oracle:oci8:@<service_name>")), //$NON-NLS-1$    
-    
-    MSSQL(new DbConnStrForMSSQL(EDatabaseTypeName.MSSQL, "jdbc:jtds:sqlserver://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
-            "1433", new EDatabaseVersion4Drivers[] { EDatabaseVersion4Drivers.MSSQL, EDatabaseVersion4Drivers.MSSQL_2012,
-                    EDatabaseVersion4Drivers.MSSQL_PROP})),
+            "jdbc:oracle:oci8:@<service_name>")), //$NON-NLS-1$                 
+    MSSQL(new DbConnStr(EDatabaseTypeName.MSSQL, //
+            "jdbc:jtds:sqlserver://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
+            "1433")), //$NON-NLS-1$
     MSSQL05_08(new DbConnStr(EDatabaseTypeName.MSSQL05_08, //
             "jdbc:sqlserver://<host>:<port>;DatabaseName=<sid>", //$NON-NLS-1$
             "1433")), //$NON-NLS-1$         
+    MSSQL_PROPRIETARY(new DbConnStr(EDatabaseTypeName.MSSQL_PROPRIETARY, 
+            "jdbc:sqlserver://<host>:<port>;DatabaseName=<sid>;<property>", //$NON-NLS-1$
+            "1433")),
+
 
     GODBC(new DbConnStr(EDatabaseTypeName.GODBC, //
             "jdbc:odbc:<datasource>")), //$NON-NLS-1$
@@ -195,13 +198,10 @@ public enum EDatabaseConnTemplate {
     //    HIVE2_STANDALONE(new DbConnStr(EDatabaseTypeName.HIVE, "jdbc:hive2://<host>:<port>/<sid>")), //$NON-NLS-1$
 
     IMPALA(new DbConnStr(EDatabaseTypeName.IMPALA, "jdbc:hive2://<host>:<port>/<sid>;auth=noSasl", //$NON-NLS-1$  
-            "21050")), //$NON-NLS-1$
+            "21050")), //$NON-NLS-1$  
 
     HBASE(new DbConnStr(EDatabaseTypeName.HBASE, "127.0.0.1", //$NON-NLS-1$
-            "2181")), //$NON-NLS-1$
-
-    MAPRDB(new DbConnStr(EDatabaseTypeName.MAPRDB, "127.0.0.1", //$NON-NLS-1$
-            "5181")); //$NON-NLS-1$    
+            "2181")); //$NON-NLS-1$
 
     private DbConnStr connStr;
 
@@ -337,7 +337,6 @@ public enum EDatabaseConnTemplate {
             case SAS:
             case SAPHana:
             case HBASE:
-            case MAPRDB:
                 return true;
             default:
             }
@@ -350,6 +349,7 @@ public enum EDatabaseConnTemplate {
         if (template != null) {
             switch (template) {
             case MSSQL:
+            case MSSQL_PROPRIETARY:
             case INFORMIX:
             case MYSQL:
             case AMAZON_AURORA:
@@ -383,6 +383,7 @@ public enum EDatabaseConnTemplate {
             case INGRES:
             case INTERBASE:
             case MSSQL:
+            case MSSQL_PROPRIETARY:
             case INFORMIX:
             case TERADATA:
             case AS400:

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/database/conn/version/EDatabaseVersion4Drivers.java

@@ -75,11 +75,10 @@ public enum EDatabaseVersion4Drivers {
     MYSQL_4(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 4", "MYSQL_4", "mysql-connector-java-3.1.14-bin.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MARIADB(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MariaDB", "MARIADB", "mariadb-java-client-1.1.7.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     // add for 9594
-    MSSQL(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,"Open source JTDS", "JTDS", "jtds-1.3.1-patch.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    MSSQL(new DbVersion4Drivers(EDatabaseTypeName.MSSQL, "jtds-1.3.1-patch.jar")), //$NON-NLS-1$
     MSSQL_2012(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
             "Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1-patch.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
-            "Microsoft", "MSSQL_PROP", "mssql-jdbc.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    MSSQL_PROPRIETARY(new DbVersion4Drivers(EDatabaseTypeName.MSSQL_PROPRIETARY, "mssql-jdbc.jar")), //$NON-NLS-1$
 
     VERTICA_7(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 7.0.x", "VERTICA_7_0_X", "vertica-jdbc-7.0.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     VERTICA_6_1_X(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 6.1.x", "VERTICA_6_1_X", "vertica-jdk5-6.1.2-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -98,9 +97,11 @@ public enum EDatabaseVersion4Drivers {
     PLUSPSQL_PRIOR_TO_V9(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL,
             "Prior to v9", "PRIOR_TO_V9", "postgresql-8.3-603.jdbc3.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     PLUSPSQL_V9_X(new DbVersion4Drivers(EDatabaseTypeName.PLUSPSQL, "v9.X", "V9_X", "postgresql-9.4-1201.jdbc41.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    IBMDB2(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
+    IBMDB2(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2,
+            new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
             "db2jcc_license_cisuz.jar" })), //$NON-NLS-1$ 
-    IBMDB2ZOS(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2ZOS, new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
+    IBMDB2ZOS(new DbVersion4Drivers(EDatabaseTypeName.IBMDB2ZOS,
+            new String[] { "db2jcc4.jar", "db2jcc_license_cu.jar", //$NON-NLS-1$ //$NON-NLS-2$
             "db2jcc_license_cisuz.jar" })), //$NON-NLS-1$ 
     SYBASEASE(new DbVersion4Drivers(EDatabaseTypeName.SYBASEASE, "jconn3.jar")), //$NON-NLS-1$ 
     SYBASEIQ(new DbVersion4Drivers(EDatabaseTypeName.SYBASEIQ, "jconn3.jar")), //$NON-NLS-1$ 
@@ -148,8 +149,6 @@ public enum EDatabaseVersion4Drivers {
     // Changed by Marvin Wang on Oct.9, 2012, just because the libs checking can not pass, Remy updated some jars from
     HBASE(new DbVersion4Drivers(EDatabaseTypeName.HBASE, new String[] {})),
 
-    MAPRDB(new DbVersion4Drivers(EDatabaseTypeName.MAPRDB, new String[] {})),
-
     REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "RedshiftJDBC41-1.1.13.1013.jar")), //$NON-NLS-1$
 
     AMAZON_AURORA(new DbVersion4Drivers(EDatabaseTypeName.AMAZON_AURORA, "mysql-connector-java-5.1.30-bin.jar")); //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/EHadoopCategory.java

@@ -32,8 +32,6 @@ public enum EHadoopCategory {
 
     HBASE,
 
-    MAPRDB,
-
     OOZIE,
 
     CUSTOM

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/IHadoopDistributionService.java

@@ -81,12 +81,6 @@ public interface IHadoopDistributionService extends IService {
      */
     IDistributionsManager getHBaseDistributionManager();
 
-    /**
-     * 
-     * for Maprdb in Database wizard.{@link MaprdbComponent}.
-     */
-    IDistributionsManager getMaprdbDistributionManager();
-
     /**
      * 
      * for Spark Streaming Distribution {@link SparkStreamingComponent}.

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopConfProperties.java

@@ -103,14 +103,6 @@ public enum EHadoopConfProperties {
 
     HBASE_REGIONSERVER_KERBEROS_PRINCIPAL("hbase.regionserver.kerberos.principal", "hbase/_HOST@EXAMPLE.COM"), //$NON-NLS-1$//$NON-NLS-2$
 
-    MAPRDB_ZOOKEEPER_QUORUM("hbase.zookeeper.quorum", "localhost"), //$NON-NLS-1$ //$NON-NLS-2$
-
-    MAPRDB_ZOOKEEPER_PROPERTY_CLIENTPORT("hbase.zookeeper.property.clientPort", 2181), //$NON-NLS-1$
-
-    MAPRDB_MASTER_KERBEROS_PRINCIPAL("hbase.master.kerberos.principal", "mapr/_HOST@EXAMPLE.COM"), //$NON-NLS-1$//$NON-NLS-2$
-
-    MAPRDB_REGIONSERVER_KERBEROS_PRINCIPAL("hbase.regionserver.kerberos.principal", "mapr/_HOST@EXAMPLE.COM"), //$NON-NLS-1$//$NON-NLS-2$
-
     HIVE_SERVER2_AUTHENTICATION_KERBEROS_PRINCIPAL("hive.server2.authentication.kerberos.principal", "hive/_HOST@YOUR-REALM.COM"), //$NON-NLS-1$ //$NON-NLS-2$
 
     JAVAX_JDO_OPTION_CONNECTIONURL("javax.jdo.option.ConnectionURL", "jdbc:mysql://localhost/hive?createDatabaseIfNotExist=true"), //$NON-NLS-1$ //$NON-NLS-2$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopConfs.java

@@ -30,8 +30,6 @@ public enum EHadoopConfs {
 
     HBASE("HBASE", new String[] { "hdfs-site.xml", "hbase-site.xml" }), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
-    MAPRDB("MAPRDB", new String[] { "hdfs-site.xml", "hbase-site.xml" }), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
     OOZIE("OOZIE", new String[] { "oozie-site.xml" }), //$NON-NLS-1$ //$NON-NLS-2$ 
 
     SPARK("SPARK", new String[0]), //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/conf/EHadoopProperties.java

@@ -50,10 +50,6 @@ public enum EHadoopProperties {
 
     HBASE_REGIONSERVER_PRINCIPAL,
 
-    MAPRDB_MASTER_PRINCIPAL,
-
-    MAPRDB_REGIONSERVER_PRINCIPAL,
-
     CLOUDERA_NAVIGATOR_USERNAME,
 
     CLOUDERA_NAVIGATOR_PASSWORD,

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/custom/ECustomVersionGroup.java

@@ -24,8 +24,6 @@ public enum ECustomVersionGroup {
 
     HBASE,
 
-    MAPRDB,
-
     PIG,
 
     PIG_HBASE,

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/custom/ECustomVersionType.java

@@ -16,8 +16,6 @@ public enum ECustomVersionType {
 
     HBASE("HBase", ECustomVersionGroup.HBASE), //$NON-NLS-1$
 
-    MAPRDB("Maprdb", ECustomVersionGroup.MAPRDB), //$NON-NLS-1$
-
     PIG("Pig", ECustomVersionGroup.PIG), //$NON-NLS-1$
 
     PIG_HBASE("Pig for HBase", ECustomVersionGroup.PIG_HBASE), //$NON-NLS-1$

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/components/IComponent.java

@@ -118,19 +118,8 @@ public interface IComponent {
 
     public boolean isVisible(String family);
 
-    
-    /**
-     * Get the default modules needed for the component.
-     * @return
-     */
     public List<ModuleNeeded> getModulesNeeded();
 
-    /**
-     * Get the modules needed according the setup of a defined component.
-     * @return
-     */
-    public List<ModuleNeeded> getModulesNeeded(INode node);
-
     public String getPathSource();
 
     public List<ECodePart> getAvailableCodeParts();

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/IAutoConvertTypesService.java

@@ -1,27 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.model.metadata;
-
-import java.util.List;
-
-import org.talend.core.IService;
-import org.talend.core.model.metadata.types.AutoConversionType;
-
-/**
- * created by hcyi on Aug 22, 2016 Detailled comment
- *
- */
-public interface IAutoConvertTypesService extends IService {
-
-    public List<AutoConversionType> getAllAutoConversionTypes();
-}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataToolAvroHelper.java

@@ -184,7 +184,7 @@ public final class MetadataToolAvroHelper {
 
         // Types with unknown elements, store as binary
         if (JavaTypesManager.OBJECT.getId().equals(tt)) {
-            type = AvroUtils._string();
+            // FIXME it's not right, as it don't store all the information about the object
         }
 
         if (JavaTypesManager.LIST.getId().equals(tt)) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java

@@ -950,12 +950,6 @@ public class RepositoryToComponentProperty {
         if (value.equals("PROPERTIES_STRING")) { //$NON-NLS-1$
             return getAppropriateValue(connection, connection.getAdditionalParams());
         }
-        if (value.equals("DRIVER")) { //$NON-NLS-1$
-            String dbVersionString = connection.getDbVersionString();
-            if (dbVersionString != null && EDatabaseConnTemplate.MSSQL.getDBDisplayName().equals(databaseType)) {
-                return dbVersionString.toUpperCase();
-            }
-        }
 
         if (value.equals("CDC_MODE")) { //$NON-NLS-1$
             if (isContextMode(connection, connection.getCdcTypeMode())) {
@@ -978,8 +972,6 @@ public class RepositoryToComponentProperty {
                 return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_VERSION);
             } else if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
                 return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_VERSION);
-            } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_VERSION);
             } else if (EDatabaseTypeName.GENERAL_JDBC.getDisplayName().equals(databaseType)) {
                 return dbVersionString;
             } else {
@@ -1160,10 +1152,8 @@ public class RepositoryToComponentProperty {
         }
 
         if (value.equals("DISTRIBUTION")) {
-            if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
+            if ((databaseType).equals(EDatabaseTypeName.HBASE.getDisplayName())) {
                 return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_DISTRIBUTION);
-            } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_DISTRIBUTION);
             } else {
                 return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_DISTRIBUTION);
             }
@@ -1186,26 +1176,14 @@ public class RepositoryToComponentProperty {
         }
 
         if (value.equals("HBASE_MASTER_PRINCIPAL")) {
-            String hbaseMasterPrinc = null;
-            if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
-                hbaseMasterPrinc = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MASTERPRINCIPAL);
-            } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                hbaseMasterPrinc = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MASTERPRINCIPAL);
-            }
+            String hbaseMasterPrinc = connection.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MASTERPRINCIPAL);
             return getAppropriateValue(connection, hbaseMasterPrinc);
         }
 
         if (value.equals("HBASE_REGIONSERVER_PRINCIPAL")) {
-            String hbaseRegPrinc = null;
-            if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
-                hbaseRegPrinc = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_REGIONSERVERPRINCIPAL);
-            } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                hbaseRegPrinc = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_REGIONSERVERPRINCIPAL);
-            }
+            String hbaseRegPrinc = connection.getParameters().get(
+                    ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_REGIONSERVERPRINCIPAL);
             return getAppropriateValue(connection, hbaseRegPrinc);
         }
 
@@ -1214,9 +1192,6 @@ public class RepositoryToComponentProperty {
             if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
                 useMaprTValue = connection.getParameters().get(
                         ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_USE_MAPRTICKET);
-            } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                useMaprTValue = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_USE_MAPRTICKET);
             } else if (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)) {
                 useMaprTValue = connection.getParameters()
                         .get(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_USE_MAPRTICKET);
@@ -1224,12 +1199,7 @@ public class RepositoryToComponentProperty {
             return Boolean.parseBoolean(useMaprTValue);
         }
         if (value.equals("USERNAME")) {
-            String hbaseUsername = null;
-            if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
-                hbaseUsername = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_USERNAME);
-            } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                hbaseUsername = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_USERNAME);
-            }
+            String hbaseUsername = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_USERNAME);
             return getAppropriateValue(connection, hbaseUsername);
         }
         if (value.equals("MAPRTICKET_USERNAME")) {
@@ -1243,9 +1213,6 @@ public class RepositoryToComponentProperty {
             if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
                 maprticket_Password = connection.getParameters().get(
                         ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_PASSWORD);
-            } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                maprticket_Password = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_PASSWORD);
             } else if (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)) {
                 maprticket_Password = connection.getParameters().get(
                         ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_PASSWORD);
@@ -1257,9 +1224,6 @@ public class RepositoryToComponentProperty {
             if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
                 maprticket_Cluster = connection.getParameters().get(
                         ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_CLUSTER);
-            } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                maprticket_Cluster = connection.getParameters().get(
-                        ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_CLUSTER);
             } else if (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)) {
                 maprticket_Cluster = connection.getParameters().get(
                         ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_CLUSTER);
@@ -1269,8 +1233,6 @@ public class RepositoryToComponentProperty {
         if (value.equals("MAPRTICKET_DURATION")) {
             if (EDatabaseTypeName.HBASE.getDisplayName().equals(databaseType)) {
                 return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HBASE_AUTHENTICATION_MAPRTICKET_DURATION);
-            } else if (EDatabaseTypeName.MAPRDB.getDisplayName().equals(databaseType)) {
-                return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_AUTHENTICATION_MAPRTICKET_DURATION);
             } else if (EDatabaseTypeName.HIVE.getDisplayName().equals(databaseType)) {
                 return connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_HIVE_AUTHENTICATION_MAPRTICKET_DURATION);
             }
@@ -1615,8 +1577,8 @@ public class RepositoryToComponentProperty {
     private static boolean isContextMode(Connection connection, String value) {
         IMetadataManagmentUiService mmService = null;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IMetadataManagmentUiService.class)) {
-            mmService = (IMetadataManagmentUiService) GlobalServiceRegister.getDefault().getService(
-                    IMetadataManagmentUiService.class);
+            mmService = (IMetadataManagmentUiService) GlobalServiceRegister.getDefault()
+                    .getService(IMetadataManagmentUiService.class);
         }
         if (mmService != null) {
             return mmService.isContextMode(connection, value);

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/types/AutoConversionType.java

@@ -1,54 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.model.metadata.types;
-
-/**
- * created by hcyi on Aug 19, 2016 Detailled comment
- *
- */
-public class AutoConversionType {
-
-    private String sourceDataType;
-
-    private String targetDataType;
-
-    private String conversionFunction;
-
-    public AutoConversionType() {
-        //
-    }
-
-    public String getSourceDataType() {
-        return this.sourceDataType;
-    }
-
-    public void setSourceDataType(String sourceDataType) {
-        this.sourceDataType = sourceDataType;
-    }
-
-    public String getTargetDataType() {
-        return this.targetDataType;
-    }
-
-    public void setTargetDataType(String targetDataType) {
-        this.targetDataType = targetDataType;
-    }
-
-    public String getConversionFunction() {
-        return this.conversionFunction;
-    }
-
-    public void setConversionFunction(String conversionFunction) {
-        this.conversionFunction = conversionFunction;
-    }
-}

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

@@ -1054,13 +1054,13 @@ public abstract class AbstractNode implements INode {
 
     @Override
     public List<ModuleNeeded> getModulesNeeded() {
-        if (modulesNeeded.isEmpty() && component != null && component.getModulesNeeded(this) != null) {
+        if (modulesNeeded.isEmpty() && component != null && component.getModulesNeeded() != null) {
             // if the list is empty, initialize from the original component
             // this avoids complex refactor to initialize this list all the
             // time, and add the possibility to add more
             // modules needed to one original component
 
-            modulesNeeded.addAll(component.getModulesNeeded(this));
+            modulesNeeded.addAll(component.getModulesNeeded());
         }
         return modulesNeeded;
     }

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

@@ -53,8 +53,6 @@ import org.talend.core.model.properties.PropertiesFactory;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.properties.User;
 import org.talend.core.ui.IJobletProviderService;
-import org.talend.core.ui.ISparkJobletProviderService;
-import org.talend.core.ui.ISparkStreamingJobletProviderService;
 import org.talend.core.ui.images.RepositoryImageProvider;
 import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.helper.PackageHelper;
@@ -195,7 +193,7 @@ public class RepositoryViewObject implements IRepositoryViewObject {
             // ExceptionHandler.process(e);
             // }
 
-            image = getDefaultJobletImage(item);
+            image = getDefaultJobletImage();
         } else {
 
             ImageDescriptor imageDesc = ImageUtils.createImageFromData(item.getIcon().getInnerContent());
@@ -212,21 +210,7 @@ public class RepositoryViewObject implements IRepositoryViewObject {
         return image;
     }
 
-    public static Image getDefaultJobletImage(Item item ) {
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(ISparkJobletProviderService.class)) {
-            ISparkJobletProviderService sparkJobletService = (ISparkJobletProviderService) GlobalServiceRegister
-                    .getDefault().getService(ISparkJobletProviderService.class);
-            if (sparkJobletService != null && sparkJobletService.isSparkJobletItem(item)) {
-                return  ImageProvider.getImage(ECoreImage.SPARK_JOBLET_COMPONENT_ICON);
-            }
-        }
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(ISparkStreamingJobletProviderService.class)) {
-            ISparkStreamingJobletProviderService sparkStreamingJobletService = (ISparkStreamingJobletProviderService) GlobalServiceRegister
-                    .getDefault().getService(ISparkStreamingJobletProviderService.class);
-            if (sparkStreamingJobletService != null && sparkStreamingJobletService.isSparkStreamingJobletItem(item)) {
-                return  ImageProvider.getImage(ECoreImage.SPARK_STREAMING_JOBLET_COMPONENT_ICON);
-            }
-        }
+    public static Image getDefaultJobletImage() {
         return ImageProvider.getImage(ECoreImage.JOBLET_COMPONENT_ICON);
     }
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/RepositoryUpdateManager.java

@@ -93,8 +93,6 @@ import org.talend.core.runtime.i18n.Messages;
 import org.talend.core.service.IMRProcessService;
 import org.talend.core.service.IMetadataManagmentService;
 import org.talend.core.service.IStormProcessService;
-import org.talend.core.ui.ISparkJobletProviderService;
-import org.talend.core.ui.ISparkStreamingJobletProviderService;
 import org.talend.cwm.helper.ConnectionHelper;
 import org.talend.cwm.helper.SAPBWTableHelper;
 import org.talend.designer.core.IDesignerCoreService;
@@ -1055,8 +1053,6 @@ public abstract class RepositoryUpdateManager {
                 hadoopProperties = parameters.get(ConnParameterKeys.CONN_PARA_KEY_HIVE_PROPERTIES);
             } else if (EDatabaseConnTemplate.HBASE.getDBDisplayName().equals(databaseType)) {
                 hadoopProperties = parameters.get(ConnParameterKeys.CONN_PARA_KEY_HBASE_PROPERTIES);
-            } else if (EDatabaseConnTemplate.MAPRDB.getDBDisplayName().equals(databaseType)) {
-                hadoopProperties = parameters.get(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_PROPERTIES);
             }
             List<Map<String, Object>> hadoopPropertiesList = HadoopRepositoryUtil.getHadoopPropertiesList(hadoopProperties);
             if (!hadoopPropertiesList.isEmpty()) {
@@ -1071,8 +1067,6 @@ public abstract class RepositoryUpdateManager {
                     dbConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HIVE_PROPERTIES, hadoopPropertiesJson);
                 } else if (EDatabaseConnTemplate.HBASE.getDBDisplayName().equals(databaseType)) {
                     dbConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_HBASE_PROPERTIES, hadoopPropertiesJson);
-                } else if (EDatabaseConnTemplate.MAPRDB.getDBDisplayName().equals(databaseType)) {
-                    dbConn.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_MAPRDB_PROPERTIES, hadoopPropertiesJson);
                 }
             }
         }
@@ -1146,8 +1140,8 @@ public abstract class RepositoryUpdateManager {
                     jobContextManager.setRepositoryRenamedMap(getContextRenamedMap());
                     jobContextManager.setNewParametersMap(getNewParametersMap());
                     Map<ContextItem, List<IContext>> repositoryAddGroupContext = getRepositoryAddGroupContext();
-
-                    if (checkAddContextGroup && repositoryAddGroupContext.isEmpty() && parameter instanceof ContextItem) {
+                    
+                    if(checkAddContextGroup && repositoryAddGroupContext.isEmpty() && parameter instanceof ContextItem) {
                         List<IContext> addContextGroupList = new ArrayList<IContext>();
                         List<IContext> jobContexts = process2.getContextManager().getListContext();
                         List<ContextType> repositoryContexts = ((ContextItem) parameter).getContext();
@@ -1178,7 +1172,7 @@ public abstract class RepositoryUpdateManager {
                         }
                         repositoryAddGroupContext.put((ContextItem) parameter, addContextGroupList);
                     }
-
+                    
                     List<IContext> listIContext = new ArrayList<IContext>();
                     for (ContextItem item : repositoryAddGroupContext.keySet()) {
                         List<IContext> list = repositoryAddGroupContext.get(item);
@@ -1303,30 +1297,7 @@ public abstract class RepositoryUpdateManager {
         String label = null;
         String version = null;
         if (property.getItem() instanceof JobletProcessItem) { // for joblet
-            boolean isSpark = false;
-            boolean isSparkStreaming = false;
-            if (GlobalServiceRegister.getDefault().isServiceRegistered(ISparkJobletProviderService.class)) {
-                ISparkJobletProviderService sparkJobletService = (ISparkJobletProviderService) GlobalServiceRegister
-                        .getDefault().getService(ISparkJobletProviderService.class);
-                if (sparkJobletService != null && sparkJobletService.isSparkJobletItem(property.getItem())) {
-                    isSpark = true;
-                }
-            }
-            if (GlobalServiceRegister.getDefault().isServiceRegistered(ISparkStreamingJobletProviderService.class)) {
-                ISparkStreamingJobletProviderService sparkStreamingJobletService = (ISparkStreamingJobletProviderService) GlobalServiceRegister
-                        .getDefault().getService(ISparkStreamingJobletProviderService.class);
-                if (sparkStreamingJobletService != null && sparkStreamingJobletService.isSparkStreamingJobletItem(property.getItem())) {
-                    isSparkStreaming = true;
-                }
-            }
-            if(isSpark){
-                prefix = UpdatesConstants.SPARK_JOBLET;
-            }else if(isSparkStreaming){
-                prefix = UpdatesConstants.SPARK_STREAMING_JOBLET;
-            }else{
-                prefix = UpdatesConstants.JOBLET;
-            }
-            
+            prefix = UpdatesConstants.JOBLET;
         }
         Item item = property.getItem();
         if (item != null && prefix.isEmpty() && GlobalServiceRegister.getDefault().isServiceRegistered(IMRProcessService.class)) {
@@ -2194,7 +2165,7 @@ public abstract class RepositoryUpdateManager {
             boolean onlySimpleShow) {
         return updateContext(repositoryContextManager, item, show, onlySimpleShow, false);
     }
-
+    
     private static boolean updateContext(JobContextManager repositoryContextManager, ContextItem item, boolean show,
             boolean onlySimpleShow, boolean detectAddContextGroup) {
         List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(item.getProperty().getId(),

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/UpdateResult.java

@@ -42,10 +42,6 @@ public abstract class UpdateResult {
     protected String jobInfor;
 
     protected boolean isJoblet;
-    
-    protected boolean isSparkJoblet;
-    
-    protected boolean isSparkStreamingJoblet;
 
     protected boolean isMR;
 
@@ -304,14 +300,6 @@ public abstract class UpdateResult {
     public boolean isJoblet() {
         return isJoblet;
     }
-    
-    public boolean isSparkJoblet() {
-        return isSparkJoblet;
-    }
-    
-    public boolean isSparkStreamingJoblet() {
-        return isSparkStreamingJoblet;
-    }
 
     public boolean isMR() {
         return isMR;

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/UpdatesConstants.java

@@ -59,10 +59,6 @@ public final class UpdatesConstants {
     public static final String COMPONENT = Messages.getString("UpdatesConstants.Component"); //$NON-NLS-1$
 
     public static final String JOBLET = Messages.getString("UpdatesConstants.Joblet"); //$NON-NLS-1$
-    
-    public static final String SPARK_JOBLET = Messages.getString("UpdatesConstants.Spark_Joblet"); //$NON-NLS-1$
-    
-    public static final String SPARK_STREAMING_JOBLET = Messages.getString("UpdatesConstants.Spark_Streaming_Joblet"); //$NON-NLS-1$
 
     public static final String JOB = Messages.getString("UpdatesConstants.Job"); //$NON-NLS-1$
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/evaluator/AbstractPropertyValueEvaluator.java

@@ -1,70 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2016 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.runtime.evaluator;
-
-import java.util.List;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.talend.core.runtime.util.GenericTypeUtils;
-import org.talend.core.utils.TalendQuoteUtils;
-import org.talend.daikon.properties.property.Property;
-import org.talend.daikon.properties.property.PropertyValueEvaluator;
-
-/**
- * created by ycbai on 2016年9月19日 Detailled comment
- *
- */
-public abstract class AbstractPropertyValueEvaluator implements PropertyValueEvaluator {
-
-    public Object getTypedValue(Property property, Object rawValue) {
-        if (GenericTypeUtils.isSchemaType(property)) {
-            return rawValue;
-        }
-        String stringValue = String.valueOf(rawValue);
-        if (GenericTypeUtils.isBooleanType(property)) {
-            return new Boolean(stringValue);
-        }
-        if (GenericTypeUtils.isIntegerType(property) && rawValue != null && !stringValue.isEmpty()) {
-            try {
-                return Integer.valueOf(stringValue);
-            } catch (Exception e) {
-                // value not existing anymore
-                // return any value to let the component work without exception
-                return 0;
-            }
-        }
-        if (GenericTypeUtils.isEnumType(property)) {
-            List<?> possibleValues = property.getPossibleValues();
-            if (possibleValues != null) {
-                Object firstValue = null;
-                if (!possibleValues.isEmpty()) {
-                    firstValue = possibleValues.get(0);
-                }
-                String stringStoredValue = TalendQuoteUtils.removeQuotes(stringValue);
-                for (Object possibleValue : possibleValues) {
-                    if (possibleValue.toString().equals(stringStoredValue)) {
-                        return possibleValue;
-                    }
-                }
-                if (firstValue != null) {
-                    return firstValue;
-                }
-            }
-        }
-        if (GenericTypeUtils.isStringType(property)) {
-            return TalendQuoteUtils.removeQuotes(StringEscapeUtils.unescapeJava(stringValue));
-        }
-        return rawValue;
-    }
-
-}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/process/TalendProcessArgumentConstant.java

@@ -38,8 +38,6 @@ public interface TalendProcessArgumentConstant {
 
     static final String ARG_CONTEXT_NAME = "CONTEXT_NAME";
 
-    static final String ARG_ONLY_DEFAUT_CONTEXT = "ONLY_DEFAUT_CONTEXT";
-
     static final String ARG_CONTEXT_PARAMS = "CONTEXT_PARAMS";
 
     static final String ARG_ENABLE_LOG4J = "ENABLE_LOG4J";

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/utils/TalendCacheUtils.java

@@ -14,7 +14,6 @@ package org.talend.core.utils;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.eclipse.core.runtime.Platform;
-import org.talend.commons.utils.system.EclipseCommandLine;
 import org.talend.core.BrandingChecker;
 import org.talend.core.model.utils.TalendPropertiesUtil;
 
@@ -26,6 +25,8 @@ import org.talend.core.model.utils.TalendPropertiesUtil;
  */
 public final class TalendCacheUtils {
 
+    private static final String CLEAN = "-clean"; //$NON-NLS-1$
+
     private static final String CLEAN_COMPONENT_CACHE = "--clean_component_cache"; //$NON-NLS-1$
 
     public static boolean isSetCleanComponentCache() {
@@ -33,7 +34,7 @@ public final class TalendCacheUtils {
     }
 
     public static boolean isSetClean() {
-        return ArrayUtils.contains(Platform.getApplicationArgs(), EclipseCommandLine.CLEAN);
+        return ArrayUtils.contains(Platform.getApplicationArgs(), CLEAN);
     }
 
     public static boolean cleanComponentCache() {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/utils/TalendQuoteUtils.java

@@ -145,7 +145,7 @@ public final class TalendQuoteUtils {
         if (newText == null || quote == null) {
             return null;
         }
-        if (!(text.startsWith(quote) && text.endsWith(quote) && text.length() > 1)) {
+        if (!text.startsWith(quote) || !text.endsWith(quote)) {
             newText = addQuotes(newText);
         }
         return newText;

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

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core.ui</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core.ui</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -1,27 +1,27 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.core</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-	<plugins>
-	  <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-		<version>2.8.2</version>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-	</plugins>
-  </build>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.core</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+	</plugins>
+  </build>
+</project>

main/plugins/org.talend.cwm.mip.edit/pom.xml

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.cwm.mip.edit</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.cwm.mip.edit</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/plugins/org.talend.cwm.mip.editor/pom.xml

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.cwm.mip.editor</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.cwm.mip.editor</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/plugins/org.talend.cwm.mip/pom.xml

@@ -1,36 +1,36 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.cwm.mip</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-	<plugins>
-	  <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-		<version>2.8.2</version>
-        <executions>
-          <execution>
-            <id>default-deploy</id>
-            <phase>deploy</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-	</plugins>
-  </build>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.cwm.mip</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+	<plugins>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+		<version>2.8.2</version>
+        <executions>
+          <execution>
+            <id>default-deploy</id>
+            <phase>deploy</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+	</plugins>
+  </build>
+</project>

main/plugins/org.talend.datatools.xml/pom.xml

@@ -1,12 +1,12 @@
-<?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>6.3.0-RC1</version>
-    <relativePath>../../../</relativePath>
-  </parent>
-  <artifactId>org.talend.datatools.xml</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
+<?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>6.3.0-SNAPSHOT</version>
+    <relativePath>../../../</relativePath>
+  </parent>
+  <artifactId>org.talend.datatools.xml</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

main/plugins/org.talend.datatools.xml/src/main/java/org/talend/datatools/xml/utils/ATreeNode.java

@@ -57,8 +57,6 @@ public class ATreeNode {
     private long precisionValue;
 
     private static HashMap xmlTypeToDataType = new HashMap();
-    
-    private Object foxTreeNode;
 
     static {
         try {
@@ -98,9 +96,6 @@ public class ATreeNode {
 	 */
     protected ATreeNode() {
         children = new ArrayList();
-        if (NodeCreationObserver.isRunning()) {
-            NodeCreationObserver.add(this);
-        }
     }
 
     /**
@@ -308,6 +303,9 @@ public class ATreeNode {
         } else if (!this.value.equals(other.value)) {
             return false;
         }
+        if (!this.children.equals(other.children)) {
+            return false;
+        }
         return true;
     }
 
@@ -369,13 +367,4 @@ public class ATreeNode {
     public void setPrecisionValue(long precisionValue) {
         this.precisionValue = precisionValue;
     }
-    
-    public Object getFoxTreeNode() {
-        return foxTreeNode;
-    }
-
-    public void setFoxTreeNode(Object foxTreeNode) {
-        this.foxTreeNode = foxTreeNode;
-    }
-    
 }

main/plugins/org.talend.datatools.xml/src/main/java/org/talend/datatools/xml/utils/NodeCreationObserver.java

@@ -1,33 +0,0 @@
-package org.talend.datatools.xml.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class NodeCreationObserver {
-
-    public static boolean observe = false;
-
-    private static List<ATreeNode> list = new ArrayList<ATreeNode>();
-
-    public static void start() {
-        list.clear();
-        observe = true;
-    }
-
-    public static void stop() {
-        observe = false;
-    }
-
-    public static boolean isRunning() {
-        return observe;
-    }
-
-    public static void add(ATreeNode node) {
-        list.add(node);
-    }
-
-    public static List<ATreeNode> getList() {
-        return list;
-    }
-
-}

main/plugins/org.talend.datatools.xml/src/main/java/org/talend/datatools/xml/utils/SchemaPopulationUtil.java

@@ -61,32 +61,24 @@ public class SchemaPopulationUtil {
      */
     public static ATreeNode getSchemaTree(String fileName, boolean includeAttribute, boolean forMDM,
             int numberOfElementsAccessiable, List<String> attList) throws OdaException, URISyntaxException, IOException {
-        ATreeNode node = null;
-        NodeCreationObserver.start();
         if (fileName.toUpperCase().endsWith(".XSD")) {
-            node = XSDFileSchemaTreePopulator.getSchemaTree(fileName, includeAttribute, forMDM, attList);
+            return XSDFileSchemaTreePopulator.getSchemaTree(fileName, includeAttribute, forMDM, attList);
         } else if (fileName.toUpperCase().endsWith(".DTD")) {
-            node = new DTDFileSchemaTreePopulator().getSchemaTree(fileName, includeAttribute);
+            return new DTDFileSchemaTreePopulator().getSchemaTree(fileName, includeAttribute);
         } else {
-            node = new XMLFileSchemaTreePopulator(numberOfElementsAccessiable).getSchemaTree(fileName, includeAttribute);
+            return new XMLFileSchemaTreePopulator(numberOfElementsAccessiable).getSchemaTree(fileName, includeAttribute);
         }
-        NodeCreationObserver.stop();
-        return node;
     }
 
     public static ATreeNode getSchemaTree(String fileName, boolean includeAttribute, int numberOfElementsAccessiable)
             throws OdaException, URISyntaxException, IOException {
-        ATreeNode node = null;
-        NodeCreationObserver.start();
         if (fileName.toUpperCase().endsWith(".XSD")) {
-            node = XSDFileSchemaTreePopulator.getSchemaTree(fileName, includeAttribute);
+            return XSDFileSchemaTreePopulator.getSchemaTree(fileName, includeAttribute);
         } else if (fileName.toUpperCase().endsWith(".DTD")) {
-            node = new DTDFileSchemaTreePopulator().getSchemaTree(fileName, includeAttribute);
+            return new DTDFileSchemaTreePopulator().getSchemaTree(fileName, includeAttribute);
         } else {
-            node = new XMLFileSchemaTreePopulator(numberOfElementsAccessiable).getSchemaTree(fileName, includeAttribute);
+            return new XMLFileSchemaTreePopulator(numberOfElementsAccessiable).getSchemaTree(fileName, includeAttribute);
         }
-        NodeCreationObserver.stop();
-        return node;
     }
 
     /**
@@ -104,11 +96,7 @@ public class SchemaPopulationUtil {
      */
     public static ATreeNode getSchemaTree(XSModel xsModel, ATreeNode selectedNode, boolean includeAttribute) throws OdaException,
             URISyntaxException, IOException {
-        ATreeNode node = null;
-        NodeCreationObserver.start();
-        node = XSDFileSchemaTreePopulator.getSchemaTree(xsModel, selectedNode, includeAttribute);
-        NodeCreationObserver.stop();
-        return node;
+        return XSDFileSchemaTreePopulator.getSchemaTree(xsModel, selectedNode, includeAttribute);
     }
 
     public static ATreeNode getSchemaTree(XSDSchema schema, ATreeNode selectedNode) throws OdaException, URISyntaxException,
@@ -118,26 +106,18 @@ public class SchemaPopulationUtil {
 
     public static ATreeNode getSchemaTree(XSDPopulationUtil2 popUtil, XSDSchema schema, ATreeNode selectedNode)
             throws OdaException, URISyntaxException, IOException {
-        ATreeNode node = null;
-        NodeCreationObserver.start();
         if (popUtil == null) {
             popUtil = new XSDPopulationUtil2();
         }
-        node = popUtil.getSchemaTree(schema, selectedNode);
-        NodeCreationObserver.stop();
-        return node;
+        return popUtil.getSchemaTree(schema, selectedNode);
     }
 
     public static ATreeNode getSchemaTree(XSDPopulationUtil2 popUtil, XSDSchema schema, ATreeNode selectedNode,
             boolean supportChoice, boolean supportSubstitution) throws OdaException, URISyntaxException, IOException {
-        ATreeNode node = null;
-        NodeCreationObserver.start();
         if (popUtil == null) {
             popUtil = new XSDPopulationUtil2();
         }
-        node = popUtil.getSchemaTree(schema, selectedNode, supportChoice, supportSubstitution);
-        NodeCreationObserver.stop();
-        return node;
+        return popUtil.getSchemaTree(schema, selectedNode, supportChoice, supportSubstitution);
     }
 
     public static ATreeNode getSchemaTree(XSDSchema schema, ATreeNode selectedNode, boolean supportChoice,