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

* Replace internal sun classes with java API classes

* Use default security algorithm instead of X509

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -17,8 +17,10 @@ import java.io.InputStream;
 import java.net.URL;
 
 import org.apache.commons.lang.ArrayUtils;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -160,4 +162,13 @@ public class CommonsPlugin implements BundleActivator {
     	InstanceScope.INSTANCE.getNode("org.eclipse.m2e.core").putBoolean("eclipse.m2.offline", state);
     }
 
+    public static URL getBundleRealURL(String bundleId) throws Exception {
+        Bundle bundle = Platform.getBundle(bundleId);
+        if (bundle == null) {
+            return null;
+        }
+        URL entry = bundle.getEntry("/"); //$NON-NLS-1$
+        return FileLocator.toFileURL(entry);
+    }
+
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -22,98 +22,105 @@ import org.talend.core.runtime.projectsetting.IProjectSettingPreferenceConstants
  */
 public enum EDatabaseTypeName {
     MYSQL(
-          "MySQL", "MySQL", Boolean.FALSE, "MYSQL", "MYSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "MySQL", "MySQL", Boolean.FALSE, "MYSQL", "MYSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     AMAZON_AURORA(
-                  "Amazon Aurora", "Amazon Aurora", Boolean.FALSE, "AMAZON_AURORA", "AMAZON_AURORA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "Amazon Aurora", "Amazon Aurora", Boolean.FALSE, "AMAZON_AURORA", "AMAZON_AURORA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     PSQL(
-         "PostgreSQL", "PostgreSQL", Boolean.TRUE, "POSTGRESQL", "POSTGRE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "PostgreSQL", "PostgreSQL", Boolean.TRUE, "POSTGRESQL", "POSTGRE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     PLUSPSQL(
-             "PostgresPlus", "PostgresPlus", Boolean.TRUE, "POSTGRESPLUS", "POSTGREPLUS", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "PostgresPlus", "PostgresPlus", Boolean.TRUE, "POSTGRESPLUS", "POSTGREPLUS", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     ORACLEFORSID(
-                 "ORACLE_SID", "Oracle with SID", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "ORACLE_SID", "Oracle with SID", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     ORACLESN(
-             "ORACLE_SERVICE_NAME", "Oracle with service name", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "ORACLE_SERVICE_NAME", "Oracle with service name", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     ORACLE_OCI(
-               "ORACLE_OCI", "Oracle OCI", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "ORACLE_OCI", "Oracle OCI", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     ORACLE_CUSTOM(
-                  "ORACLE_CUSTOM", "Oracle Custom", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$    
+            "ORACLE_CUSTOM", "Oracle Custom", Boolean.TRUE, "ORACLE", "DBORACLE", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$    
     /**
      * @deprecated odbc is not supported in java8
      */
     GODBC(
-          "Generic ODBC", "Generic ODBC (Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Generic ODBC", "Generic ODBC (Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     /**
      * @deprecated odbc is not supported in java8
      */
     MSODBC(
-           "Microsoft SQL (Odbc driver)", "Microsoft SQL Server (Odbc driver, Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Microsoft SQL (Odbc driver)", "Microsoft SQL Server (Odbc driver, Unsupported)", Boolean.FALSE, "ODBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     IBMDB2(
-           "IBM DB2", "IBM DB2", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "IBM DB2", "IBM DB2", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     IBMDB2ZOS(
-              "IBM DB2 ZOS", "IBM DB2 ZOS", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "IBM DB2 ZOS", "IBM DB2 ZOS", Boolean.TRUE, "IBM_DB2", "DB2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     SYBASEASE(
-              "SybaseASE", "Sybase (ASE and IQ)", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "SybaseASE", "Sybase (ASE and IQ)", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     // this Sybase IQ not used.
     SYBASEIQ(
-             "Sybase IQ", "Sybase IQ", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Sybase IQ", "Sybase IQ", Boolean.TRUE, "SYBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     MSSQL(
-          "MSSQL", "Microsoft SQL Server", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "MSSQL", "Microsoft SQL Server", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     MSSQL05_08(
-               "MSSQL", "Microsoft SQL Server 2005/2008", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "MSSQL", "Microsoft SQL Server 2005/2008", Boolean.TRUE, "SQL_SERVER", "MSSQL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     // this don't use in Branch 2.0
-    HSQLDB("HSQLDB", "HSQLDB", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    HSQLDB(
+            "HSQLDB", "HSQLDB", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     HSQLDB_SERVER(
-                  "HSQLDB Server", "HSQLDB Server", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "HSQLDB Server", "HSQLDB Server", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     HSQLDB_WEBSERVER(
-                     "HSQLDB WebServer", "HSQLDB WebServer", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "HSQLDB WebServer", "HSQLDB WebServer", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     HSQLDB_IN_PROGRESS(
-                       "HSQLDB In-Process", "HSQLDB In-Process", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "HSQLDB In-Process", "HSQLDB In-Process", Boolean.FALSE, "HSQLDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
-    JAVADB("JavaDB", "JavaDB", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    JAVADB(
+            "JavaDB", "JavaDB", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     INGRES(
-           "Ingres", "Ingres", Boolean.FALSE, "INGRES", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "INGRES"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Ingres", "Ingres", Boolean.FALSE, "INGRES", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "INGRES"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     INTERBASE(
-              "Interbase", "Interbase", Boolean.FALSE, "INTERBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INTERBASE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    SQLITE("SQLite", "SQLite", Boolean.FALSE, "SQLITE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "SQLITE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Interbase", "Interbase", Boolean.FALSE, "INTERBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INTERBASE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    SQLITE(
+            "SQLite", "SQLite", Boolean.FALSE, "SQLITE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "SQLITE"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     FIREBIRD(
-             "FireBird", "FireBird", Boolean.FALSE, "FIREBIRD", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "FIREBIRD"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "FireBird", "FireBird", Boolean.FALSE, "FIREBIRD", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "FIREBIRD"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     INFORMIX(
-             "Informix", "Informix", Boolean.TRUE, "INFORMIX", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INFORMIX"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Informix", "Informix", Boolean.TRUE, "INFORMIX", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), // "INFORMIX"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     VECTORWISE(
-               "VectorWise", "VectorWise", Boolean.FALSE, "VECTORWISE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
+            "VectorWise", "VectorWise", Boolean.FALSE, "VECTORWISE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
 
     ACCESS(
-           "Access", "Access", Boolean.FALSE, "ACCESS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Default_Name), // "ACCESS"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Access", "Access", Boolean.FALSE, "ACCESS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Default_Name), // "ACCESS"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     TERADATA(
-             "Teradata", "Teradata", Boolean.TRUE, "TERADATA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "TERADATA"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    AS400("AS400", "AS400", Boolean.FALSE, "AS400", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Login), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "Teradata", "Teradata", Boolean.TRUE, "TERADATA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), // "TERADATA"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    AS400(
+            "AS400", "AS400", Boolean.FALSE, "AS400", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Login), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     JAVADB_EMBEDED(
-                   "JavaDB Embeded", "JavaDB Embeded", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "JavaDB Embeded", "JavaDB Embeded", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     JAVADB_JCCJDBC(
-                   "JavaDB JCCJDBC", "JavaDB JCCJDBC", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "JavaDB JCCJDBC", "JavaDB JCCJDBC", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     JAVADB_DERBYCLIENT(
-                       "JavaDB DerbyClient", "JavaDB DerbyClient", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "JavaDB DerbyClient", "JavaDB DerbyClient", Boolean.FALSE, "JAVADB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     VERTICA(
             "Vertica", "Vertica", Boolean.TRUE, "VERTICA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
-    MAXDB("MAXDB", "MaxDB", Boolean.FALSE, "MAXDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    MAXDB(
+            "MAXDB", "MaxDB", Boolean.FALSE, "MAXDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     GREENPLUM(
-              "Greenplum", "Greenplum", Boolean.TRUE, "GREENPLUM", "GREENPLUM", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "Greenplum", "Greenplum", Boolean.TRUE, "GREENPLUM", "GREENPLUM", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     PARACCEL(
-             "ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+            "ParAccel", "ParAccel", Boolean.TRUE, "PARACCEL", "PARACCEL", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
     NETEZZA(
             "Netezza", "Netezza", Boolean.FALSE, "NETEZZA", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     SAS("SAS", "SAS", Boolean.TRUE, "SAS", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     // General JDBC not support schema defalut
     GENERAL_JDBC(
-                 "General JDBC", "General JDBC", Boolean.FALSE, "JDBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    EXASOL("Exasol", "Exasol", Boolean.TRUE, "Exasol", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "General JDBC", "General JDBC", Boolean.FALSE, "JDBC", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    EXASOL(
+            "Exasol", "Exasol", Boolean.TRUE, "Exasol", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
-    HIVE("Hive", "Hive", Boolean.FALSE, "HIVE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    HIVE(
+            "Hive", "Hive", Boolean.FALSE, "HIVE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     SAPHana(
             "SAPHana", "SAPHana", Boolean.TRUE, "SAPHANA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -121,24 +128,23 @@ public enum EDatabaseTypeName {
     H2("H2", "H2", Boolean.FALSE, "H2", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.None), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     REDSHIFT(
-             "Redshift", "Redshift", Boolean.TRUE, "REDSHIFT", "REDSHIFT", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    REDSHIFT_SSO(
-                 "Redshift SSO", //$NON-NLS-1$
-                 "Redshift SSO", //$NON-NLS-1$
-                 Boolean.TRUE,
-                 "REDSHIFT", //$NON-NLS-1$
-                 "REDSHIFT SSO", //$NON-NLS-1$
-                 EDatabaseSchemaOrCatalogMapping.Sid,
-                 EDatabaseSchemaOrCatalogMapping.Schema),
+            "Redshift", "Redshift", Boolean.TRUE, "REDSHIFT", "REDSHIFT", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    REDSHIFT_SSO("Redshift SSO", //$NON-NLS-1$
+            "Redshift SSO", //$NON-NLS-1$
+            Boolean.TRUE,
+            "REDSHIFT", //$NON-NLS-1$
+            "REDSHIFT SSO", //$NON-NLS-1$
+            EDatabaseSchemaOrCatalogMapping.Sid,
+            EDatabaseSchemaOrCatalogMapping.Schema),
 
     IMPALA(
-           "IMPALA", "Impala", Boolean.TRUE, "IMPALA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
+            "IMPALA", "Impala", Boolean.TRUE, "IMPALA", EDatabaseSchemaOrCatalogMapping.None, EDatabaseSchemaOrCatalogMapping.Schema), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
 
     HBASE(
-          "HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "HBase", "HBase", Boolean.FALSE, "HBASE", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     MAPRDB(
-           "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            "MapRDB", "MapRDB", Boolean.FALSE, "MAPRDB", EDatabaseSchemaOrCatalogMapping.Sid, EDatabaseSchemaOrCatalogMapping.Column_Family, true);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     // displayName is used in Java code.
     private String displayName;
@@ -322,11 +328,24 @@ public enum EDatabaseTypeName {
         boolean isSupport = true;
 
         if (EDatabaseTypeName.GODBC == this || EDatabaseTypeName.MSODBC == this) {
-            boolean isSupportODBC = CoreRuntimePlugin.getInstance().getProjectPreferenceManager()
-                    .getBoolean(IProjectSettingPreferenceConstants.METADATA_DBCONNECTION_ODBC_ENABLE);
+            boolean isSupportODBC =
+                    CoreRuntimePlugin
+                            .getInstance()
+                            .getProjectPreferenceManager()
+                            .getBoolean(IProjectSettingPreferenceConstants.METADATA_DBCONNECTION_ODBC_ENABLE);
             isSupport = isSupportODBC;
         }
 
         return isSupport;
     }
+
+    /**
+     * Getter for dbType.
+     * 
+     * @return the dbType
+     */
+    public String getDbType() {
+        return this.dbType;
+    }
+
 }

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

@@ -93,30 +93,30 @@ public enum EDatabaseConnTemplate {
             "jdbc:sybase:Tds:<host>:<port>/<sid>?<property>", //$NON-NLS-1$ 
             "5001")), //$NON-NLS-1$
     SYBASEASE_16_SA(new DbConnStr(EDatabaseTypeName.SYBASEASE, //
-            "jdbc:sqlanywhere:Host=<host>:<port>;DatabaseName=<sid>", //$NON-NLS-1$ 
+            "jdbc:sqlanywhere:Host=<host>:<port>;DatabaseName=<sid>;<property>", //$NON-NLS-1$
             "2638")), //$NON-NLS-1$
     IBMDB2(new DbConnStr(EDatabaseTypeName.IBMDB2, //
-            "jdbc:db2://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:db2://<host>:<port>/<sid>:<property>", //$NON-NLS-1$
             "50000")), //$NON-NLS-1$
 
     IBMDB2_ZOS(new DbConnStr(EDatabaseTypeName.IBMDB2ZOS, //
-            "jdbc:db2://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:db2://<host>:<port>/<sid>:<property>", //$NON-NLS-1$
             "557")), //$NON-NLS-1$
 
     SQLITE(new DbConnStr(EDatabaseTypeName.SQLITE, //
             "jdbc:sqlite:/<filename>")), //$NON-NLS-1$
 
     INGRES(new DbConnStr(EDatabaseTypeName.INGRES, //
-            "jdbc:ingres://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
             "II7")), //$NON-NLS-1$
     VECTORWISE(new DbConnStr(EDatabaseTypeName.VECTORWISE, //
-            "jdbc:ingres://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:ingres://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
             "II7")), //$NON-NLS-1$
     INTERBASE(new DbConnStr(EDatabaseTypeName.INTERBASE, //
-            "jdbc:interbase://<host>/<sid>")), //$NON-NLS-1$
+            "jdbc:interbase://<host>/<sid>?<property>")), //$NON-NLS-1$
 
     FIREBIRD(new DbConnStr(EDatabaseTypeName.FIREBIRD, //
-            "jdbc:firebirdsql:<host>/<port>:<filename>", //$NON-NLS-1$
+            "jdbc:firebirdsql:<host>/<port>:<filename>?<property>", //$NON-NLS-1$
             "3050")), //$NON-NLS-1$
 
     INFORMIX(new DbConnStr(EDatabaseTypeName.INFORMIX, //
@@ -134,22 +134,22 @@ public enum EDatabaseConnTemplate {
             "prompt=false")), //$NON-NLS-1$
 
     JAVADB_EMBEDED(new DbConnStr(EDatabaseTypeName.JAVADB_EMBEDED, //
-            "jdbc:derby:<dbRootPath>")), //$NON-NLS-1$
+            "jdbc:derby:<dbRootPath>;<property>")), //$NON-NLS-1$
 
     JAVADB_JCCJDBC(new DbConnStr(EDatabaseTypeName.JAVADB_JCCJDBC, //
-            "jdbc:derby:net://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:derby:net://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
             "1527")), //$NON-NLS-1$
 
     JAVADB_DERBYCLIENT(new DbConnStr(EDatabaseTypeName.JAVADB_DERBYCLIENT, //
-            "jdbc:derby://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:derby://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
             "1527")), //$NON-NLS-1$
 
     HSQLDB_SERVER(new DbConnStr(EDatabaseTypeName.HSQLDB_SERVER, //
-            "jdbc:hsqldb:hsql://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:hsqldb:hsql://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
             "9001")), //$NON-NLS-1$
 
     HSQLDB_WEBSERVER(new DbConnStr(EDatabaseTypeName.HSQLDB_WEBSERVER, //
-            "jdbc:hsqldb:http://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:hsqldb:http://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
             "9001")), //$NON-NLS-1$
 
     HSQLDB_IN_PROGRESS(new DbConnStr(EDatabaseTypeName.HSQLDB_IN_PROGRESS, //
@@ -157,7 +157,7 @@ public enum EDatabaseConnTemplate {
             null, "ifexists=true")), //$NON-NLS-1$
 
     MAXDB(new DbConnStr(EDatabaseTypeName.MAXDB, //
-            "jdbc:sapdb://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:sapdb://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
             "7210")), //$NON-NLS-1$
 
     SAS(new DbConnStr(EDatabaseTypeName.SAS, //
@@ -170,11 +170,11 @@ public enum EDatabaseConnTemplate {
             "")), //$NON-NLS-1$
 
     PARACCEL(new DbConnStr(EDatabaseTypeName.PARACCEL, //
-            "jdbc:paraccel://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:paraccel://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
             "5439")), //$NON-NLS-1$
 
     REDSHIFT(new DbConnStr(EDatabaseTypeName.REDSHIFT, //
-            "jdbc:redshift://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:redshift://<host>:<port>/<sid>?<property>", //$NON-NLS-1$
             "5439",//$NON-NLS-1$
             "")), //$NON-NLS-1$
     REDSHIFT_SSO(new DbConnStr(EDatabaseTypeName.REDSHIFT_SSO, //
@@ -182,7 +182,7 @@ public enum EDatabaseConnTemplate {
             "5439",//$NON-NLS-1$
             "")), //$NON-NLS-1$
     NETEZZA(new DbConnStr(EDatabaseTypeName.NETEZZA, //
-            "jdbc:netezza://<host>:<port>/<sid>", //$NON-NLS-1$
+            "jdbc:netezza://<host>:<port>/<sid>;<property>", //$NON-NLS-1$
             "5480")), //$NON-NLS-1$
 
     VERTICA(new DbConnStr(EDatabaseTypeName.VERTICA, //
@@ -306,7 +306,7 @@ public enum EDatabaseConnTemplate {
         List<ERepositoryObjectType> extraTypes = new ArrayList<ERepositoryObjectType>();
         IGenericDBService dbService = null;
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericDBService.class)) {
-            dbService = (IGenericDBService) GlobalServiceRegister.getDefault().getService(
+            dbService = GlobalServiceRegister.getDefault().getService(
                     IGenericDBService.class);
         }
         if(dbService != null){
@@ -411,6 +411,20 @@ public enum EDatabaseConnTemplate {
             case PSQL:
             case PLUSPSQL:
             case GREENPLUM:
+            case PARACCEL:
+            case INGRES:
+            case VECTORWISE:
+            case INTERBASE:
+            case FIREBIRD:
+            case JAVADB_EMBEDED:
+            case JAVADB_JCCJDBC:
+            case JAVADB_DERBYCLIENT:
+            case MAXDB:
+            case IBMDB2:
+            case IBMDB2_ZOS:
+            case HSQLDB_SERVER:
+            case HSQLDB_WEBSERVER:
+            case NETEZZA:
                 return true;
             default:
             }

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

@@ -64,7 +64,7 @@ public enum EDatabaseVersion4Drivers {
     SQLITE(new DbVersion4Drivers(EDatabaseTypeName.SQLITE, "sqlitejdbc-v056.jar")), //$NON-NLS-1$
     FIREBIRD(new DbVersion4Drivers(EDatabaseTypeName.FIREBIRD, "jaybird-full-2.1.1.jar")), //$NON-NLS-1$
     TERADATA(new DbVersion4Drivers(EDatabaseTypeName.TERADATA,
-            new String[] { "terajdbc4-15.10.00.14.jar", "tdgssconfig-15.10.00.14.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
+            new String[] { "terajdbc4-16.20.00.02.jar", "tdgssconfig-16.20.00.02.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
     JAVADB_DERBYCLIENT(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_DERBYCLIENT, "derbyclient.jar")), //$NON-NLS-1$
     NETEZZA(new DbVersion4Drivers(EDatabaseTypeName.NETEZZA, "nzjdbc.jar")), //$NON-NLS-1$
     INFORMIX(new DbVersion4Drivers(EDatabaseTypeName.INFORMIX, "ifxjdbc.jar")), //$NON-NLS-1$
@@ -163,9 +163,9 @@ public enum EDatabaseVersion4Drivers {
     MAPRDB(new DbVersion4Drivers(EDatabaseTypeName.MAPRDB, new String[] {})),
 
     REDSHIFT(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT, "redshift", "REDSHIFT", //$NON-NLS-1$ //$NON-NLS-2$
-            "redshiftJDBC42-no-awssdk-1.2.16.1027.jar")), //$NON-NLS-1$
+            "redshift-jdbc42-no-awssdk-1.2.20.1043.jar")), //$NON-NLS-1$
     REDSHIFT_SSO(new DbVersion4Drivers(EDatabaseTypeName.REDSHIFT_SSO, "redshift sso", "REDSHIFT_SSO", //$NON-NLS-1$ //$NON-NLS-2$
-            new String[] { "redshiftJDBC42-no-awssdk-1.2.16.1027.jar", "aws-java-sdk-1.11.406.jar", "jackson-core-2.9.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            new String[] { "redshift-jdbc42-no-awssdk-1.2.20.1043.jar", "aws-java-sdk-1.11.406.jar", "jackson-core-2.9.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                     "jackson-databind-2.9.5.jar", "jackson-annotations-2.9.0.jar", "httpcore-4.4.9.jar", "httpclient-4.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$
                     "joda-time-2.8.1.jar", "commons-logging-1.1.3.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
 

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

@@ -47,6 +47,7 @@ import org.talend.core.ILibraryManagerService;
 import org.talend.core.model.general.ILibrariesService;
 import org.talend.core.runtime.i18n.Messages;
 import org.talend.repository.ProjectManager;
+import org.talend.utils.files.FileUtils;
 import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -58,9 +59,6 @@ import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
-import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
-
 /**
  * created by wchen on 2013-3-27 Detailled comment
  * 
@@ -239,14 +237,15 @@ public class HadoopCustomLibrariesUtil {
 
             // save index
             if (document != null) {
-                XMLSerializer serializer = new XMLSerializer();
-                OutputFormat outputFormat = new OutputFormat();
-                outputFormat.setIndenting(true);
-                serializer.setOutputFormat(outputFormat);
+//                XMLSerializer serializer = new XMLSerializer();
+//                OutputFormat outputFormat = new OutputFormat();
+//                outputFormat.setIndenting(true);
+//                serializer.setOutputFormat(outputFormat);
 
                 output = new OutputStreamWriter(new FileOutputStream(indexFile), "UTF-8"); //$NON-NLS-1$
-                serializer.setOutputCharStream(output);
-                serializer.serialize(document);
+//                serializer.setOutputCharStream(output);
+//                serializer.serialize(document);
+                FileUtils.writeXMLFile(document, output);
                 toExport.put(indexFile.getAbsoluteFile(), new Path(indexFileName));
             }
         } finally {

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

@@ -55,6 +55,8 @@ public interface IComponentsFactory {
      */
     public Set<IComponent> getComponents();
 
+    public boolean isInitialising();
+
     /**
      * Get a readonly components collection to avoid ConcurrentModificationException caused by multiple thread
      * access;<br/>

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ConnectionBean.java

@@ -54,6 +54,8 @@ public class ConnectionBean implements Cloneable {
 
     private Map<String, String> dynamicFields = new HashMap<String, String>();
 
+    private static final String TOKEN = "token"; //$NON-NLS-1$
+
     /**
      * DOC smallet ConnectionBean constructor comment.
      */
@@ -281,6 +283,25 @@ public class ConnectionBean implements Cloneable {
         }
     }
 
+    public boolean isToken() {
+        try {
+            if (conDetails.has(TOKEN)) {
+                return (Boolean) conDetails.get(TOKEN);
+            }
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+        return false;
+    }
+
+    public void setToken(boolean token) {
+        try {
+            conDetails.put(TOKEN, token);
+        } catch (JSONException e) {
+            ExceptionHandler.process(e);
+        }
+    }
+
     @Override
     public ConnectionBean clone() throws CloneNotSupportedException {
         return writeFromJSON(this.getConDetails());
@@ -303,6 +324,7 @@ public class ConnectionBean implements Cloneable {
             toReturn.setPassword(st[i++]);
             toReturn.setWorkSpace(st[i++]);
             toReturn.setComplete(new Boolean(st[i++]));
+            toReturn.setToken(new Boolean(st[i++]));
             JSONObject dynamicJson = new JSONObject();
             toReturn.getConDetails().put(DYNAMICFIELDS, dynamicJson);
             while (i < st.length) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/general/ModuleNeeded.java

@@ -434,9 +434,9 @@ public class ModuleNeeded {
         if (this.getModuleLocaion() != null) {
             hashCode *= this.getModuleLocaion().hashCode();
         }
-
-        hashCode *= this.getDefaultMavenURI().hashCode();
-
+        if(this.getDefaultMavenURI() != null){
+            hashCode *= this.getDefaultMavenURI().hashCode();
+        }
         return hashCode;
     }
 
@@ -519,8 +519,16 @@ public class ModuleNeeded {
         }
 
         // maven uri
-        if (!other.getDefaultMavenURI().equals(this.getDefaultMavenURI())) {
-            return false;
+        if (other.getDefaultMavenURI() == null) {
+            if (this.getDefaultMavenURI() != null) {
+                return false;
+            }
+        } else {
+            if (this.getDefaultMavenURI() == null) {
+                return false;
+            } else if (!other.getDefaultMavenURI().equals(this.getDefaultMavenURI())) {
+                return false;
+            }
         }
 
         return true;

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

@@ -16,6 +16,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -37,6 +38,7 @@ import org.talend.core.model.metadata.builder.connection.ConnectionFactory;
 import org.talend.core.model.metadata.builder.connection.SchemaTarget;
 import org.talend.core.model.metadata.types.PerlTypesManager;
 import org.talend.cwm.helper.TaggedValueHelper;
+import org.talend.utils.files.FileUtils;
 import org.talend.utils.xml.XmlUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -48,9 +50,6 @@ import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
-import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
-
 import orgomg.cwm.objectmodel.core.TaggedValue;
 
 /**
@@ -673,9 +672,9 @@ public class MetadataSchema {
             }
 
             // use specific Xerces class to write DOM-data to a file:
-            XMLSerializer serializer = new XMLSerializer();
-            serializer.setOutputCharStream(new java.io.FileWriter(file));
-            serializer.serialize(document);
+            Writer writer = new java.io.FileWriter(file);
+            FileUtils.writeXMLFile(document, writer);
+            writer.close();
             return true;
         }
         return false;
@@ -864,10 +863,7 @@ public class MetadataSchema {
             return;
         }
         // use specific Xerces class to write DOM-data to a file:
-        XMLSerializer serializer = new XMLSerializer();
-        OutputFormat outputFormat = new OutputFormat();
-        outputFormat.setIndenting(true);
-        serializer.setOutputFormat(outputFormat);
+
 
         // java.io.FileWriter fileWriter = new java.io.FileWriter(file);
         // serializer.setOutputCharStream(fileWriter);
@@ -886,9 +882,7 @@ public class MetadataSchema {
         // fileWriter.close();
         // fileWriter = null;
         OutputStreamWriter output = new OutputStreamWriter(new FileOutputStream(file), "UTF-8"); //$NON-NLS-1$
-        serializer.setOutputCharStream(output);
-        serializer.serialize(document);
+        FileUtils.writeXMLFile(document, output);
         output.close();
-
     }
 }

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

@@ -153,7 +153,7 @@ public class MetadataTable implements IMetadataTable, Cloneable {
             List<IMetadataColumn> temp = new ArrayList<IMetadataColumn>();
             temp.addAll(this.listColumns);
             temp.addAll(this.unusedColumns);
-            if (isRepository && originalColumns != null) {
+            if (originalColumns != null) {
                 Collections.sort(temp, new Comparator<IMetadataColumn>() {
 
                     @Override

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

@@ -213,6 +213,7 @@ public final class MetadataToolAvroHelper {
             //ignore it now as we can't process the complex expression for the default value, and the default value is not useful for runtime like the old javajet tjdbcxxx
             //TODO support the expression calculate, not sure it's necessary and sometimes, more complex like globalMap.get(xxx) which only have meaning after running the job.
             ExceptionHandler.process(e, Level.WARN);
+            defaultValue = null;
         }
 
         // Types with Document/Unknown elements, store as binary

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

@@ -162,7 +162,8 @@ public final class MetadataToolHelper {
         if (itemId == null || itemId.equals("")) { //$NON-NLS-1$
             return null;
         }
-        final IProxyRepositoryFactory proxyRepositoryFactory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
+        final IProxyRepositoryFactory proxyRepositoryFactory =
+                CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
         try {
             final IRepositoryViewObject lastVersion = proxyRepositoryFactory.getLastVersion(itemId);
             if (lastVersion != null) {
@@ -280,7 +281,8 @@ public final class MetadataToolHelper {
 
     private static boolean isAllowSpecificCharacters() {
         IEclipsePreferences coreUIPluginNode = new InstanceScope().getNode(ITalendCorePrefConstants.CoreUIPlugin_ID);
-        return coreUIPluginNode.getBoolean(IRepositoryPrefConstants.ALLOW_SPECIFIC_CHARACTERS_FOR_SCHEMA_COLUMNS, false);
+        return coreUIPluginNode
+                .getBoolean(IRepositoryPrefConstants.ALLOW_SPECIFIC_CHARACTERS_FOR_SCHEMA_COLUMNS, false);
     }
 
     /**
@@ -317,8 +319,8 @@ public final class MetadataToolHelper {
                 }
             }
         }
-        if (isKeyword
-                || org.apache.commons.lang.StringUtils.countMatches(returnedColumnName, underLine) > (originalColumnName.length() / 2)) {
+        if (isKeyword || org.apache.commons.lang.StringUtils
+                .countMatches(returnedColumnName, underLine) > (originalColumnName.length() / 2)) {
             returnedColumnName = "Column" + index; //$NON-NLS-1$
         }
 
@@ -440,9 +442,9 @@ public final class MetadataToolHelper {
      * 
      * 
      */
-    private  static String mapSpecialChar(String columnName) {
+    private static String mapSpecialChar(String columnName) {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRoutinesService.class)) {
-            IRoutinesService service = (IRoutinesService) GlobalServiceRegister.getDefault().getService(IRoutinesService.class);
+            IRoutinesService service = GlobalServiceRegister.getDefault().getService(IRoutinesService.class);
             if (service != null) {
                 Vector map = service.getAccents();
                 map.setElementAt("AE", 4);//$NON-NLS-1$
@@ -491,13 +493,15 @@ public final class MetadataToolHelper {
      */
     public static void validateSchema(String value) {
         if (value == null) {
-            MessageDialog.openError(Display.getCurrent().getActiveShell(),
-                    Messages.getString("MetadataTool.nullValue"), Messages.getString("MetadataTool.nameNull")); //$NON-NLS-1$ //$NON-NLS-2$
+            MessageDialog
+                    .openError(Display.getCurrent().getActiveShell(), Messages.getString("MetadataTool.nullValue"), //$NON-NLS-1$
+                            Messages.getString("MetadataTool.nameNull")); //$NON-NLS-1$
             return;
         }
         if (!isValidSchemaName(value)) {
-            MessageDialog.openError(Display.getCurrent().getActiveShell(),
-                    Messages.getString("MetadataTool.invalid"), Messages.getString("MetadataTool.schemaInvalid")); //$NON-NLS-1$ //$NON-NLS-2$
+            MessageDialog
+                    .openError(Display.getCurrent().getActiveShell(), Messages.getString("MetadataTool.invalid"), //$NON-NLS-1$
+                            Messages.getString("MetadataTool.schemaInvalid")); //$NON-NLS-1$
             return;
         }
     }
@@ -533,8 +537,9 @@ public final class MetadataToolHelper {
     public static void checkSchema(Shell shell, KeyEvent event) {
         if ((!Character.isIdentifierIgnorable(event.character)) && (event.character == ' ')) {
             event.doit = false;
-            MessageDialog.openError(shell,
-                    Messages.getString("MetadataTool.invalidChar"), Messages.getString("MetadataTool.errorMessage")); //$NON-NLS-1$ //$NON-NLS-2$
+            MessageDialog
+                    .openError(shell, Messages.getString("MetadataTool.invalidChar"), //$NON-NLS-1$
+                            Messages.getString("MetadataTool.errorMessage")); //$NON-NLS-1$
         }
     }
 
@@ -579,6 +584,11 @@ public final class MetadataToolHelper {
 
     public static void copyTable(IMetadataTable source, IMetadataTable target, String targetDbms,
             boolean avoidUsedColumnsFromInput) {
+        copyTable(source, target, targetDbms, avoidUsedColumnsFromInput, false);
+    }
+
+    public static void copyTable(IMetadataTable source, IMetadataTable target, String targetDbms,
+            boolean avoidUsedColumnsFromInput, boolean withCustoms) {
         if (source == null || target == null) {
             return;
         }
@@ -598,10 +608,11 @@ public final class MetadataToolHelper {
         List<IMetadataColumn> columnsTAdd = new ArrayList<IMetadataColumn>();
         for (IMetadataColumn column : source.getListColumns(!avoidUsedColumnsFromInput)) {
             IMetadataColumn targetColumn = target.getColumn(column.getLabel());
-            IMetadataColumn newTargetColumn = column.clone();
+            IMetadataColumn newTargetColumn = column.clone(withCustoms);
             if (targetColumn == null) {
                 columnsTAdd.add(newTargetColumn);
-                newTargetColumn.setReadOnly(target.isReadOnly() || readOnlycolumns.contains(newTargetColumn.getLabel()));
+                newTargetColumn
+                        .setReadOnly(target.isReadOnly() || readOnlycolumns.contains(newTargetColumn.getLabel()));
             } else {
                 if (!targetColumn.isReadOnly()) {
                     target.getListColumns().remove(targetColumn);
@@ -615,6 +626,12 @@ public final class MetadataToolHelper {
         target.sortCustomColumns();
         target.setLabel(source.getLabel());
         target.setOriginalColumns(source.getOriginalColumns());
+        // List<String> originalColumnsList = null;
+        // if (source.getOriginalColumns() != null) {
+        // originalColumnsList = new ArrayList<String>();
+        // originalColumnsList.addAll(source.getOriginalColumns());
+        // }
+        // target.setOriginalColumns(originalColumnsList);
         Map<String, String> targetProperties = target.getAdditionalProperties();
         Map<String, String> sourceProperties = source.getAdditionalProperties();
         for (Entry<String, String> entry : sourceProperties.entrySet()) {
@@ -622,7 +639,8 @@ public final class MetadataToolHelper {
         }
     }
 
-    public static void copyTable(List<IMetadataColumn> sourceColumns, IMetadataTable target, List<IMetadataColumn> targetColumns) {
+    public static void copyTable(List<IMetadataColumn> sourceColumns, IMetadataTable target,
+            List<IMetadataColumn> targetColumns) {
         if (sourceColumns == null || target == null || targetColumns == null) {
             return;
         }
@@ -644,7 +662,8 @@ public final class MetadataToolHelper {
             IMetadataColumn newTargetColumn = column.clone();
             if (targetColumn == null) {
                 columnsTAdd.add(newTargetColumn);
-                newTargetColumn.setReadOnly(target.isReadOnly() || readOnlycolumns.contains(newTargetColumn.getLabel()));
+                newTargetColumn
+                        .setReadOnly(target.isReadOnly() || readOnlycolumns.contains(newTargetColumn.getLabel()));
             } else {
                 if (!targetColumn.isReadOnly()) {
                     target.getListColumns().remove(targetColumn);
@@ -699,7 +718,8 @@ public final class MetadataToolHelper {
             IMetadataColumn newTargetColumn = column.clone();
             if (targetColumn == null) {
                 columnsTAdd.add(newTargetColumn);
-                newTargetColumn.setReadOnly(target.isReadOnly() || readOnlycolumns.contains(newTargetColumn.getLabel()));
+                newTargetColumn
+                        .setReadOnly(target.isReadOnly() || readOnlycolumns.contains(newTargetColumn.getLabel()));
             } else {
                 if (!targetColumn.isReadOnly()) {
                     target.getListColumns().remove(targetColumn);
@@ -745,9 +765,9 @@ public final class MetadataToolHelper {
             }
             Set<MetadataTable> tables = null;
             IGenericWizardService wizardService = null;
-            if (!CommonsPlugin.isHeadless() && GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
-                wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault()
-                        .getService(IGenericWizardService.class);
+            if (!CommonsPlugin.isHeadless()
+                    && GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
+                wizardService = GlobalServiceRegister.getDefault().getService(IGenericWizardService.class);
             }
             if (wizardService != null && wizardService.isGenericConnection(connection)) {
                 List<MetadataTable> metadataTables = wizardService.getMetadataTables(connection);
@@ -773,7 +793,8 @@ public final class MetadataToolHelper {
      * @param tableName
      * @return
      */
-    public static MetadataTable getMetadataTableFromSAPFunction(String connectionId, String functionId, String tableName) {
+    public static MetadataTable getMetadataTableFromSAPFunction(String connectionId, String functionId,
+            String tableName) {
         org.talend.core.model.metadata.builder.connection.Connection connection;
         if (connectionId != null) {
             connection = getConnectionFromRepository(connectionId);
@@ -845,7 +866,8 @@ public final class MetadataToolHelper {
         return null;
     }
 
-    public static org.talend.core.model.metadata.builder.connection.Connection getConnectionFromRepository(String metaRepositoryid) {
+    public static org.talend.core.model.metadata.builder.connection.Connection
+            getConnectionFromRepository(String metaRepositoryid) {
         ConnectionItem connItem = getConnectionItemFromRepository(metaRepositoryid);
         if (connItem != null) {
             return connItem.getConnection();
@@ -911,9 +933,9 @@ public final class MetadataToolHelper {
 
     // ////////////////////////////////////////////////////////////////////////////////////
 
-    //    private static final String VALIDATE_PATTERN_NAME = "^[a-zA-Z_][a-zA-Z_0-9]*$"; //$NON-NLS-1$
+    // private static final String VALIDATE_PATTERN_NAME = "^[a-zA-Z_][a-zA-Z_0-9]*$"; //$NON-NLS-1$
 
-    //    private static final String VALIDATE_PATTERN_SCHEMA_NAME = "^[a-zA-Z_0-9][a-zA-Z_0-9]*$"; //$NON-NLS-1$
+    // private static final String VALIDATE_PATTERN_SCHEMA_NAME = "^[a-zA-Z_0-9][a-zA-Z_0-9]*$"; //$NON-NLS-1$
 
     public static List<ColumnNameChanged> getColumnNameChanged(IMetadataTable oldTable, IMetadataTable newTable) {
         List<ColumnNameChanged> columnNameChanged = new ArrayList<ColumnNameChanged>();
@@ -944,8 +966,9 @@ public final class MetadataToolHelper {
             IMetadataColumn clonedColumn = getColumn(newTable, originalColumn, oldIndex);
             if (clonedColumn != null) {
                 if (!originalColumn.getLabel().equals(clonedColumn.getLabel())) {
-                    columnNameChanged.add(new ColumnNameChangedExt(changedNode, originalColumn.getLabel(), clonedColumn
-                            .getLabel()));
+                    columnNameChanged
+                            .add(new ColumnNameChangedExt(changedNode, originalColumn.getLabel(),
+                                    clonedColumn.getLabel()));
                 }
             }
         }
@@ -1094,8 +1117,8 @@ public final class MetadataToolHelper {
                     initilializeNewSchema(metadataTable, mappingParameter, param);
                     if (!param.getDefaultValues().isEmpty()) {
                         Schema schema = (Schema) param.getDefaultValues().get(0).getDefaultValue();
-                        org.talend.core.model.metadata.builder.connection.MetadataTable defaultEmfTable = MetadataToolAvroHelper
-                                .convertFromAvro(schema);
+                        org.talend.core.model.metadata.builder.connection.MetadataTable defaultEmfTable =
+                                MetadataToolAvroHelper.convertFromAvro(schema);
                         IMetadataTable defaultTable = MetadataToolHelper.convert(defaultEmfTable);
                         for (IMetadataColumn currentColumn : metadataTable.getListColumns()) {
                             IMetadataColumn defaultColumn = defaultTable.getColumn(currentColumn.getLabel());
@@ -1125,8 +1148,8 @@ public final class MetadataToolHelper {
                     Object schemaObj = properties.getValuedProperty(param.getName()).getValue();
                     if (schemaObj instanceof Schema) {
                         Schema schema = (Schema) schemaObj;
-                        org.talend.core.model.metadata.builder.connection.MetadataTable emfTable = MetadataToolAvroHelper
-                                .convertFromAvro(schema);
+                        org.talend.core.model.metadata.builder.connection.MetadataTable emfTable =
+                                MetadataToolAvroHelper.convertFromAvro(schema);
                         IMetadataTable newTable = MetadataToolHelper.convert(emfTable);
                         initilializeSchema(metadataTable, newTable, mappingParameter, node);
                     }
@@ -1286,8 +1309,8 @@ public final class MetadataToolHelper {
                     if (connection != null) {
                         IRepositoryViewObject lastVersion = null;
                         if (connection.getContextId() != null) {
-                            IRepositoryService service = (IRepositoryService) GlobalServiceRegister.getDefault().getService(
-                                    IRepositoryService.class);
+                            IRepositoryService service =
+                                    GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
                             lastVersion = service.getProxyRepositoryFactory().getLastVersion(connection.getContextId());
                         }
                         if (lastVersion != null) {
@@ -1381,7 +1404,7 @@ public final class MetadataToolHelper {
     }
 
     public static IMetadataTable convert(MetadataTable old) {
-        ICoreService coreService = (ICoreService) GlobalServiceRegister.getDefault().getService(ICoreService.class);
+        ICoreService coreService = GlobalServiceRegister.getDefault().getService(ICoreService.class);
         IMetadataTable result = new org.talend.core.model.metadata.MetadataTable();
         result.setComment(old.getComment());
         result.setId(old.getId());
@@ -1401,7 +1424,8 @@ public final class MetadataToolHelper {
         }
 
         for (Object o : old.getColumns()) {
-            org.talend.core.model.metadata.builder.connection.MetadataColumn column = (org.talend.core.model.metadata.builder.connection.MetadataColumn) o;
+            org.talend.core.model.metadata.builder.connection.MetadataColumn column =
+                    (org.talend.core.model.metadata.builder.connection.MetadataColumn) o;
             IMetadataColumn newColumn = new org.talend.core.model.metadata.MetadataColumn();
             columns.add(newColumn);
             newColumn.setComment(column.getComment());
@@ -1415,7 +1439,7 @@ public final class MetadataToolHelper {
             }
             newColumn.setLabel(label2);
             newColumn.setPattern(column.getPattern());
-            
+
             if (column.getLength() < 0) {
                 newColumn.setLength(null);
             } else {
@@ -1438,12 +1462,12 @@ public final class MetadataToolHelper {
                         newColumn.setCustom(Boolean.valueOf(tv.getValue()));
                     } else if (DiSchemaConstants.TALEND6_IS_READ_ONLY.equals(additionalTag)) {
                         newColumn.setReadOnly(Boolean.valueOf(tv.getValue()));
-                    }else {
+                    } else {
                         newColumn.getAdditionalField().put(additionalTag, tv.getValue());
                     }
                 }
             }
-            
+
             newColumn.setNullable(column.isNullable());
             if (column.getPrecision() < 0) {
                 newColumn.setPrecision(null);

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

@@ -308,8 +308,19 @@ public abstract class AbstractNode implements INode {
                         return mapMerge.keySet().iterator().next().getSubProcessStartNode(withConditions);
                     }
                 }
-                if ((getCurrentActiveLinksNbInput(EConnectionType.MAIN) == 0)
-                        && !checkIfCurrentActiveLinksIsLookup()) {
+                if (getCurrentActiveLinksNbInput(EConnectionType.MAIN) == 0) {
+                    IConnection aheadConnection = null;
+                    for (IConnection inConnection : getIncomingConnections()) {
+                        // refer to DataProcess.checkFlowRefLink() added RUN_AFTER for incoming connection
+                        if (inConnection.isActivate()
+                                && inConnection.getLineStyle().getId() == EConnectionType.RUN_AFTER.getId()) {
+                            aheadConnection = inConnection;
+                            break;
+                        }
+                    }
+                    if (aheadConnection != null) {
+                        return aheadConnection.getSource().getDesignSubjobStartNode();
+                    }
                     return this; // main branch here, so we got the correct sub
                                  // process start.
                 }
@@ -348,27 +359,6 @@ public abstract class AbstractNode implements INode {
         return nb;
     }
 
-    private boolean checkIfCurrentActiveLinksIsLookup() {
-        boolean flag = false;
-        int input = 0;
-        for (IConnection inConnection : getIncomingConnections()) {
-            // refer to DataProcess.checkFlowRefLink() added RUN_AFTER for incoming connection
-            if (inConnection.isActivate() && inConnection.getLineStyle().getId() == EConnectionType.RUN_AFTER.getId()) {
-                input++;
-            }
-        }
-        // check if run_after is for lookup
-        if (input > 0) {
-            for (IConnection outConnection : getOutgoingConnections()) {
-                if (outConnection.isActivate() && outConnection.getLineStyle().getId() == EConnectionType.FLOW_REF.getId()) {
-                    flag = true;
-                    break;
-                }
-            }
-        }
-        return flag;
-    }
-
     /*
      * (non-Javadoc)
      * 

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

@@ -29,13 +29,13 @@ import org.talend.core.model.metadata.MetadataTable;
  */
 public class BigDataNode extends AbstractNode implements IBigDataNode {
 
-    private boolean dummy = false;
+    protected boolean dummy = false;
 
-    private String outputType = null;
+    protected String outputType = null;
 
-    private String inputType = null;
+    protected String inputType = null;
 
-    private Map<String, List<IMetadataColumn>> keyList = new java.util.HashMap<String, List<IMetadataColumn>>();
+    protected Map<String, List<IMetadataColumn>> keyList = new HashMap<String, List<IMetadataColumn>>();
 
     /**
      * Default constructor for the BigDataNode
@@ -149,7 +149,7 @@ public class BigDataNode extends AbstractNode implements IBigDataNode {
         return "IDENTITY".equals(getRequiredInputType()) && "IDENTITY".equals(getRequiredOutputType()); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
-    private IElementParameter getNodeElemForList(IElementParameter parTableNode) {
+    protected IElementParameter getNodeElemForList(IElementParameter parTableNode) {
         // Iterate over the table columns and make sure one of them is a COLUMN_LIST or a CHECKBOX.
         for (Object nodeItemList : parTableNode.getListItemsValue()) {
             if (((IElementParameter) nodeItemList).getFieldType().equals(EParameterFieldType.PREV_COLUMN_LIST)
@@ -161,7 +161,7 @@ public class BigDataNode extends AbstractNode implements IBigDataNode {
         return null;
     }
 
-    private IElementParameter getPartitionTableNode(IBigDataNode bigDataNode, String rootPartitionKey) {
+    protected IElementParameter getPartitionTableNode(IBigDataNode bigDataNode, String rootPartitionKey) {
         // if the partition key is valid, get the first element of the key, which must be a table.
         IElementParameter partitionTableNode = bigDataNode.getElementParameter(rootPartitionKey);
         if (partitionTableNode == null) {
@@ -346,4 +346,19 @@ public class BigDataNode extends AbstractNode implements IBigDataNode {
     public void addOutput(IConnection connection) {
         ((List<IConnection>) getOutgoingConnections()).add(connection);
     }
+    
+    @Override
+    public boolean shouldGenerateDatasetCode() {
+        return false;
+    }
+
+    @Override
+    public void loadDatasetConditions(){
+        // BigDataNode does not do anything related to Dataset, only anabled from SparkNode
+    }
+    
+    @Override
+    public void processDatasetConditions(){
+        // BigDataNode does not do anything related to Dataset, only anabled from SparkNode
+    }
 }

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

@@ -115,6 +115,8 @@ public enum EParameterFieldType {
     PATTERN_PROPERTY, // yyin, added TDQ-13437
 
     UNIFIED_COMPONENTS,
+    
+    LANGUAGE_CLOSED_LIST,
 
     TACOKIT_INPUT_SCHEMA,
     TACOKIT_GUESS_SCHEMA,

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

@@ -122,5 +122,24 @@ public interface IBigDataNode extends INode {
      * @param dummy true if this node has to be declared as a dummy, else false.
      */
     public void setDummy(boolean dummy);
+    
+    /**
+     * Returns if node will generate Dataset or RDD code.
+     * 
+     * @return a boolean telling if Dataset code will be generated.
+     */
+    public boolean shouldGenerateDatasetCode();
+
+    /**
+     * Method to load Dataset conditions.
+     */
+    public void loadDatasetConditions();
+    
+    /**
+     * Method to process previously loaded Dataset conditions and determine if Dataset code can be generated.
+     * 
+     * Loading and processing should be separated because conditions can be dependent on future component (in subjob order)
+     */
+    public void processDatasetConditions();
 
 }

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

@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.core.model.process;
 
+import org.talend.daikon.properties.property.Property;
 
 /**
  * DOC cmeng  class global comment. Detailled comment
@@ -20,4 +21,5 @@ public interface IGenericElementParameter extends IElementParameter {
 
     public void setAskPropagate(Boolean askPropagate);
 
+    public Property getProperty();
 }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/relationship/RelationshipItemBuilder.java

@@ -1238,6 +1238,9 @@ public class RelationshipItemBuilder {
     }
 
     public void removeItemRelations(Relation relation, boolean save) {
+        if (!loaded) {
+            loadRelations();
+        }
         Map<Relation, Set<Relation>> itemRelations = getCurrentProjectItemsRelations();
         relation = findPossibleKeyObject(itemRelations.keySet(), relation);
         if (itemRelations != null && itemRelations.containsKey(relation)) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/ArtifactRepositoryBean.java

@@ -79,6 +79,11 @@ public class ArtifactRepositoryBean implements Cloneable {
                 if (index > 0) {
                     nexusUrl = url.substring(0, index + ARTIFACT_MIDDLE_PATH.length());
                     repoId = StringUtilities.removeEndingString(url.substring(index + ARTIFACT_MIDDLE_PATH.length()), "/");
+                } else {
+                    // can be non-default contextpath or root
+                    String tempurl = StringUtilities.removeEndingString(url, "/");
+                    repoId = tempurl.substring(tempurl.lastIndexOf("/") + 1);
+                    nexusUrl = url.substring(0, url.indexOf(repoId));
                 }
             }
             return new String[] { nexusUrl, repoId };

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/nexus/TalendMavenResolver.java

@@ -14,6 +14,7 @@ package org.talend.core.nexus;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Dictionary;
 import java.util.Hashtable;
 
@@ -84,15 +85,18 @@ public class TalendMavenResolver {
             props = new Hashtable<String, String>();
         }
         final BundleContext context = CoreRuntimePlugin.getInstance().getBundle().getBundleContext();
-        ServiceReference<ManagedService> managedServiceRef = context.getServiceReference(ManagedService.class);
-        if (managedServiceRef != null) {
-            ManagedService managedService = context.getService(managedServiceRef);
+        Collection<ServiceReference<ManagedService>> managedServiceRefs = context.getServiceReferences(ManagedService.class,
+                "(service.pid=org.ops4j.pax.url.mvn)");
+        for (ServiceReference<ManagedService> managedServiceRef : managedServiceRefs) {
+            if (managedServiceRef != null) {
+                ManagedService managedService = context.getService(managedServiceRef);
 
-            managedService.updated(props);
-            talendResolverKey = resolverKey;
-            mavenResolver = null;
-        } else {
-            throw new RuntimeException("Failed to load the service :" + ManagedService.class.getCanonicalName()); //$NON-NLS-1$
+                managedService.updated(props);
+                talendResolverKey = resolverKey;
+                mavenResolver = null;
+            } else {
+                throw new RuntimeException("Failed to load the service :" + ManagedService.class.getCanonicalName()); //$NON-NLS-1$
+            }
         }
 
     }

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

@@ -62,6 +62,8 @@ public interface TalendProcessArgumentConstant {
 
     static final String ARG_LAUNCHER_NAME = "LAUNCHER_NAME";
 
+    static final String ARG_AVOID_BRANCH_NAME = "AVOID_BRANCH_NAME";
+
     static final String CMD_ARG_STATS_PORT_PARAM = "stat_port";
 
     static final String CMD_ARG_TRACE_PORT_PARAM = "trace_port";

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/projectsetting/ProjectPreferenceManager.java

@@ -35,7 +35,7 @@ import org.talend.repository.model.IRepositoryService;
 /**
  * DOC ggu class global comment. Detailled comment
  */
-public final class ProjectPreferenceManager {
+public class ProjectPreferenceManager {
 
     /**
      * copied from EclipsePreferences.
@@ -61,11 +61,11 @@ public final class ProjectPreferenceManager {
     static {
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
             runProcessService =
-                    (IRunProcessService) GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
+                    GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
         }
         if (GlobalServiceRegister.getDefault().isServiceRegistered(IRepositoryService.class)) {
             repositoryService =
-                    (IRepositoryService) GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
+                    GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
         }
     }
 
@@ -109,7 +109,7 @@ public final class ProjectPreferenceManager {
         }
     }
 
-    private void init(IProject project, String fileName) {
+    protected void init(IProject project, String fileName) {
         Assert.isNotNull(fileName);
         Assert.isNotNull(project);
         this.qualifier = fileName;
@@ -148,6 +148,7 @@ public final class ProjectPreferenceManager {
     /**
      * @deprecated because don't support the default value setting, so use store directly.
      */
+    @Deprecated
     private IEclipsePreferences getQulifierPreference() {
         return getProjectScope().getNode(getQualifier());
     }

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/repository/build/BuildExportManager.java

@@ -44,7 +44,7 @@ public/* final */class BuildExportManager {
         return instance;
     }
 
-    IBuildExportDependenciesProvider[] getDependenciesProviders() {
+    public IBuildExportDependenciesProvider[] getDependenciesProviders() {
         return reader.getDependenciesProviders();
     }
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/runtime/util/JavaHomeUtil.java

@@ -1,185 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core.runtime.util;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
-import org.eclipse.jdt.launching.environments.IExecutionEnvironmentsManager;
-import org.talend.commons.utils.generation.JavaUtils;
-
-/**
- * created by nrousseau on Jun 13, 2015 Detailled comment
- *
- */
-public class JavaHomeUtil {
-
-    /**
-     * Initialize Java Home to the preferences if needed only.<br>
-     * This will take take first JDK8 if existing.<br>
-     * If not, take JDK7.<br>
-     * If no any JDK found, it will let eclipse set the default one.
-     * 
-     * @throws CoreException
-     */
-    public static void initializeJavaHome() throws CoreException {
-        IEclipsePreferences pref = InstanceScope.INSTANCE.getNode("org.eclipse.jdt.launching"); //$NON-NLS-1$
-        String defaultVM = pref.get("org.eclipse.jdt.launching.PREF_DEFAULT_ENVIRONMENTS_XML", ""); //$NON-NLS-1$//$NON-NLS-2$
-        boolean needSetupJVM = false;
-        if (!"".equals(defaultVM)) { //$NON-NLS-1$
-            if (!isJDKSetup()) {
-                // current JVM is not a JDK, means need to change the current setup
-                needSetupJVM = true;
-            } else if (isSetJdkHomeVariable() && !getJDKHomeVariable().equals(getCurrentJavaHomeString())) {
-                needSetupJVM = true;
-            }
-        } else {
-            needSetupJVM = true;
-        }
-        if (needSetupJVM) {
-            IVMInstall currentVM = JavaRuntime.getDefaultVMInstall();
-            if (isSetJdkHomeVariable()) {
-                if (currentVM != null) {
-                    File installLocation = new File(getJDKHomeVariable());
-                    currentVM.setInstallLocation(installLocation);
-                    currentVM.setName(installLocation.getName());
-                }
-            } else {
-                boolean jkd8 = installJDKForEnvironment("JavaSE-1.8");//$NON-NLS-1$
-                if (!jkd8) {
-                    boolean jdk7 = installJDKForEnvironment("JavaSE-1.7"); //$NON-NLS-1$
-                    if (!jdk7) {
-                        if (isSetJavaHomeVariable()) {
-                            if (currentVM != null) {
-                                File installLocation = new File(getJavaHomeVariable());
-                                currentVM.setInstallLocation(installLocation);
-                                currentVM.setName(installLocation.getName());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    /**
-     * Only for TUJ to setup JDK version
-     * Should invoke after initializeJavaHome()
-     */
-    public static String getSpecifiedJavaVersion() {
-        if (isSetJdkHomeVariable()) {
-            IVMInstall currentVM = JavaRuntime.getDefaultVMInstall();
-            if (currentVM instanceof IVMInstall2) {
-                return JavaUtils.getCompilerCompliance((IVMInstall2) currentVM, null);
-            }
-        }
-        return null;
-    }
-
-    public static boolean isSetJdkHomeVariable() {
-        String jdkHomeValue = getJDKHomeVariable();
-        return jdkHomeValue != null && !"".equals(jdkHomeValue); //$NON-NLS-1$
-    }
-
-    public static String getJDKHomeVariable() {
-        String jdkHome = System.getProperty("jdk.home"); //$NON-NLS-1$
-
-        if (jdkHome == null || "".equals(jdkHome)) { //$NON-NLS-1$
-            jdkHome = getJDKHomeFromEclipseVm();
-        }
-
-        if (jdkHome == null || "".equals(jdkHome)) { //$NON-NLS-1$
-            jdkHome = System.getenv("JDK_HOME"); //$NON-NLS-1$
-        }
-        return jdkHome;
-    }
-
-    private static String getJDKHomeFromEclipseVm() {
-        String eclipseVm = System.getProperty("eclipse.vm"); //$NON-NLS-1$
-        if (eclipseVm != null && !"".equals(eclipseVm)) {
-            File javaexe = new File(eclipseVm);
-            if (javaexe.exists()) {
-                String jdk = getJDKPath(javaexe);
-                if (jdk != null && new File(jdk, "lib/tools.jar").exists()) {//$NON-NLS-1$
-                    return jdk;
-                }
-            }
-
-        }
-        return null;
-    }
-
-    private static String getJDKPath(File file) {
-        if (file == null) {
-            return null;
-        }
-        if ("bin".equals(file.getName())) {//$NON-NLS-1$
-            return file.getParent();
-        } else {
-            return getJDKPath(file.getParentFile());
-        }
-    }
-
-    public static boolean isSetJavaHomeVariable() {
-        String javaHomeValue = getJavaHomeVariable();
-        return javaHomeValue != null && !"".equals(javaHomeValue); //$NON-NLS-1$
-    }
-
-    public static String getJavaHomeVariable() {
-        return System.getenv("JAVA_HOME"); //$NON-NLS-1$
-
-    }
-
-    public static boolean isJDKSetup() {
-        if (getCurrentJavaHomeFile() == null) {
-            return false;
-        }
-        return new File(getCurrentJavaHomeFile(), "lib/tools.jar").exists(); //$NON-NLS-1$
-    }
-
-    public static File getCurrentJavaHomeFile() {
-        IVMInstall currentVM = JavaRuntime.getDefaultVMInstall();
-        if (currentVM == null) {
-            return null;
-        }
-        return currentVM.getInstallLocation();
-    }
-
-    public static String getCurrentJavaHomeString() {
-        IVMInstall currentVM = JavaRuntime.getDefaultVMInstall();
-        if (currentVM == null) {
-            return null;
-        }
-        return currentVM.getInstallLocation().getAbsolutePath();
-    }
-
-    private static boolean installJDKForEnvironment(String environmentName) throws CoreException {
-        IExecutionEnvironmentsManager manager = JavaRuntime.getExecutionEnvironmentsManager();
-        IExecutionEnvironment environment = manager.getEnvironment(environmentName);
-        for (IVMInstall install : environment.getCompatibleVMs()) {
-            if (new File(install.getInstallLocation(), "lib/tools.jar").exists()) {
-                // JDK found, install it !;
-                JavaRuntime.setDefaultVMInstall(install, new NullProgressMonitor());
-                return true;
-            }
-        }
-        return false;
-    }
-
-}

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/ui/ITestContainerProviderService.java

@@ -36,6 +36,7 @@ import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryEditorInput;
 import org.talend.core.model.repository.IRepositoryViewObject;
+import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
 import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
 import org.talend.repository.model.RepositoryNode;
 
@@ -131,5 +132,7 @@ public interface ITestContainerProviderService extends IService {
     Set<ModuleNeeded> getAllJobTestcaseModules(ProcessItem item) throws PersistenceException;
     
     public void deleteDataFiles(Object deleteObj);
+    
+    public List<NodeType> getOriginalNodes(ProcessType process);
 
 }

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

@@ -24,12 +24,14 @@ Require-Bundle: org.apache.commons.lang,
  org.talend.core.repository,
  org.eclipse.nebula.widgets.nattable.core,
  org.eclipse.nebula.widgets.nattable.extension.glazedlists,
- org.talend.libraries.nattable,
  org.eclipse.e4.core.di.extensions,
  org.talend.librariesmanager,
  org.eclipse.e4.ui.services,
  org.eclipse.ui.workbench,
- org.talend.themes.core
+ org.talend.themes.core,
+ ca.odell.glazedlists,
+ org.talend.core,
+ org.apache.commons.io
 Import-Package: org.eclipse.jdt.internal.ui.workingsets
 Export-Package: org.talend.core.ui,
  org.talend.core.ui.actions,

main/plugins/org.talend.core.ui/src/main/java/messages.properties

@@ -613,3 +613,10 @@ WorkspaceDlg.browse.folder.title=Select a workspace folder
 WorkspaceDlg.use.this.as.default.cb.message=&Use this workspace as the default and do not ask again
 PerspectiveMenuManager.dummy=Dummy
 PerspectiveMenuManager.perspectiveLabel=&Perspective
+I18nPreferencePage.needRestart=Local Language(need restart)
+I18nPreferencePage.translationInformation=Test translation with Babili (works only for current language,other language selection needs restart)
+I18nPreferencePage.importBabili=Import Translation from Babili
+I18nPreferencePage.restart=Restart
+I18nPreferencePage.restartButton=Need to restart to take effect.
+I18nPreferencePage.restoreDefault=Restore default
+I18nPreferencePage.wait_process=Process will hold on several minutes, please wait...

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextSetConfigurationDialog.java

@@ -30,6 +30,7 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.runtime.image.ECoreImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
 import org.talend.core.model.context.JobContext;
@@ -170,7 +171,8 @@ public class ContextSetConfigurationDialog extends ObjectSelectionDialog<IContex
 
     private boolean validateContextName(String name) {
         if (name.equals("") || !name.matches(RepositoryConstants.CODE_ITEM_PATTERN)) { //$NON-NLS-1$
-            MessageDialog.openWarning(new Shell(), Messages.getString(Messages.getString("ContextProcessSection.50")), Messages //$NON-NLS-1$
+            MessageDialog.openWarning(DisplayUtils.getDefaultShell(false),
+                    Messages.getString(Messages.getString("ContextProcessSection.50")), Messages //$NON-NLS-1$
                     .getString(Messages.getString("ContextProcessSection.51"))); //$NON-NLS-1$
             return false;
         }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/ContextTreeTable.java

@@ -142,6 +142,8 @@ public class ContextTreeTable {
 
     private final static int fixedTypeWidth = 90;
 
+    private final static int fixedHidePromptWidth = 1;
+
     public ContextTreeTable(IContextModelManager manager) {
         this.manager = manager;
     }
@@ -395,7 +397,7 @@ public class ContextTreeTable {
                                 RepositoryNode relateNode = new RepositoryNode(contextObj, null, ENodeType.REPOSITORY_ELEMENT);
                                 contextObj.setRepositoryNode(relateNode);
                                 if (GlobalServiceRegister.getDefault().isServiceRegistered(IMetadataManagmentUiService.class)) {
-                                    IMetadataManagmentUiService mmUIService = (IMetadataManagmentUiService) GlobalServiceRegister
+                                    IMetadataManagmentUiService mmUIService = GlobalServiceRegister
                                             .getDefault().getService(IMetadataManagmentUiService.class);
                                     mmUIService.openRepositoryContextWizard(relateNode);
                                 }
@@ -454,7 +456,8 @@ public class ContextTreeTable {
         } else {
             int typeColumnPos = dataLayer.getColumnPositionByIndex(1);
 
-            int leftWidth = maxWidth - fixedTypeWidth - fixedCheckBoxWidth * checkColumnsPos.size() - cornerWidth * 2;
+            int leftWidth = maxWidth - fixedTypeWidth - fixedCheckBoxWidth * checkColumnsPos.size() - cornerWidth * 2
+                    - fixedHidePromptWidth;
 
             int currentColumnsCount = dataColumnsCount - hideColumnsPos.size() - checkColumnsPos.size() - 1;
             int averageWidth = leftWidth / currentColumnsCount;
@@ -469,7 +472,7 @@ public class ContextTreeTable {
                 for (int hidePos : hideColumnsPos) {
                     if (hidePos == i) {
                         findHide = true;
-                        dataLayer.setColumnWidthByPosition(i, 0);
+                        dataLayer.setColumnWidthByPosition(i, fixedHidePromptWidth);
                     }
                 }
                 for (int checkPos : checkColumnsPos) {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextAutoResizeTextPainter.java

@@ -52,10 +52,6 @@ public class ContextAutoResizeTextPainter extends TextPainter {
         changeBackgroundColor = isChange;
     }
 
-    @Override
-    protected boolean performRowResize(int contentHeight, Rectangle rectangle) {
-        return (contentHeight != rectangle.height) && (this.calculateByTextHeight);
-    }
     
 	@Override
 	protected void setNewMinLength(ILayerCell cell, int contentWidth) {

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/context/nattableTree/ContextNatTableUtils.java

@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ILibraryManagerUIService;
 import org.talend.core.model.context.ContextUtils;
@@ -172,7 +172,7 @@ public class ContextNatTableUtils {
         if (!manager.getContextManager().checkValidParameterName(oldParamName, newParamName)) {
             MessageDialog
                     .openError(
-                            new Shell(),
+                            DisplayUtils.getDefaultShell(false),
                             Messages.getString("ContextProcessSection.errorTitle"), Messages.getString("ContextProcessSection.ParameterNameIsNotValid")); //$NON-NLS-1$ //$NON-NLS-2$
             return false;
         }
@@ -181,7 +181,7 @@ public class ContextNatTableUtils {
             if (newParamName.length() > 255) {
                 MessageDialog
                         .openError(
-                                new Shell(),
+                                DisplayUtils.getDefaultShell(false),
                                 Messages.getString("ContextProcessSection.errorTitle"), Messages.getString("ContextTemplateComposite.ParamterLengthInvilid")); //$NON-NLS-1$ //$NON-NLS-2$
                 return false;
             }

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/celleditor/SchemaCellEditor.java

@@ -25,8 +25,8 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.swt.advanced.dataeditor.AbstractDataTableEditorView;
 import org.talend.commons.ui.swt.extended.table.AbstractExtendedTableViewer;
 import org.talend.commons.ui.swt.tableviewer.TableViewerCreator;
@@ -283,8 +283,8 @@ public class SchemaCellEditor extends DialogCellEditor {
                         originalCurrentOutTable = new MetadataTable();
                         originalCurrentOutTable.setListColumns(listColumns);
                         // 2.open metadataDialog,set finalOutTable
-                        metaDialog = new MetadataDialog(new Shell(), originalInputTable, inputNode, originalCurrentOutTable,
-                                outputNode, tableEditorView.getTableViewerCreator().getCommandStack());
+                        metaDialog = new MetadataDialog(DisplayUtils.getDefaultShell(false), originalInputTable, inputNode,
+                                originalCurrentOutTable, outputNode, tableEditorView.getTableViewerCreator().getCommandStack());
                         if (metaDialog.open() == Window.OK) {
                             finalInputTable = metaDialog.getInputMetaData().clone();
                             finalOutTable = metaDialog.getOutputMetaData().clone();
@@ -660,8 +660,9 @@ public class SchemaCellEditor extends DialogCellEditor {
                             // originalCurrentOutTable = new MetadataTable();
                             // originalCurrentOutTable.setListColumns(listColumns);
                             // 2.open metadataDialog,set finalOutTable
-                            MetadataDialog metaDialog = new MetadataDialog(new Shell(), originalInputTable, inputNode,
-                                    tableToEdit.clone(), node, tableEditorView.getTableViewerCreator().getCommandStack());
+                            MetadataDialog metaDialog = new MetadataDialog(DisplayUtils.getDefaultShell(false),
+                                    originalInputTable, inputNode, tableToEdit.clone(), node,
+                                    tableEditorView.getTableViewerCreator().getCommandStack());
                             if (metaDialog.open() == Window.OK) {
                                 finalInputTable = metaDialog.getInputMetaData().clone();
                                 finalOutTable = metaDialog.getOutputMetaData().clone();
@@ -712,8 +713,9 @@ public class SchemaCellEditor extends DialogCellEditor {
                             // originalCurrentOutTable = new MetadataTable();
                             // originalCurrentOutTable.setListColumns(listColumns);
                             // 2.open metadataDialog,set finalOutTable
-                            MetadataDialog metaDialog = new MetadataDialog(new Shell(), originalInputTable, inputNode,
-                                    tableToEdit.clone(), node, tableEditorView.getTableViewerCreator().getCommandStack());
+                            MetadataDialog metaDialog = new MetadataDialog(DisplayUtils.getDefaultShell(false),
+                                    originalInputTable, inputNode, tableToEdit.clone(), node,
+                                    tableEditorView.getTableViewerCreator().getCommandStack());
                             if (metaDialog.open() == Window.OK) {
                                 finalInputTable = metaDialog.getInputMetaData().clone();
                                 finalOutTable = metaDialog.getOutputMetaData().clone();

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/dialog/MetadataDialog.java

@@ -725,6 +725,8 @@ public class MetadataDialog extends Dialog {
         }
 
         IDesignerCoreService designerCoreService = CoreUIPlugin.getDefault().getDesignerCoreService();
+        updateTableOriginalColumns(outputTable);
+        updateTableOriginalColumns(inputTable);
         designerCoreService.setTraceFilterParameters(outputNode, outputTable, preOutputColumnSet, changedNameColumnsForOutput);
         designerCoreService.setTraceFilterParameters(inputNode, inputTable, preInputColumnSet, changedNameColumnsForInput);
         if (outputTable != null && inputTable != null) {
@@ -745,6 +747,16 @@ public class MetadataDialog extends Dialog {
             }
         }
     }
+    
+    private void updateTableOriginalColumns(IMetadataTable table) {
+        if (table != null && table.getListColumns() != null) {
+            List<String> columnNames = new ArrayList<String>();
+            for (IMetadataColumn column : table.getListColumns()) {
+                columnNames.add(column.getLabel());
+            }
+            table.setOriginalColumns(columnNames);
+        }
+    }
 
     /**
      * DOC wzhang Comment method "getPreColumnsSet".

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/metadata/extended/command/SaveAsGenericSchemaCommand.java

@@ -18,9 +18,9 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 import org.talend.commons.exception.PersistenceException;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
 import org.talend.commons.ui.swt.extended.table.ExtendedTableModel;
 import org.talend.core.model.metadata.IMetadataColumn;
 import org.talend.core.model.metadata.IMetadataTable;
@@ -43,6 +43,7 @@ import org.talend.cwm.helper.PackageHelper;
 import org.talend.repository.model.IMetadataService;
 import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.RepositoryNode;
+
 import orgomg.cwm.objectmodel.core.Package;
 
 /**
@@ -92,8 +93,8 @@ public class SaveAsGenericSchemaCommand extends Command {
             if (metadataService == null) {
                 return;
             }
-            WizardDialog dialog = metadataService.getGenericSchemaWizardDialog(new Shell(), PlatformUI.getWorkbench(), false,
-                    null, null, true);
+            WizardDialog dialog = metadataService.getGenericSchemaWizardDialog(DisplayUtils.getDefaultShell(false),
+                    PlatformUI.getWorkbench(), false, null, null, true);
             dialog.setPageSize(WIZARD_WIDTH, WIZARD_HEIGHT);
             dialog.create();
             Property property = null;

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/preference/I18nPreferencePage.java

@@ -0,0 +1,652 @@
+package org.talend.core.ui.preference;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.nio.channels.FileChannel;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.adaptor.EclipseStarter;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.PlatformUI;
+import org.talend.commons.ui.runtime.exception.ExceptionHandler;
+import org.talend.commons.ui.runtime.utils.ZipFileUtils;
+import org.talend.commons.ui.swt.advanced.dataeditor.LabelFieldEditor;
+import org.talend.commons.ui.utils.workbench.preferences.OneLineComboFieldEditor;
+import org.talend.commons.utils.VersionUtils;
+import org.talend.core.CorePlugin;
+import org.talend.core.model.genhtml.FileCopyUtils;
+import org.talend.core.prefs.ITalendCorePrefConstants;
+import org.talend.core.ui.i18n.Messages;
+
+public abstract class I18nPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+
+    private OneLineComboFieldEditor languageSelectionEditor;
+
+    private String fs = System.getProperties().getProperty("file.separator"); //$NON-NLS-1$
+
+    private List<FieldEditor> fields = new ArrayList<FieldEditor>();
+
+    private static Logger log = Logger.getLogger(I18nPreferencePage.class);
+
+    private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)(\\.(RC|M)\\d+)?_r\\d+"); //$NON-NLS-1$
+
+    private static final Pattern DEFAULT_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\.*(\\d*)"); //$NON-NLS-1$
+
+    private boolean updateCompleted;
+
+    private boolean isBabiliButtonClicked = false;
+
+    /**
+     * Construct a new I18nPreferencePage.
+     */
+    public I18nPreferencePage() {
+        super(GRID);
+
+        // Set the preference store for the preference page.
+        IPreferenceStore store = CorePlugin.getDefault().getPreferenceStore();
+        setPreferenceStore(store);
+    }
+
+    @Override
+    public void init(IWorkbench workbench) {
+        // nothing to do
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
+     */
+    @Override
+    protected void createFieldEditors() {
+        // Adds a combo for language selection.
+
+        String spanish = "Espa\u00F1ol"; //$NON-NLS-1$
+        byte[] utf8Bytes;
+        try {
+            utf8Bytes = spanish.getBytes("UTF8"); //$NON-NLS-1$
+            spanish = new String(utf8Bytes, "UTF8"); //$NON-NLS-1$
+        } catch (UnsupportedEncodingException e1) {
+            // could be translated, but it's only in case of error when change UTF8 characters.
+            spanish = "Spanish"; //$NON-NLS-1$
+        }
+
+        String russian = "\u0420\u0443\u0441\u0441\u043A\u0438\u0439"; //$NON-NLS-1$
+        try {
+            utf8Bytes = russian.getBytes("UTF8"); //$NON-NLS-1$
+            russian = new String(utf8Bytes, "UTF8"); //$NON-NLS-1$
+        } catch (UnsupportedEncodingException e1) {
+            // could be translated, but it's only in case of error when change UTF8 characters.
+            russian = "Russian"; //$NON-NLS-1$
+        }
+
+        String greek = "\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"; //$NON-NLS-1$
+        try {
+            utf8Bytes = greek.getBytes("UTF8"); //$NON-NLS-1$
+            greek = new String(utf8Bytes, "UTF8"); //$NON-NLS-1$
+        } catch (UnsupportedEncodingException e1) {
+            // could be translated, but it's only in case of error when change UTF8 characters.
+            greek = "Greek"; //$NON-NLS-1$
+        }
+
+        String arabic = "\u0627\u0644\u0639\u0631\u0628\u064a\u0647"; //$NON-NLS-1$
+        try {
+            utf8Bytes = arabic.getBytes("UTF8"); //$NON-NLS-1$
+            arabic = new String(utf8Bytes, "UTF8"); //$NON-NLS-1$
+        } catch (UnsupportedEncodingException e1) {
+            // could be translated, but it's only in case of error when change UTF8 characters.
+            arabic = "Arabic"; //$NON-NLS-1$
+        }
+
+        String serbian = "\u0421\u0440\u043f\u0441\u043a\u0438"; //$NON-NLS-1$
+        try {
+            utf8Bytes = serbian.getBytes("UTF8"); //$NON-NLS-1$
+            serbian = new String(utf8Bytes, "UTF8"); //$NON-NLS-1$
+        } catch (UnsupportedEncodingException e1) {
+            // could be translated, but it's only in case of error when change UTF8 characters.
+            serbian = "Serbian"; //$NON-NLS-1$
+        }
+
+        String[][] entryNamesAndValues =
+                { { Locale.ENGLISH.getDisplayLanguage(Locale.ENGLISH), Locale.ENGLISH.getLanguage() },
+                        { Locale.FRENCH.getDisplayLanguage(Locale.FRENCH), Locale.FRENCH.getLanguage() },
+                        { Locale.CHINESE.getDisplayLanguage(Locale.CHINESE), "zh_CN" },
+                        { Locale.GERMAN.getDisplayLanguage(Locale.GERMAN), Locale.GERMAN.getLanguage() },
+                        { Locale.JAPANESE.getDisplayLanguage(Locale.JAPANESE), Locale.JAPANESE.getLanguage() },
+                        { Locale.ITALIAN.getDisplayLanguage(Locale.ITALIAN), Locale.ITALIAN.getLanguage() },
+                        { "Brasil", "pt_BR" }, //$NON-NLS-1$ //$NON-NLS-2$
+                        { spanish, "es" }, { russian, "ru" }, //$NON-NLS-1$ //$NON-NLS-2$
+                        { Locale.KOREA.getDisplayLanguage(Locale.KOREA), "kr" }, { "Turkish", "tr" }, //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                        { greek, "el" }, { "Hrvatski", "hr" }, { arabic, "ar" }, { serbian, "sr" }, { "Polski", "pl" },
+                        { "Romanian", "ro" }, { "Netherlands", "nl" } }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                                                                         // // /$NON-NLS-7$
+        languageSelectionEditor = new OneLineComboFieldEditor(ITalendCorePrefConstants.LANGUAGE_SELECTOR,
+                Messages.getString("I18nPreferencePage.needRestart"), entryNamesAndValues, getFieldEditorParent()); //$NON-NLS-1$
+        addField(languageSelectionEditor);
+
+        Composite composite = getFieldEditorParent();
+        LabelFieldEditor importAll =
+                new LabelFieldEditor(Messages.getString("I18nPreferencePage.translationInformation"), //$NON-NLS-1$
+                        composite);
+        addField(importAll);
+
+        Button allUpdate = new Button(composite, SWT.FLAT);
+        allUpdate.setText(Messages.getString("I18nPreferencePage.importBabili")); //$NON-NLS-1$
+        allUpdate.setLayoutData(new GridData());
+
+        allUpdate.addSelectionListener(new SelectionListener() {
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                // import all update from Babili
+                // select the .zip file
+                FileDialog fd =
+                        new FileDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), SWT.OPEN);
+                fd.setText("Open"); //$NON-NLS-1$
+                fd.setFilterPath("C:" + fs); //$NON-NLS-1$
+                String[] filterExtensions = { "*.zip" }; //$NON-NLS-1$
+                fd.setFilterExtensions(filterExtensions);
+                String selected = fd.open();
+                if (selected != null) {
+                    isBabiliButtonClicked = true;
+                    runProgressMonitorDialog(selected);
+                    if (MessageDialog
+                            .openConfirm(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+                                    Messages.getString("I18nPreferencePage.restart"), //$NON-NLS-1$
+                                    Messages.getString("I18nPreferencePage.restartButton"))) {
+                        PlatformUI.getWorkbench().restart();
+                    }
+                }
+            }
+
+            @Override
+            public void widgetDefaultSelected(SelectionEvent e) {
+                // Nothing to do
+            }
+        });
+
+        // added by nma
+        Button restoredefault = new Button(composite, SWT.FLAT);
+        restoredefault.setText("Restore Defaults"); //$NON-NLS-1$
+        restoredefault.setLayoutData(new GridData());
+        restoredefault.addSelectionListener(new SelectionListener() {
+
+            @Override
+            public void widgetDefaultSelected(SelectionEvent e) {
+                // Nothing to do
+            }
+
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                isBabiliButtonClicked = true;
+                runProgressMonitorDialog(Messages.getString("I18nPreferencePage.restoreDefault")); //$NON-NLS-1$
+                if (MessageDialog
+                        .openConfirm(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+                                Messages.getString("I18nPreferencePage.restart"),
+                                Messages.getString("I18nPreferencePage.restartButton"))) {
+                    PlatformUI.getWorkbench().restart();
+                }
+            }
+        });
+    }
+
+    private void applyBabiliResource(String zipFileName) {
+        String jarFolderPath = System.getProperty("user.dir") + fs + "jarTemp"; //$NON-NLS-1$ //$NON-NLS-2$
+        String zipFolderPath = System.getProperty("user.dir") + fs + "zipTemp"; //$NON-NLS-1$ //$NON-NLS-2$
+        File jarFolderPathFile = new File(jarFolderPath);
+        File zipFolderPathFile = new File(zipFolderPath);
+        if (!jarFolderPathFile.exists()) {
+            jarFolderPathFile.mkdir();
+        }
+        if (!zipFolderPathFile.exists()) {
+            zipFolderPathFile.mkdir();
+        }
+        String pluginPath = System.getProperty("user.dir") + fs + "plugins"; //$NON-NLS-1$ //$NON-NLS-2$
+
+        HashMap jarFileMap = new HashMap();
+        File file = new File(pluginPath);
+        if (file.isDirectory()) {
+            String[] fileNameList = file.list();
+            final int length = fileNameList.length;
+            File[] fileList = file.listFiles();
+            final int length2 = fileList.length;
+            for (File f : fileList) {
+                if (f.getName().startsWith("net.sourceforge.sqlexplorer.nl")) { //$NON-NLS-1$
+                    jarFileMap.put("net.sourceforge.sqlexplorer.nl", f); //$NON-NLS-1$
+                }
+                if (f.getName().startsWith("org.talend.designer.components.localprovider")) { //$NON-NLS-1$
+                    jarFileMap.put("org.talend.designer.components.localprovider", f); //$NON-NLS-1$
+                }
+                if (f.getName().startsWith("org.talend.designer.components.tdqprovider")) { //$NON-NLS-1$
+                    jarFileMap.put("org.talend.designer.components.tdqprovider", f); //$NON-NLS-1$
+                }
+                if (f.getName().startsWith("org.talend.designer.components.tisprovider")) { //$NON-NLS-1$
+                    jarFileMap.put("org.talend.designer.components.tisprovider", f); //$NON-NLS-1$
+                }
+                if (f.getName().startsWith("org.talend.designer.components.tispeprovider")) { //$NON-NLS-1$
+                    jarFileMap.put("org.talend.designer.components.tispeprovider", f); //$NON-NLS-1$
+                }
+
+                if (f.getName().endsWith(".jar") && f.getName().indexOf("nl") != -1 //$NON-NLS-1$ //$NON-NLS-2$
+                        && f.getName().indexOf("talend") != -1) { //$NON-NLS-1$
+                    String[] fileNameArr = f.getName().split("_"); //$NON-NLS-1$
+                    jarFileMap.put(fileNameArr[0], f);
+                }
+            }
+        }
+        if (zipFileName.equals("Restore default")) { //$NON-NLS-1$
+            Iterator iter = jarFileMap.entrySet().iterator();
+            while (iter.hasNext()) {
+                Map.Entry entry = (Map.Entry) iter.next();
+                Object key = entry.getKey();
+                File currentFileToBak = (File) entry.getValue();
+                if (key.toString().endsWith(".nl") //$NON-NLS-1$
+                        || key.toString().startsWith("org.talend.designer.components.localprovider") //$NON-NLS-1$
+                        || key.toString().startsWith("org.talend.designer.components.tdqprovider") //$NON-NLS-1$
+                        || key.toString().startsWith("org.talend.designer.components.tisprovider") //$NON-NLS-1$
+                        || key.toString().startsWith("org.talend.designer.components.tispeprovider") //$NON-NLS-1$
+                        || key.toString().startsWith("net.sourceforge.sqlexplorer.nl")) { //$NON-NLS-1$
+                    if (currentFileToBak.toString().endsWith(".jar")) { //$NON-NLS-1$
+                        ZipFileUtils.unZip(currentFileToBak, jarFolderPath + fs + currentFileToBak.getName());
+                    } else {
+                        FileCopyUtils
+                                .copyFolder(currentFileToBak.getAbsolutePath(),
+                                        jarFolderPath + fs + currentFileToBak.getName());
+                    }
+                    File jarFiles = new File(jarFolderPath + fs + currentFileToBak.getName());
+                    File[] jarSubFiles = jarFiles.listFiles();
+                    for (File subJarf : jarSubFiles) {
+                        if (subJarf.isFile()) {
+                            if (subJarf.getName().endsWith(".original")) { //$NON-NLS-1$
+                                String subjarfPath = subJarf
+                                        .getAbsolutePath()
+                                        .substring(0, subJarf.getAbsolutePath().indexOf(".original")); //$NON-NLS-1$
+                                File subjarfPathFile = new File(subjarfPath);
+                                if (subjarfPathFile.exists()) {
+                                    subjarfPathFile.delete();
+                                }
+                                subJarf.renameTo(subjarfPathFile);
+                            }
+                        } else {
+                            if (subJarf.getName().equals("components")) { //$NON-NLS-1$
+                                File[] componentFiles = subJarf.listFiles();
+                                for (File componentFile : componentFiles) {
+                                    if (componentFile.isDirectory()) {
+                                        File[] comFiles = componentFile.listFiles();
+                                        if (comFiles != null) {
+                                            for (File com : comFiles) {
+                                                if (com.isFile() && com.getName().endsWith(".original")) { //$NON-NLS-1$
+                                                    String comPath = com
+                                                            .getAbsolutePath()
+                                                            .substring(0, com.getAbsolutePath().indexOf(".original")); //$NON-NLS-1$
+                                                    File comPathFile = new File(comPath);
+                                                    if (comPathFile.exists()) {
+                                                        comPathFile.delete();
+                                                    }
+                                                    com.renameTo(comPathFile);
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    String writeJarFileName = jarFolderPath + fs + currentFileToBak.getName();
+                    if (currentFileToBak.exists()) {
+                        if (currentFileToBak.isDirectory()) {
+                            try {
+                                org.apache.commons.io.FileUtils.deleteDirectory(currentFileToBak);
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
+                        } else {
+                            currentFileToBak.delete();
+                        }
+                    }
+                    if (currentFileToBak.toString().endsWith(".jar")) { //$NON-NLS-1$
+                        ZipFileUtils.zip(writeJarFileName, currentFileToBak.getAbsolutePath(), false);
+                    } else {
+                        FileCopyUtils.copyFolder(writeJarFileName, currentFileToBak.getAbsolutePath());
+                    }
+
+                }
+            }
+        } else {
+            ZipFileUtils.unZip(zipFileName, zipFolderPath);
+            File zipFile = new File(zipFolderPath);
+            File[] zipFiles = zipFile.listFiles()[0].listFiles();
+            for (File f : zipFiles) {
+                if (f.getName().endsWith(".nl") //$NON-NLS-1$
+                        || f.getName().startsWith("org.talend.designer.components.localprovider") //$NON-NLS-1$
+                        || f.getName().startsWith("org.talend.designer.components.tdqprovider") //$NON-NLS-1$
+                        || f.getName().startsWith("org.talend.designer.components.tisprovider") //$NON-NLS-1$
+                        || f.getName().startsWith("org.talend.designer.components.tispeprovider") //$NON-NLS-1$
+                        || f.getName().startsWith("net.sourceforge.sqlexplorer.nl")) { //$NON-NLS-1$
+
+                    File writeJarFile = (File) jarFileMap.get(f.getName());
+                    if (writeJarFile == null) {
+                        continue;
+                    }
+                    String jarFilePath = writeJarFile.getAbsolutePath();
+                    // for bug 13620
+                    if (writeJarFile.toString().endsWith(".jar")) {//$NON-NLS-1$
+                        ZipFileUtils.unZip(writeJarFile, jarFolderPath + fs + writeJarFile.getName());
+                    } else {
+                        FileCopyUtils.copyFolder(jarFilePath, jarFolderPath + fs + writeJarFile.getName());
+                    }
+                    File[] zipSubFiles = f.listFiles();
+                    File jarFiles = new File(jarFolderPath + fs + writeJarFile.getName());
+                    File[] jarSubFiles = jarFiles.listFiles();
+                    boolean flag = false;
+                    boolean componentFlag = false;
+                    for (File subJarf : jarSubFiles) {
+                        if (subJarf.isFile()) {
+                            if (subJarf.getName().endsWith(".original")) { //$NON-NLS-1$
+                                flag = true;
+                                break;
+                            }
+
+                        } // specific bug if .properties for components, since structure of babili resource is different
+                          // with local plugin
+                        else {
+                            if (subJarf.getName().equals("components")) { //$NON-NLS-1$
+                                File[] componentFiles = subJarf.listFiles();
+                                if (componentFiles != null) {
+                                    for (File componentFile : componentFiles) {
+                                        if (componentFile.isDirectory()) {
+                                            File[] comFiles = componentFile.listFiles();
+                                            if (comFiles != null) {
+                                                for (File com : comFiles) {
+                                                    if (com.getName().endsWith(".original")) { //$NON-NLS-1$
+                                                        componentFlag = true;
+                                                        break;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    for (File subf : zipSubFiles) {
+                        boolean subfNotExistBool = true;
+                        for (File subJarf : jarSubFiles) {
+                            if (subJarf.isDirectory() && subJarf.getName().equals("components")) { //$NON-NLS-1$
+                                if (subf.getName().startsWith("t") && subf.getName().endsWith(".properties")) { //$NON-NLS-1$ //$NON-NLS-2$
+                                    File[] componentFiles = subJarf.listFiles();
+                                    for (File componentFile : componentFiles) {
+                                        if (componentFile
+                                                .getName()
+                                                .equals(subf.getName().substring(0, subf.getName().indexOf("_")))) { //$NON-NLS-1$
+                                            File[] comFiles = componentFile.listFiles();
+                                            if (comFiles != null) {
+                                                for (File com : comFiles) {
+                                                    if (subf.getName().equals(com.getName())) {
+                                                        transferFile(subf, com, componentFlag);
+                                                        subfNotExistBool = false;
+                                                        break;
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            } else {
+                                if (subf.getName().equals(subJarf.getName())) {
+                                    transferFile(subf, subJarf, flag);
+                                    subfNotExistBool = false;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    String writeJarFileName = jarFolderPath + fs + writeJarFile.getName();
+                    writeJarFile.delete();
+                    if (writeJarFileName.endsWith(".jar")) {//$NON-NLS-1$
+                        ZipFileUtils.zip(writeJarFileName, jarFilePath, false);
+                    } else {
+                        FileCopyUtils.copyFolder(writeJarFileName, jarFilePath);
+                    }
+                }
+            }
+        }
+        updateCompleted = true;
+        try {
+            if (zipFolderPathFile.exists()) {
+                org.apache.commons.io.FileUtils.deleteDirectory(zipFolderPathFile);
+            }
+            if (jarFolderPathFile.exists()) {
+                org.apache.commons.io.FileUtils.deleteDirectory(jarFolderPathFile);
+            }
+        } catch (IOException e) {
+            ExceptionHandler.process(e);
+        }
+
+    }
+
+    private void transferFile(File sourceFile, File targetFile, boolean changed) {
+        String targetPath = targetFile.getAbsolutePath();
+        File newTargetFile = new File(targetPath + ".original"); //$NON-NLS-1$
+        if (!newTargetFile.exists() && changed == false) {
+            targetFile.renameTo(newTargetFile);
+        }
+        transferStream(sourceFile, targetFile);
+    }
+
+    private void transferStream(File sourceFile, File targetFile) {
+        if (!sourceFile.exists()) {
+            return;
+        }
+        try {
+            FileChannel sourceChannel = new FileInputStream(sourceFile.getAbsoluteFile()).getChannel();
+            FileChannel targetChannel = new FileOutputStream(targetFile.getAbsoluteFile()).getChannel();
+            targetChannel.transferFrom(sourceChannel, 0, sourceChannel.size());
+            sourceChannel.close();
+            targetChannel.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * 
+     * DOC wzhang Comment method "runProgressMonitorDialog".
+     * 
+     * @param validated
+     */
+    public void runProgressMonitorDialog(final String zipFileName) {
+        updateCompleted = false;
+        ProgressMonitorDialog progressDialog = new ProgressMonitorDialog(getFieldEditorParent().getShell());
+        IRunnableWithProgress runnable = new IRunnableWithProgress() {
+
+            @Override
+            public void run(IProgressMonitor monitor) {
+                try {
+                    monitor.beginTask(Messages.getString("I18nPreferencePage.wait_process"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$
+                    applyBabiliResource(zipFileName);
+                } catch (Exception e1) {
+                    ExceptionHandler.process(e1);
+                } finally {
+                    monitor.done();
+                }
+            }
+        };
+        try {
+            progressDialog.run(true, true, runnable);
+        } catch (InvocationTargetException e1) {
+            ExceptionHandler.process(e1);
+        } catch (InterruptedException e1) {
+            ExceptionHandler.process(e1);
+        }
+
+        if (updateCompleted) {
+        } else {
+        }
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.preference.FieldEditorPreferencePage#performOk()
+     */
+    @Override
+    public boolean performOk() {
+        boolean ok = super.performOk();
+        saveLanguageType();
+        CorePlugin.getDefault().savePluginPreferences();
+        if (isBabiliButtonClicked) {
+            refreshAll();
+        }
+        return ok;
+    }
+
+    abstract protected void refreshAll();
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.preference.PreferencePage#performApply()
+     */
+    @Override
+    protected void performApply() {
+        saveLanguageType();
+        CorePlugin.getDefault().savePluginPreferences();
+    }
+
+    /**
+     * 
+     * DOC wzhang Comment method "saveLanguageType".
+     */
+    private void saveLanguageType() {
+        FileInputStream fin = null;
+        FileOutputStream fout = null;
+        try {
+            URL url = Platform.getConfigurationLocation().getURL();
+            log(url.getFile());
+            Properties p = new Properties();
+            // load the file configuration/config.ini
+            File iniFile = new File(url.getFile(), "config.ini"); //$NON-NLS-1$
+            fin = new FileInputStream(iniFile);
+            p.load(fin);
+
+            String languageType = CorePlugin
+                    .getDefault()
+                    .getPluginPreferences()
+                    .getString(ITalendCorePrefConstants.LANGUAGE_SELECTOR);
+
+            if (languageType.equals(p.getProperty(EclipseStarter.PROP_NL))) {
+                return;
+            }
+
+            p.setProperty(EclipseStarter.PROP_NL, languageType);
+            fout = new FileOutputStream(iniFile);
+            p.store(fout, "#Configuration File"); //$NON-NLS-1$
+            fout.flush();
+
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+        } finally {
+            if (fin != null) {
+                try {
+                    fin.close();
+                } catch (Exception e) {
+                    // do nothing
+                }
+
+            }
+            if (fout != null) {
+                try {
+                    fout.close();
+                } catch (Exception e) {
+                    // do nothing
+                }
+
+            }
+        }
+    }
+
+    /**
+     * 
+     * DOC wzhang Comment method "getCurrentTosVersion".
+     * 
+     * @param normalize
+     * @return
+     */
+    public static String getCurrentTosVersion(boolean normalize) {
+        String version = VersionUtils.getVersion();
+        if (normalize) {
+            version = normalizeVersion(version);
+        }
+        return version;
+    }
+
+    /**
+     * 
+     * DOC wzhang Comment method "normalizeVersion".
+     * 
+     * @param version
+     * @return
+     */
+    public static String normalizeVersion(String version) {
+        Matcher matcher = VERSION_PATTERN.matcher(version);
+        if (matcher.matches()) {
+            String str = version.substring(0, version.indexOf("_r")); //$NON-NLS-1$
+            return str.replaceAll("\\.RC", "RC").replaceAll("\\.M", "M"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+        } else {
+            // try again, ignore M, RC
+            matcher = DEFAULT_PATTERN.matcher(version);
+            matcher.find();
+            return matcher.group();
+        }
+    }
+
+    private void log(String s) {
+        log.log(Level.INFO, s);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.preference.FieldEditorPreferencePage#addField(org.eclipse.jface.preference.FieldEditor)
+     */
+    @Override
+    protected void addField(FieldEditor editor) {
+        super.addField(editor);
+        fields.add(editor);
+    }
+
+}

main/plugins/org.talend.core.ui/src/main/java/org/talend/core/ui/proposal/JavaSimpleDateFormatProposalProvider.java

@@ -72,10 +72,20 @@ public class JavaSimpleDateFormatProposalProvider implements IContentProposalPro
                         "\"dd/MM/yyyy\" : common format", "dd/MM/yyyy", "Date\n Examples : \n  01/01/2007\n  31/12/2007"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 new DateFormatContentProposal(
                         "\"MM/dd/yyyy\" : common format", "MM/dd/yyyy", "Date\n Examples : \n  01/01/2007\n  12/31/2007"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                new DateFormatContentProposal("\"yyyy-MM-dd'T'HH:mm:ss\" : common format", "yyyy-MM-dd'T'HH:mm:ss", //$NON-NLS-1$ //$NON-NLS-2$
+                new DateFormatContentProposal(
+                        "\"yyyy-MM-dd\" : common format", "yyyy-MM-dd", "Date\n Examples : \n  2007-01-01\n  2007-12-31"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                new DateFormatContentProposal("\"yyyy-MM-dd HH:mm:ss\" : common format", "yyyy-MM-dd HH:mm:ss",
+                        "Date\n Examples : \n  2014-08-19 07:41:35\n  2014-12-31 07:41:35"),//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                new DateFormatContentProposal("\"yyyy-MM-dd'T'HH:mm:ss\" : common format", "yyyy-MM-dd'T'HH:mm:ss",
                         "Date\n Examples : \n  2007-01-01T00:00:00\n  2007-12-31T23:59:59"), // hywang //$NON-NLS-1$
                 new DateFormatContentProposal("\"yyyy-MM-dd'T'HH:mm:ss'000Z'\" : common format", "yyyy-MM-dd'T'HH:mm:ss'000Z'", //$NON-NLS-1$ //$NON-NLS-2$
                         "Date\n Examples : \n  2007-01-01T00:00:00000Z\n  2007-12-31T23:59:59000Z"), // hywang //$NON-NLS-1$
+                new DateFormatContentProposal("\"yyyy-MM-dd'T'HH:mm:ss.SSSSSS\" : common format", "yyyy-MM-dd'T'HH:mm:ss.SSSSSS",
+                        "Date\n Examples : \n  2019-04-18T09:47:49.568095"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$       
+                new DateFormatContentProposal("\"yyyy-MM-dd HH:mm:ss zzz\" : common format", "yyyy-MM-dd HH:mm:ss zzz", //$NON-NLS-1$ //$NON-NLS-2$
+                        "Date\n Examples : \n  2008-01-01 00:00:00 UTC\n  2008-12-31 04:08:00 PDT"), 
+                new DateFormatContentProposal("\"yyyy-MM-dd HH:mm:ss.SSSXXX\" : common format", "yyyy-MM-dd HH:mm:ss.SSSXXX", //$NON-NLS-1$ //$NON-NLS-2$
+                        "Date\n Examples : \n  2014-08-19 07:41:35.220 -05:00"),
                 new DateFormatContentProposal(
                         "\"HH:mm:ss\" : common format", "HH:mm:ss", "Date\n Examples : \n  00:00:00 \n  23:59:59"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 new DateFormatContentProposal("\"yy\" : Year (00-99)", "yy", "Year \nExamples : \n  98\n  07"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

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

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Automatic-Module-Name: org.talend.core
 Bundle-ManifestVersion: 2
 Bundle-Name: Core Plug-in
 Bundle-SymbolicName: org.talend.core;singleton:=true
@@ -13,15 +14,15 @@ Require-Bundle: org.eclipse.debug.core,
  org.apache.commons.lang,
  org.apache.commons.collections,
  org.apache.log4j,
- org.talend.libraries.dom4j-jaxen,
+ org.eclipse.jface,
  org.talend.common.ui.runtime,
  org.talend.metadata.managment,
- org.talend.libraries.apache,
  org.talend.model,
- org.talend.core.runtime;visibility:=reexport,
  org.talend.core.repository,
- org.eclipse.jface,
- org.talend.utils
+ org.talend.libraries.apache,
+ org.talend.core.runtime,
+ org.talend.utils,
+ org.talend.libraries.dom4j-jaxen
 Bundle-Vendor: .Talend SA.
 Export-Package: org.talend.core,
  org.talend.core.branding,
@@ -53,3 +54,4 @@ Export-Package: org.talend.core,
  org.talend.core.services.resource,
  org.talend.core.views,
  org.talend.designer.runprocess
+Import-Package: org.apache.commons.collections4.map

main/plugins/org.talend.core/src/main/java/org/talend/core/model/utils/TalendTextUtils.java

@@ -494,6 +494,10 @@ public class TalendTextUtils {
         return PASS_COVER;
     }
 
+    public static String escapeJavaText(final String text) {
+        return StringEscapeUtils.escapeJava(text);
+    }
+
     public static String filterSpecialChar(String input) { // for 8115
         if (input != null && !"".equals(input)) {
             for (int i = 0; i < input.length();) {

main/plugins/org.talend.core/src/main/java/org/talend/core/services/IGITProviderService.java

@@ -15,10 +15,11 @@ package org.talend.core.services;
 import java.util.Collection;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.talend.commons.exception.PersistenceException;
+import org.talend.core.GlobalServiceRegister;
 import org.talend.core.IService;
 import org.talend.core.model.general.Project;
 
@@ -47,4 +48,11 @@ public interface IGITProviderService extends IService {
 
     void createOrUpdateGitIgnoreFile(IProject eclipseProject) throws CoreException;
 
+    public static IGITProviderService get() {
+        GlobalServiceRegister register = GlobalServiceRegister.getDefault();
+        if (!register.isServiceRegistered(IGITProviderService.class)) {
+            return null;
+        }
+        return register.getService(IGITProviderService.class);
+    }
 }

main/plugins/org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java

@@ -96,6 +96,7 @@ import org.talend.core.runtime.process.TalendProcessArgumentConstant;
 import org.talend.core.runtime.process.TalendProcessOptionConstants;
 import org.talend.core.runtime.repository.build.BuildExportManager;
 import org.talend.core.service.IResourcesDependenciesService;
+import org.talend.core.services.ICoreTisService;
 import org.talend.core.services.ISVNProviderService;
 import org.talend.core.ui.IJobletProviderService;
 import org.talend.core.ui.ITestContainerProviderService;
@@ -167,6 +168,8 @@ public class ProcessorUtilities {
 
     private static boolean isDebug = false;
 
+    private static JobInfo mainJobInfo;
+
     public static void addOpenEditor(IEditorPart editor) {
         openedEditors.add(editor);
     }
@@ -435,6 +438,7 @@ public class ProcessorUtilities {
 
             isMainJob = true;
             codeModified = false;
+            mainJobInfo = jobInfo;
 
             // this cache only keep the last main job's generation, so clear it since we regenerate a new job.
             LastGenerationInfo.getInstance().getLastGeneratedjobs().clear();
@@ -760,32 +764,26 @@ public class ProcessorUtilities {
             }
         }
 
-        out: for (INode node : (List<? extends INode>) currentProcess.getGeneratingNodes()) {
+        ICoreTisService service = null;
+        if (GlobalServiceRegister.getDefault().isServiceRegistered(ICoreTisService.class)) {
+            service = (ICoreTisService) GlobalServiceRegister.getDefault().getService(ICoreTisService.class);
+        }
+        for (INode node : (List<? extends INode>) currentProcess.getGeneratingNodes()) {
             if (node.getComponent() != null && node.getComponent().getComponentType() == EComponentType.GENERIC) {
                 // generic component, true always
                 return true;
             }
-            // to check if node is db component , maybe need modification
-            boolean isDbNode = false;
-            for (IElementParameter param : (List<? extends IElementParameter>) node.getElementParameters()) {
-                if (EParameterFieldType.TEXT == param.getFieldType() && param.getValue() != null) {
-                    if (("TYPE".equals(param.getName()) && !"".equals(param.getValue()))
-                            || ("FAMILY".equals(param.getName())
-                                    && param.getValue().toString().startsWith("Database"))) {
-                        isDbNode = true;
-                        break;
-                    }
-                }
-            }
-            if (isDbNode) {
-                for (IMetadataTable metadataTable : node.getMetadataList()) {
-                    for (IMetadataColumn column : metadataTable.getListColumns()) {
-                        if ("id_Dynamic".equals(column.getTalendType())) {
-                            hasDynamicMetadata = true;
-                            break out;
-                        }
-                    }
-                }
+            if (service != null && service.isSupportDynamicType(node)) {
+            	IElementParameter mappingParam = node.getElementParameterFromField(EParameterFieldType.MAPPING_TYPE);
+            	if (mappingParam != null) {
+	                for (IMetadataTable metadataTable : node.getMetadataList()) {
+	                    for (IMetadataColumn column : metadataTable.getListColumns()) {
+	                        if ("id_Dynamic".equals(column.getTalendType())) {
+	                            return true;
+	                        }
+	                    }
+	                }
+            	}
             }
         }
         return hasDynamicMetadata;
@@ -960,6 +958,7 @@ public class ProcessorUtilities {
             if (jobInfo.getFatherJobInfo() == null) {
                 isMainJob = true;
                 codeModified = false;
+                mainJobInfo = jobInfo;
 
                 // this cache only keep the last main job's generation, so clear it since we regenerate a new job.
                 LastGenerationInfo.getInstance().getLastGeneratedjobs().clear();
@@ -1627,10 +1626,12 @@ public class ProcessorUtilities {
         jobList.clear();
         esbJobs.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         JobInfo jobInfo = new JobInfo(processName, contextName, version);
         IProcessor process = generateCode(jobInfo, contextName, statistics, trace, true, GENERATE_ALL_CHILDS, monitor);
         jobList.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         return process;
     }
 
@@ -1653,9 +1654,11 @@ public class ProcessorUtilities {
         jobList.clear();
         esbJobs.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         IProcessor process = generateCode(jobInfo, contextName, statistics, trace, true, GENERATE_ALL_CHILDS, monitor);
         jobList.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         return process;
     }
 
@@ -1673,9 +1676,11 @@ public class ProcessorUtilities {
         jobList.clear();
         esbJobs.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         IProcessor result = generateCode(jobInfo, contextName, statistics, trace, true, GENERATE_ALL_CHILDS, monitor);
         jobList.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         return result;
     }
 
@@ -1693,10 +1698,12 @@ public class ProcessorUtilities {
         jobList.clear();
         esbJobs.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         IProcessor result =
                 generateCode(jobInfo, contextName, statistics, trace, needContext, GENERATE_ALL_CHILDS, monitor);
         jobList.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         return result;
     }
 
@@ -1723,9 +1730,11 @@ public class ProcessorUtilities {
         jobList.clear();
         esbJobs.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         IProcessor result = generateCode(jobInfo, contextName, statistics, trace, needContext, option, monitor);
         jobList.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         return result;
     }
 
@@ -1746,9 +1755,11 @@ public class ProcessorUtilities {
             jobList.clear();
             esbJobs.clear();
             hasLoopDependency = false;
+            mainJobInfo = null;
             result = generateCode(jobInfo, contextName, statistics, trace, true, GENERATE_ALL_CHILDS, monitor);
             jobList.clear();
             hasLoopDependency = false;
+            mainJobInfo = null;
         }
         return result;
     }
@@ -1758,9 +1769,11 @@ public class ProcessorUtilities {
         jobList.clear();
         esbJobs.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         IProcessor returnValue = generateCode(process, contextName, statistics, trace, false);
         jobList.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         return returnValue;
     }
 
@@ -1792,10 +1805,12 @@ public class ProcessorUtilities {
         jobList.clear();
         esbJobs.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         IProcessor genCode = generateCode(jobInfo, context.getName(), statistics, trace, contextProperties,
                 GENERATE_ALL_CHILDS, new NullProgressMonitor());
         jobList.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         return genCode;
     }
 
@@ -1804,10 +1819,12 @@ public class ProcessorUtilities {
         jobList.clear();
         esbJobs.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         IProcessor returnValue =
                 generateCode(process, context, statistics, trace, properties, new NullProgressMonitor());
         jobList.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         return returnValue;
     }
 
@@ -1839,10 +1856,12 @@ public class ProcessorUtilities {
         jobList.clear();
         esbJobs.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         IProcessor genCode = generateCode(jobInfo, context.getName(), statistics, trace, properties,
                 GENERATE_ALL_CHILDS, progressMonitor);
         jobList.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         return genCode;
     }
 
@@ -1888,10 +1907,12 @@ public class ProcessorUtilities {
         jobList.clear();
         esbJobs.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         IProcessor genCode = generateCode(processor, jobInfo, context.getName(), statistics, trace, properties,
                 GENERATE_ALL_CHILDS, progressMonitor);
         jobList.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
 
         TimeMeasure.end(timeMeasureGenerateCodesId);
         // if active before, not disable and active still.
@@ -1918,10 +1939,12 @@ public class ProcessorUtilities {
         jobList.clear();
         esbJobs.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         IProcessor genCode = generateCode(jobInfo, context.getName(), statistics, trace, properties, option,
                 new NullProgressMonitor());
         jobList.clear();
         hasLoopDependency = false;
+        mainJobInfo = null;
         return genCode;
     }
 
@@ -2179,6 +2202,47 @@ public class ProcessorUtilities {
         }
         // trunjob component
         EList<NodeType> nodes = ptype.getNode();
+        getSubjobInfo(nodes, ptype, parentJobInfo, jobInfos,firstChildOnly);
+        
+        if (parentJobInfo.isTestContainer()
+                && GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
+            ITestContainerProviderService testContainerService =
+                    (ITestContainerProviderService) GlobalServiceRegister.getDefault().getService(
+                            ITestContainerProviderService.class);
+            if (testContainerService != null) {
+            	getSubjobInfo(testContainerService.getOriginalNodes(ptype), ptype, parentJobInfo, jobInfos,firstChildOnly);
+            }
+        }
+
+        if (!parentJobInfo.isTestContainer() && !parentJobInfo.isJoblet()
+                && GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
+            ITestContainerProviderService testContainerService =
+                    (ITestContainerProviderService) GlobalServiceRegister.getDefault().getService(
+                            ITestContainerProviderService.class);
+            if (testContainerService != null) {
+                List<ProcessItem> testsItems =
+                        testContainerService.getTestContainersByVersion(parentJobInfo.getProcessItem());
+                for (ProcessItem testItem : testsItems) {
+                    ProcessType testProcess = testContainerService.getTestContainerProcess(testItem);
+                    if (testItem.getProcess() == null) {
+                        testItem.setProcess(testProcess);
+                    }
+                    if (testProcess == null) {
+                        log.warn(Messages.getString("ProcessorUtilities.nullProcess")); //$NON-NLS-1$
+                        continue;
+                    }
+                    JobInfo jobInfo = new JobInfo(testItem, testProcess.getDefaultContext());
+                    jobInfo.setTestContainer(true);
+                    jobInfos.add(jobInfo);
+                    jobInfo.setFatherJobInfo(parentJobInfo);
+                }
+            }
+        }
+        return jobInfos;
+    }
+    
+    private static Set<JobInfo> getSubjobInfo(List<NodeType> nodes, ProcessType ptype, JobInfo parentJobInfo, Set<JobInfo> jobInfos,
+            boolean firstChildOnly) {
         String jobletPaletteType = null;
         String frameWork = ptype.getFramework();
         if (StringUtils.isBlank(frameWork)) {
@@ -2188,7 +2252,7 @@ public class ProcessorUtilities {
         } else if (frameWork.equals(HadoopConstants.FRAMEWORK_SPARK_STREAMING)) {
             jobletPaletteType = ComponentCategory.CATEGORY_4_SPARKSTREAMING.getName();
         }
-        for (NodeType node : nodes) {
+    	for (NodeType node : nodes) {
             boolean activate = true;
             // check if node is active at least.
             for (Object o : node.getElementParameter()) {
@@ -2286,31 +2350,7 @@ public class ProcessorUtilities {
                 }
             }
         }
-        if (!parentJobInfo.isTestContainer() && !parentJobInfo.isJoblet()
-                && GlobalServiceRegister.getDefault().isServiceRegistered(ITestContainerProviderService.class)) {
-            ITestContainerProviderService testContainerService =
-                    (ITestContainerProviderService) GlobalServiceRegister.getDefault().getService(
-                            ITestContainerProviderService.class);
-            if (testContainerService != null) {
-                List<ProcessItem> testsItems =
-                        testContainerService.getTestContainersByVersion(parentJobInfo.getProcessItem());
-                for (ProcessItem testItem : testsItems) {
-                    ProcessType testProcess = testContainerService.getTestContainerProcess(testItem);
-                    if (testItem.getProcess() == null) {
-                        testItem.setProcess(testProcess);
-                    }
-                    if (testProcess == null) {
-                        log.warn(Messages.getString("ProcessorUtilities.nullProcess")); //$NON-NLS-1$
-                        continue;
-                    }
-                    JobInfo jobInfo = new JobInfo(testItem, testProcess.getDefaultContext());
-                    jobInfo.setTestContainer(true);
-                    jobInfos.add(jobInfo);
-                    jobInfo.setFatherJobInfo(parentJobInfo);
-                }
-            }
-        }
-        return jobInfos;
+    	return jobInfos;
     }
 
     private static boolean isRouteletNode(NodeType node) {
@@ -2468,6 +2508,15 @@ public class ProcessorUtilities {
         return hasLoopDependency;
     }
 
+    /**
+     * Getter for mainJobInfo. <font color="red">Need to check null</font>
+     * 
+     * @return the mainJobInfo
+     */
+    public static JobInfo getMainJobInfo() {
+        return mainJobInfo;
+    }
+
     /**
      * The dynamic loading of the hadoop configuration library is supported in DI, MapReduce and Spark (batch and
      * streaming).

main/plugins/org.talend.designer.maven.aether/.classpath

@@ -1,13 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry exported="true" kind="lib" path="lib/maven-aether-provider-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-model-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-model-builder-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/maven-repository-metadata-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/plexus-interpolation-1.19.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/plexus-utils-3.0.17.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="lib" path="lib/commons-codec.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/httpclient.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/httpcore.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-connector-basic.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-impl.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-spi.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-classpath.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-file.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-http.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-wagon.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-resolver-util.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/plexus-utils.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/slf4j-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/wagon-provider-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-aether-provider-3.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-model-3.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-model-builder-3.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/maven-repository-metadata-3.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/plexus-interpolation-1.19.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/plexus-utils-3.0.17.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

main/plugins/org.talend.designer.maven.aether/META-INF/MANIFEST.MF

@@ -5,15 +5,10 @@ Bundle-SymbolicName: org.talend.designer.maven.aether
 Bundle-Version: 7.2.1.qualifier
 Bundle-Activator: org.talend.designer.maven.aether.Activator
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.aether.api,
- org.eclipse.aether.connector.basic,
- org.eclipse.aether.impl,
- org.eclipse.aether.spi,
- org.eclipse.aether.transport.file,
- org.eclipse.aether.transport.http,
- org.eclipse.aether.util,
  org.talend.libraries.jackson,
- org.talend.core.runtime
+ org.talend.core.runtime,
+ org.eclipse.m2e.core,
+ org.eclipse.m2e.maven.runtime
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
  lib/maven-aether-provider-3.2.1.jar,
@@ -21,7 +16,23 @@ Bundle-ClassPath: .,
  lib/maven-model-builder-3.2.1.jar,
  lib/maven-repository-metadata-3.2.1.jar,
  lib/plexus-interpolation-1.19.jar,
- lib/plexus-utils-3.0.17.jar
+ lib/plexus-utils-3.0.17.jar,
+ lib/commons-codec.jar,
+ lib/httpclient.jar,
+ lib/httpcore.jar,
+ lib/jcl-over-slf4j.jar,
+ lib/maven-resolver-api.jar,
+ lib/maven-resolver-connector-basic.jar,
+ lib/maven-resolver-impl.jar,
+ lib/maven-resolver-spi.jar,
+ lib/maven-resolver-transport-classpath.jar,
+ lib/maven-resolver-transport-file.jar,
+ lib/maven-resolver-transport-http.jar,
+ lib/maven-resolver-transport-wagon.jar,
+ lib/maven-resolver-util.jar,
+ lib/plexus-utils.jar,
+ lib/slf4j-api.jar,
+ lib/wagon-provider-api.jar
 Export-Package: org.talend.designer.maven.aether,
  org.talend.designer.maven.aether.comparator,
  org.talend.designer.maven.aether.node,

main/plugins/org.talend.designer.maven.aether/lib/.gitignore

@@ -0,0 +1 @@
+*.jar

main/plugins/org.talend.designer.maven.aether/pom.xml

@@ -9,4 +9,79 @@
   </parent>
   <artifactId>org.talend.designer.maven.aether</artifactId>
   <packaging>eclipse-plugin</packaging>
+  <properties>
+    <maven.resolver.version>1.3.1</maven.resolver.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-spi</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-util</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-impl</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-connector-basic</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-transport-classpath</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-transport-file</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-transport-http</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-transport-wagon</artifactId>
+      <version>${maven.resolver.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.0.2</version>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeScope>runtime</includeScope>
+              <outputDirectory>${project.basedir}/lib</outputDirectory>
+              <stripVersion>true</stripVersion>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

main/plugins/org.talend.designer.maven.aether/src/main/java/org/talend/designer/maven/aether/util/MavenLibraryResolverProvider.java

@@ -0,0 +1,185 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2018 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.designer.maven.aether.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.maven.model.License;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.building.DefaultModelBuilderFactory;
+import org.apache.maven.model.building.DefaultModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuildingResult;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
+import org.eclipse.aether.impl.DefaultServiceLocator;
+import org.eclipse.aether.repository.Authentication;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.resolution.ArtifactRequest;
+import org.eclipse.aether.resolution.ArtifactResult;
+import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
+import org.eclipse.aether.spi.connector.transport.TransporterFactory;
+import org.eclipse.aether.transport.file.FileTransporterFactory;
+import org.eclipse.aether.transport.http.HttpTransporterFactory;
+import org.eclipse.aether.util.repository.AuthenticationBuilder;
+import org.eclipse.m2e.core.MavenPlugin;
+import org.talend.core.nexus.ArtifactRepositoryBean;
+import org.talend.core.nexus.TalendLibsServerManager;
+import org.talend.core.runtime.maven.MavenArtifact;
+
+public class MavenLibraryResolverProvider {
+
+    public static final String KEY_LOCAL_MVN_REPOSITORY = "talend.mvn.repository"; //$NON-NLS-1$
+
+    private static Map<String, RemoteRepository> urlToRepositoryMap = new HashMap<String, RemoteRepository>();
+
+    private RepositorySystem defaultRepoSystem;
+
+    private RepositorySystemSession defaultRepoSystemSession;
+
+    private RemoteRepository defaultRemoteRepository = null;
+
+    private static MavenLibraryResolverProvider instance;
+
+    public static MavenLibraryResolverProvider getInstance() {
+        if (instance == null) {
+            synchronized (MavenLibraryResolverProvider.class) {
+                if (instance == null) {
+                    try {
+                        instance = new MavenLibraryResolverProvider();
+                    } catch (Exception ex) {
+                        ex.printStackTrace();
+                    }
+
+                }
+            }
+        }
+        return instance;
+    }
+
+    private MavenLibraryResolverProvider() {
+        defaultRepoSystem = newRepositorySystem();
+        defaultRepoSystemSession = newSession(defaultRepoSystem, getLocalMVNRepository());
+        ArtifactRepositoryBean talendServer = TalendLibsServerManager.getInstance().getTalentArtifactServer();
+        if (talendServer.getUserName() == null && talendServer.getPassword() == null) {
+            defaultRemoteRepository = new RemoteRepository.Builder("talend", "default", talendServer.getRepositoryURL()).build(); //$NON-NLS-1$ //$NON-NLS-2$
+        } else {
+            Authentication authentication = new AuthenticationBuilder().addUsername(talendServer.getUserName())
+                    .addPassword(talendServer.getPassword()).build();
+            defaultRemoteRepository = new RemoteRepository.Builder("talend", "default", talendServer.getRepositoryURL()) //$NON-NLS-1$ //$NON-NLS-2$
+                    .setAuthentication(authentication).build();
+        }
+    }
+
+    public ArtifactResult resolveArtifact(MavenArtifact aritfact) throws Exception {
+        RemoteRepository remoteRepo = getRemoteRepositroy(aritfact);
+        Artifact artifact = new DefaultArtifact(aritfact.getGroupId(), aritfact.getArtifactId(), aritfact.getClassifier(),
+                aritfact.getType(), aritfact.getVersion());
+        ArtifactRequest artifactRequest = new ArtifactRequest();
+        artifactRequest.addRepository(remoteRepo);
+        artifactRequest.setArtifact(artifact);
+        ArtifactResult result = defaultRepoSystem.resolveArtifact(defaultRepoSystemSession, artifactRequest);
+        return result;
+    }
+
+    public Map<String, Object> resolveDescProperties(MavenArtifact aritfact) throws Exception {
+        MavenArtifact clonedArtifact = aritfact.clone();
+        clonedArtifact.setType("pom"); //$NON-NLS-1$
+        Map<String, Object> properties = new HashMap<String, Object>();
+        ArtifactResult result = resolveArtifact(clonedArtifact);
+        if (result != null && result.isResolved()) {
+            DefaultModelBuilderFactory factory = new DefaultModelBuilderFactory();
+            DefaultModelBuildingRequest request = new DefaultModelBuildingRequest();
+            request.setPomFile(result.getArtifact().getFile());
+            ModelBuildingResult modelResult = factory.newInstance().build(request);
+            Model model = modelResult.getEffectiveModel();
+            if (model != null) {
+                properties.put("type", model.getPackaging()); //$NON-NLS-1$
+                properties.put("license.count", model.getLicenses().size()); //$NON-NLS-1$
+                if (model.getLicenses() != null) {
+                    for (int i = 0; i < model.getLicenses().size(); i++) {
+                        License license = model.getLicenses().get(i);
+                        properties.put("license." + i + ".name", license.getName()); //$NON-NLS-1$//$NON-NLS-2$
+                        properties.put("license." + i + ".url", license.getUrl()); //$NON-NLS-1$ //$NON-NLS-2$
+                        properties.put("license." + i + ".comments", license.getComments()); //$NON-NLS-1$ //$NON-NLS-2$
+                        properties.put("license." + i + ".distribution", license.getDistribution()); //$NON-NLS-1$ //$NON-NLS-2$
+                    }
+                }
+            }
+        }
+        return properties;
+    }
+
+    public RemoteRepository getRemoteRepositroy(MavenArtifact aritfact) {
+        if (aritfact != null && aritfact.getRepositoryUrl() != null) {
+            if (urlToRepositoryMap.containsKey(aritfact.getRepositoryUrl())) {
+                return urlToRepositoryMap.get(aritfact.getRepositoryUrl());
+            }
+
+            RemoteRepository repository = buildRemoteRepository(aritfact);
+            urlToRepositoryMap.put(aritfact.getRepositoryUrl(), repository);
+            return repository;
+        }
+        return defaultRemoteRepository;
+    }
+
+    private RemoteRepository buildRemoteRepository(MavenArtifact aritfact) {
+        RemoteRepository repository = null;
+        if (aritfact.getUsername() == null && aritfact.getPassword() == null) {
+            repository = new RemoteRepository.Builder("talend", "default", aritfact.getRepositoryUrl()).build(); //$NON-NLS-1$ //$NON-NLS-2$
+        } else {
+            Authentication authentication = new AuthenticationBuilder().addUsername(aritfact.getUsername())
+                    .addPassword(aritfact.getPassword()).build();
+            repository = new RemoteRepository.Builder("talend", "default", aritfact.getRepositoryUrl()) //$NON-NLS-1$ //$NON-NLS-2$
+                    .setAuthentication(authentication).build();
+        }
+        return repository;
+    }
+
+    private RepositorySystem newRepositorySystem() {
+        DefaultServiceLocator locator = MavenRepositorySystemUtils.newServiceLocator();
+        locator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
+        locator.addService(TransporterFactory.class, FileTransporterFactory.class);
+        locator.addService(TransporterFactory.class, HttpTransporterFactory.class);
+
+        return locator.getService(RepositorySystem.class);
+    }
+
+    private RepositorySystemSession newSession(RepositorySystem system, String target) {
+        DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession();
+
+        LocalRepository localRepo = new LocalRepository( /* "target/local-repo" */target);
+        session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo));
+
+        return session;
+    }
+
+    private String getLocalMVNRepository() {
+        String repository = null;
+        try {
+            repository = MavenPlugin.getMaven().getLocalRepositoryPath();
+        } catch (Exception ex) {
+            // Ignore here
+        }
+        if (repository == null) {
+            repository = System.getProperty(KEY_LOCAL_MVN_REPOSITORY);
+        }
+        return repository;
+    }
+}

main/plugins/org.talend.designer.maven.tos/pom.xml

@@ -66,7 +66,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.talend.studio</groupId>
-			<artifactId>spring-boot-maven-plugin-1-5-9-RELEASE-tos</artifactId>
+			<artifactId>talend-compiler-plugin-tos</artifactId>
 			<version>${project.version}</version>
 			<type>pom</type>
 		</dependency>
@@ -76,6 +76,12 @@
             <version>${project.version}</version>
             <type>pom</type>
         </dependency>
+        <dependency>        
+            <groupId>org.talend.studio</groupId>
+            <artifactId>build-helper-maven-plugin-3-0-0-tos</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
 	</dependencies>
 	<profiles>
 		<profile>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/build-helper-maven-plugin-3-0-0/pom.xml

@@ -0,0 +1,44 @@
+<?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>studio-maven-repository-tos</artifactId>
+		<version>7.2.1-SNAPSHOT</version>
+		<relativePath>../../../</relativePath>
+	</parent>
+	<artifactId>build-helper-maven-plugin-3-0-0-tos</artifactId>
+	<packaging>pom</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.codehaus.mojo</groupId>
+			<artifactId>build-helper-maven-plugin</artifactId>
+			<version>3.0.0</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.8</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<addParentPoms>true</addParentPoms>
+							<copyPom>true</copyPom>
+							<includeScope>compile</includeScope>
+							<outputDirectory>${basedir}/../../../tmp/repository</outputDirectory>
+							<useRepositoryLayout>true</useRepositoryLayout>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/features-maven-plugin-2-2-9/pom.xml

@@ -35,6 +35,13 @@
 			<version>3.1</version>
 		</dependency>
 		
+                <!-- Required by commons-lang-2.6.pom -->
+                <dependency>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-parent</artifactId>
+                    <version>17</version>
+                    <type>pom</type>
+                </dependency>		
 	</dependencies>
 	<build>
 		<plugins>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/spring-boot-maven-plugin-1-5-9-RELEASE/pom.xml

@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.talend.studio</groupId>
-		<artifactId>studio-maven-repository-tos</artifactId>
-		<version>7.2.1-SNAPSHOT</version>
-		<relativePath>../../../</relativePath>
-	</parent>
-	<artifactId>spring-boot-maven-plugin-1-5-9-RELEASE-tos</artifactId>
-	<packaging>pom</packaging>
-	<properties>
-		<!-- Dependency versions -->
-		<features-maven-plugin.version>2.2.9</features-maven-plugin.version>
-		<maven-install-plugin.version>2.5.1</maven-install-plugin.version>
-		<plexus-utils.version>2.1</plexus-utils.version>
-	</properties>
-	<dependencies>
-	
-		<!-- Required by MS packaging for Jobs -->
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-maven-plugin</artifactId>
-			<version>1.5.9.RELEASE</version>
-		</dependency>
-		
-				<dependency>
-			<groupId>com.fasterxml.jackson</groupId>
-			<artifactId>jackson-bom</artifactId>
-			<version>2.8.10</version>
-			<type>pom</type>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-framework-bom</artifactId>
-			<version>4.3.13.RELEASE	</version>
-			<type>pom</type>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-releasetrain</artifactId>
-			<version>Ingalls-SR9</version>
-			<type>pom</type>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-bom</artifactId>
-			<version>4.3.12.RELEASE</version>
-			<type>pom</type>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-			<version>1.5.9.RELEASE</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-			<version>1.5.9.RELEASE</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-1.2-api</artifactId>
-			<version>2.7</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-log4j2</artifactId>
-			<version>1.5.9.RELEASE</version>
-		</dependency>
-		
-		<!-- Required for MS packaging for Routes -->
-		
-		<dependency>
-			<groupId>org.apache.camel</groupId>
-			<artifactId>camel-spring-boot</artifactId>
-			<version>2.20.1</version>
-		</dependency>
-
-	</dependencies>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.8</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<addParentPoms>true</addParentPoms>
-							<copyPom>true</copyPom>
-							<includeScope>compile</includeScope>
-							<outputDirectory>${basedir}/../../../tmp/repository</outputDirectory>
-							<useRepositoryLayout>true</useRepositoryLayout>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

main/plugins/org.talend.designer.maven.tos/resources/build/plugins/talend-compiler-plugin/pom.xml

@@ -0,0 +1,46 @@
+<?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>studio-maven-repository-tos</artifactId>
+		<version>7.2.1-SNAPSHOT</version>
+		<relativePath>../../../</relativePath>
+	</parent>
+	<artifactId>talend-compiler-plugin-tos</artifactId>
+	<packaging>pom</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.eclipse.tycho</groupId>
+			<artifactId>tycho-compiler-jdt</artifactId>
+			<version>1.4.0</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.8</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<addParentPoms>true</addParentPoms>
+							<copyPom>true</copyPom>
+							<includeScope>compile</includeScope>
+							<outputDirectory>${basedir}/../../../tmp/repository</outputDirectory>
+							<useRepositoryLayout>true</useRepositoryLayout>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

main/plugins/org.talend.designer.maven.tos/resources/build/pom.xml

@@ -14,7 +14,8 @@
 		<module>plugins/maven-bundle-plugin-2-3-7</module>
 		<module>plugins/maven-bundle-plugin-2-5-3</module>
 		<module>plugins/maven-install-plugin-2-5-1</module>
-		<module>plugins/spring-boot-maven-plugin-1-5-9-RELEASE</module>
+		<module>plugins/talend-compiler-plugin</module>
+		<module>plugins/build-helper-maven-plugin-3-0-0</module>
 	</modules>	
 	<dependencies>
 		<dependency>

main/plugins/org.talend.designer.maven.tos/resources/components/pom.xml

@@ -10,7 +10,7 @@
 	<artifactId>studio-components-dependencies</artifactId>
 	<packaging>pom</packaging>
 	<properties>
-		<components.version>0.26.0-SNAPSHOT</components.version>
+		<components.version>0.27.0-SNAPSHOT</components.version>
 	</properties>
 	<repositories>
 		<repository>
@@ -52,15 +52,22 @@
                 <artifactId>jackson-dataformat-cbor</artifactId>
                 <version>2.9.5</version>
             </dependency>
-            <!-- It fixes provided dependency scope to compile, because maven-dependency-plugin is setup to include
-             only compile and runtime scopes, but provided is also required. It's not possible to setup plugin to
-             include all: compile, runtime and provided dependencies -->
-            <dependency>
-                <groupId>biz.aQute.bnd</groupId>
-                <artifactId>annotation</artifactId>
-                <version>2.4.0</version>
-                <scope>compile</scope>
-            </dependency>
+            <!-- Required by commons-lang-2.6.pom -->
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-parent</artifactId>
+                <version>17</version>
+                <type>pom</type>
+            </dependency>             
+            <!-- It fixes provided dependency scope to compile, because maven-dependency-plugin is setup to include
+             only compile and runtime scopes, but provided is also required. It's not possible to setup plugin to
+             include all: compile, runtime and provided dependencies -->
+            <dependency>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>annotation</artifactId>
+                <version>2.4.0</version>
+                <scope>compile</scope>
+            </dependency>
             <dependency>
                 <groupId>org.talend.components</groupId>
                 <artifactId>components-bom</artifactId>
@@ -152,12 +159,13 @@
             <artifactId>components-api</artifactId>
             <version>${components.version}</version>
         </dependency>
-        <!-- Dependencies in provided scope should be explicitly added as dependency in this module,
-            because provided scope is not transitive -->
-        <dependency>
-            <groupId>biz.aQute.bnd</groupId>
-            <artifactId>annotation</artifactId>
-            <version>2.4.0</version>
+        <!-- Dependencies in provided scope should be explicitly added as dependency in this module,
+            because provided scope is not transitive -->
+		<dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+            <version>1.3.0</version>
+            <scope>compile</scope>
         </dependency>
 		<dependency>
 			<groupId>org.eclipse.sisu</groupId>

main/plugins/org.talend.designer.maven.tos/resources/surefire/pom.xml

@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.4</version>
+            <version>3.8.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>

main/plugins/org.talend.designer.maven.tos/resources/tcompv1/pom.xml

@@ -11,7 +11,7 @@
     <packaging>pom</packaging>
     
     <properties>
-        <tcomp.version>1.1.4</tcomp.version>
+        <tcomp.version>1.1.9-SNAPSHOT</tcomp.version>
         <slf4j.version>1.7.25</slf4j.version>
     </properties>