fix(TUP-33021):Feature Manager can't list any feature if studio install

location has space.

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.designer.feature" label="Designer Feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.designer.feature" label="Designer Feature" version="8.0.1.M12" provider-name=".Talend SA."> 
   <description url="http://www.talend.com/online/featuresdescription.html#designer-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#designer-feature</description>  
   <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
   <license>The licence are describe in branding feature</license>  

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.feature</artifactId>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.fragment.jars.di.feature"
       label="Fragment Jars in DI"
-      version="8.8.8.qualifier">
+      version="8.0.1.M12">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.fragment.jars.di.feature</artifactId>

main/features/org.talend.gmf.feature/build.properties

@@ -1,3 +1 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties
+bin.includes = feature.xml

main/features/org.talend.gmf.feature/feature.properties

@@ -1,175 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2014 IBM Corporation and others.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Graphical Modeling Framework (GMF) Notation
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=Graphical Modeling Framework Notation
-
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-\n\
-November 22, 2017\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION\n\
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF\n\
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE\n\
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED\n\
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE\n\
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY\n\
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU\n\
-MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public License\n\
-Version 2.0 ("EPL"). A copy of the EPL is provided with this Content and is also\n\
-available at http://www.eclipse.org/legal/epl-2.0. For purposes of the EPL,\n\
-"Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code, documentation\n\
-and other files maintained in the Eclipse Foundation source code repository\n\
-("Repository") in software modules ("Modules") and made available as\n\
-downloadable archives ("Downloads").\n\
-\n\
--   Content may be structured and packaged into modules to facilitate\n\
-    delivering, extending, and upgrading the Content. Typical modules may\n\
-    include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and\n\
-    features ("Features").\n\
--   Each Plug-in or Fragment may be packaged as a sub-directory or JAR\n\
-    (Java\u2122 ARchive) in a directory named "plugins".\n\
--   A Feature is a bundle of one or more Plug-ins and/or Fragments and\n\
-    associated material. Each Feature may be packaged as a sub-directory in a\n\
-    directory named "features". Within a Feature, files named "feature.xml" may\n\
-    contain a list of the names and version numbers of the Plug-ins and/or\n\
-    Fragments associated with that Feature.\n\
--   Features may also include other Features ("Included Features"). Within a\n\
-    Feature, files named "feature.xml" may contain a list of the names and\n\
-    version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be contained in\n\
-files named "about.html" ("Abouts"). The terms and conditions governing Features\n\
-and Included Features should be contained in files named "license.html"\n\
-("Feature Licenses"). Abouts and Feature Licenses may be located in any\n\
-directory of a Download or Module including, but not limited to the following\n\
-locations:\n\
-\n\
--   The top-level (root) directory\n\
--   Plug-in and Fragment directories\n\
--   Inside Plug-ins and Fragments packaged as JARs\n\
--   Sub-directories of the directory named "src" of certain Plug-ins\n\
--   Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using\n\
-the Provisioning Technology (as defined below), you must agree to a license\n\
-("Feature Update License") during the installation process. If the Feature\n\
-contains Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform you\n\
-where you can locate them. Feature Update Licenses may be found in the "license"\n\
-property of files named "feature.properties" found within a Feature. Such\n\
-Abouts, Feature Licenses, and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your use of\n\
-the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL\n\
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE\n\
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
--   Eclipse Public License Version 1.0 (available at\n\
-    http://www.eclipse.org/legal/epl-v10.html)\n\
--   Eclipse Distribution License Version 1.0 (available at\n\
-    http://www.eclipse.org/licenses/edl-v1.0.html)\n\
--   Common Public License Version 1.0 (available at\n\
-    http://www.eclipse.org/legal/cpl-v10.html)\n\
--   Apache Software License 1.1 (available at\n\
-    http://www.apache.org/licenses/LICENSE)\n\
--   Apache Software License 2.0 (available at\n\
-    http://www.apache.org/licenses/LICENSE-2.0)\n\
--   Mozilla Public License Version 1.1 (available at\n\
-    http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO\n\
-USE OF THE CONTENT. If no About, Feature License, or Feature Update License is\n\
-provided, please contact the Eclipse Foundation to determine what terms and\n\
-conditions govern that particular Content.\n\
-\n\
-Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which\n\
-include, but are not limited to, p2 and the Eclipse Update Manager\n\
-("Provisioning Technology") for the purpose of allowing users to install\n\
-software, documentation, information and/or other materials (collectively\n\
-"Installable Software"). This capability is provided with the intent of allowing\n\
-such users to install, extend and update Eclipse-based products. Information\n\
-about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install\n\
-Installable Software. You shall be responsible for enabling the applicable\n\
-license agreements relating to the Installable Software to be presented to, and\n\
-accepted by, the users of the Provisioning Technology in accordance with the\n\
-Specification. By using Provisioning Technology in such a manner and making it\n\
-available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the\n\
-following:\n\
-\n\
-1.  A series of actions may occur ("Provisioning Process") in which a user may\n\
-    execute the Provisioning Technology on a machine ("Target Machine") with the\n\
-    intent of installing, extending or updating the functionality of an\n\
-    Eclipse-based product.\n\
-2.  During the Provisioning Process, the Provisioning Technology may cause third\n\
-    party Installable Software or a portion thereof to be accessed and copied to\n\
-    the Target Machine.\n\
-3.  Pursuant to the Specification, you will provide to the user the terms and\n\
-    conditions that govern the use of the Installable Software ("Installable\n\
-    Software Agreement") and such Installable Software Agreement shall be\n\
-    accessed from the Target Machine in accordance with the Specification. Such\n\
-    Installable Software Agreement must inform the user of the terms and\n\
-    conditions that govern the Installable Software and must solicit acceptance\n\
-    by the end user in the manner prescribed in such Installable\n\
-    Software Agreement. Upon such indication of agreement by the user, the\n\
-    provisioning Technology will complete installation of the\n\
-    Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are currently\n\
-may have restrictions on the import, possession, and use, and/or re-export to\n\
-another country, of encryption software. BEFORE using any encryption software,\n\
-please check the country's laws, regulations and policies concerning the import,\n\
-possession, or use, and re-export of encryption software, to see if this is\n\
-permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the\n\
-United States, other countries, or both.\n
-########### end of license property ##########################################

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

@@ -2,18 +2,18 @@
 <feature
       id="org.talend.gmf.feature"
       label="Gmf"
-      version="8.8.8.qualifier">
+      version="8.0.1.M12">
 
    <description url="http://www.example.com/description">
-      GMF
+      [Enter Feature Description here.]
    </description>
 
    <copyright url="http://www.example.com/copyright">
       [Enter Copyright Description here.]
    </copyright>
 
-   <license url="%licenseURL">
-      %license
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
    </license>
 
    <requires>
@@ -428,4 +428,4 @@
          version="3.0.0.draft20060413_v201105210656"
          unpack="false"/>
 
-</feature>
+</feature>

main/features/org.talend.gmf.feature/license.html

@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-	<h2>Eclipse Foundation Software User Agreement</h2>
-	<p>November 22, 2017</p>
-
-	<h3>Usage Of Content</h3>
-
-	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
-		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-		(COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY
-		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
-		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
-		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
-		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
-		USE THE CONTENT.</p>
-
-	<h3>Applicable Licenses</h3>
-
-	<p>
-		Unless otherwise indicated, all Content made available by the Eclipse
-		Foundation is provided to you under the terms and conditions of the
-		Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the
-		EPL is provided with this Content and is also available at <a
-			href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-		For purposes of the EPL, &quot;Program&quot; will mean the Content.
-	</p>
-
-	<p>Content includes, but is not limited to, source code, object
-		code, documentation and other files maintained in the Eclipse
-		Foundation source code repository (&quot;Repository&quot;) in software
-		modules (&quot;Modules&quot;) and made available as downloadable
-		archives (&quot;Downloads&quot;).</p>
-
-	<ul>
-		<li>Content may be structured and packaged into modules to
-			facilitate delivering, extending, and upgrading the Content. Typical
-			modules may include plug-ins (&quot;Plug-ins&quot;), plug-in
-			fragments (&quot;Fragments&quot;), and features
-			(&quot;Features&quot;).</li>
-		<li>Each Plug-in or Fragment may be packaged as a sub-directory
-			or JAR (Java&trade; ARchive) in a directory named
-			&quot;plugins&quot;.</li>
-		<li>A Feature is a bundle of one or more Plug-ins and/or
-			Fragments and associated material. Each Feature may be packaged as a
-			sub-directory in a directory named &quot;features&quot;. Within a
-			Feature, files named &quot;feature.xml&quot; may contain a list of
-			the names and version numbers of the Plug-ins and/or Fragments
-			associated with that Feature.</li>
-		<li>Features may also include other Features (&quot;Included
-			Features&quot;). Within a Feature, files named
-			&quot;feature.xml&quot; may contain a list of the names and version
-			numbers of Included Features.</li>
-	</ul>
-
-	<p>The terms and conditions governing Plug-ins and Fragments should
-		be contained in files named &quot;about.html&quot;
-		(&quot;Abouts&quot;). The terms and conditions governing Features and
-		Included Features should be contained in files named
-		&quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and
-		Feature Licenses may be located in any directory of a Download or
-		Module including, but not limited to the following locations:</p>
-
-	<ul>
-		<li>The top-level (root) directory</li>
-		<li>Plug-in and Fragment directories</li>
-		<li>Inside Plug-ins and Fragments packaged as JARs</li>
-		<li>Sub-directories of the directory named &quot;src&quot; of
-			certain Plug-ins</li>
-		<li>Feature directories</li>
-	</ul>
-
-	<p>Note: if a Feature made available by the Eclipse Foundation is
-		installed using the Provisioning Technology (as defined below), you
-		must agree to a license (&quot;Feature Update License&quot;) during
-		the installation process. If the Feature contains Included Features,
-		the Feature Update License should either provide you with the terms
-		and conditions governing the Included Features or inform you where you
-		can locate them. Feature Update Licenses may be found in the
-		&quot;license&quot; property of files named
-		&quot;feature.properties&quot; found within a Feature. Such Abouts,
-		Feature Licenses, and Feature Update Licenses contain the terms and
-		conditions (or references to such terms and conditions) that govern
-		your use of the associated Content in that directory.</p>
-
-	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
-		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
-		ARE NOT LIMITED TO):</p>
-
-	<ul>
-		<li>Eclipse Public License Version 1.0 (available at <a
-			href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>)
-		</li>
-		<li>Eclipse Distribution License Version 1.0 (available at <a
-			href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
-		</li>
-		<li>Common Public License Version 1.0 (available at <a
-			href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
-		</li>
-		<li>Apache Software License 1.1 (available at <a
-			href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
-		</li>
-		<li>Apache Software License 2.0 (available at <a
-			href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
-		</li>
-		<li>Mozilla Public License Version 1.1 (available at <a
-			href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
-		</li>
-	</ul>
-
-	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
-		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
-		or Feature Update License is provided, please contact the Eclipse
-		Foundation to determine what terms and conditions govern that
-		particular Content.</p>
-
-
-	<h3>Use of Provisioning Technology</h3>
-
-	<p>
-		The Eclipse Foundation makes available provisioning software, examples
-		of which include, but are not limited to, p2 and the Eclipse Update
-		Manager (&quot;Provisioning Technology&quot;) for the purpose of
-		allowing users to install software, documentation, information and/or
-		other materials (collectively &quot;Installable Software&quot;). This
-		capability is provided with the intent of allowing such users to
-		install, extend and update Eclipse-based products. Information about
-		packaging Installable Software is available at <a
-			href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-		(&quot;Specification&quot;).
-	</p>
-
-	<p>You may use Provisioning Technology to allow other parties to
-		install Installable Software. You shall be responsible for enabling
-		the applicable license agreements relating to the Installable Software
-		to be presented to, and accepted by, the users of the Provisioning
-		Technology in accordance with the Specification. By using Provisioning
-		Technology in such a manner and making it available in accordance with
-		the Specification, you further acknowledge your agreement to, and the
-		acquisition of all necessary rights to permit the following:</p>
-
-	<ol>
-		<li>A series of actions may occur (&quot;Provisioning
-			Process&quot;) in which a user may execute the Provisioning
-			Technology on a machine (&quot;Target Machine&quot;) with the intent
-			of installing, extending or updating the functionality of an
-			Eclipse-based product.</li>
-		<li>During the Provisioning Process, the Provisioning Technology
-			may cause third party Installable Software or a portion thereof to be
-			accessed and copied to the Target Machine.</li>
-		<li>Pursuant to the Specification, you will provide to the user
-			the terms and conditions that govern the use of the Installable
-			Software (&quot;Installable Software Agreement&quot;) and such
-			Installable Software Agreement shall be accessed from the Target
-			Machine in accordance with the Specification. Such Installable
-			Software Agreement must inform the user of the terms and conditions
-			that govern the Installable Software and must solicit acceptance by
-			the end user in the manner prescribed in such Installable Software
-			Agreement. Upon such indication of agreement by the user, the
-			provisioning Technology will complete installation of the Installable
-			Software.</li>
-	</ol>
-
-	<h3>Cryptography</h3>
-
-	<p>Content may contain encryption software. The country in which
-		you are currently may have restrictions on the import, possession, and
-		use, and/or re-export to another country, of encryption software.
-		BEFORE using any encryption software, please check the country's laws,
-		regulations and policies concerning the import, possession, or use,
-		and re-export of encryption software, to see if this is permitted.</p>
-
-	<p>
-		<small>Java and all Java-based trademarks are trademarks of
-			Oracle Corporation in the United States, other countries, or both.</small>
-	</p>
-</body>
-</html>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.gmf.feature</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.rcp.branding.tos.feature" label="Tos branding feature" version="8.8.8.qualifier" provider-name=".Talend SA." plugin="org.talend.rcp.branding.tos"> 
+<feature id="org.talend.rcp.branding.tos.feature" label="Tos branding feature" version="8.0.1.M12" provider-name=".Talend SA." plugin="org.talend.rcp.branding.tos"> 
   <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license>[Enter License Description here.]</license>  

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.feature</artifactId>

main/features/org.talend.rcp.branding.tos.test.feature/feature.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.rcp.branding.tos.test.feature" label="Test feature for TOS" version="8.8.8.qualifier"> 
+<feature id="org.talend.rcp.branding.tos.test.feature" label="Test feature for TOS" version="8.0.1.M12"> 
   <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  
@@ -48,7 +48,6 @@
   <plugin id="org.talend.repository.localprovider.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.metadata.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
-  <plugin id="org.talend.sqlbuilder.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.view.di.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.repository.view.test" download-size="0" install-size="0" version="0.0.0" fragment="true" unpack="false"/>
   <plugin id="org.talend.testutils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>

main/features/org.talend.rcp.branding.tos.test.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.repository.feature" label="Repository Feature" version="8.8.8.qualifier" provider-name=".Talend SA."> 
+<feature id="org.talend.repository.feature" label="Repository Feature" version="8.0.1.M12" provider-name=".Talend SA."> 
   <description url="http://www.talend.com/online/featuresdescription.html#repository-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#repository-feature</description>  
   <copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>  
   <license>The licence are describe in branding feature</license>  

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.azurestorage.feature/feature.xml

@@ -2,10 +2,10 @@
 <feature
       id="org.talend.studio.components.tcompv0.azurestorage.feature"
       label="Azure Storage"
-      version="8.8.8.qualifier">
+      version="8.0.1.M12">
 
    <description url="http://www.example.com/description">
-      Azure Storage
+      [Enter Feature Description here.]
    </description>
 
    <copyright url="http://www.example.com/copyright">
@@ -13,98 +13,7 @@
    </copyright>
 
    <license url="http://www.example.com/license">
-      Azure Storage
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-OW2 (http://www.ow2.org/)
-Licensed under the BSD-3-Clause license.
-
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the JSON license.
-
-
-This product includes software developed at
-Connect2id Ltd. (http://connect2id.com)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-AddThis
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the X11 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the MIT license.
-
-
-This product includes software developed at
-JUnit
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-Seam Framework
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OPS4J - Open Participation Software for Java
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OSGi Alliance (http://www.osgi.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Joda.org (http://www.joda.org)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Google, Inc.
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Connect2id Ltd. (https://connect2id.com/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Chemouni Uriel (https://urielch.github.io/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Connect2id Ltd. (https://connect2id.com)
-Licensed under the Apache-2.0 license.
+      [Enter License Description here.]
    </license>
 
    <requires>

main/features/org.talend.studio.components.tcompv0.azurestorage.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.azurestorage.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.googledrive.feature/feature.xml

@@ -2,10 +2,10 @@
 <feature
       id="org.talend.studio.components.tcompv0.googledrive.feature"
       label="Google Drive"
-      version="8.8.8.qualifier">
+      version="8.0.1.M12">
 
    <description url="http://www.example.com/description">
-      Google drive component
+      [Enter Feature Description here.]
    </description>
 
    <copyright url="http://www.example.com/copyright">
@@ -13,89 +13,11 @@
    </copyright>
 
    <license url="http://www.example.com/license">
-      Google drive component
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the JSON license.
-
-
-This product includes software developed at
-AddThis
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the X11 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the MIT license.
-
-
-This product includes software developed at
-Google (http://www.google.com/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-JUnit
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-Seam Framework
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Google
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OPS4J - Open Participation Software for Java
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OSGi Alliance (http://www.osgi.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Joda.org (http://www.joda.org)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Google, Inc.
-Licensed under the Apache-2.0 license.
+      [Enter License Description here.]
    </license>
-
    <requires>
       <import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
    </requires>
-
    <plugin
          id="org.talend.studio.components.tcompv0.googledrive"
          download-size="0"

main/features/org.talend.studio.components.tcompv0.googledrive.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.googledrive.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.jdbc.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.talend.studio.components.tcompv0.jdbc.feature"
       label="JDBC_feature"
-      version="8.8.8.qualifier">
+      version="8.0.1.M12">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]

main/features/org.talend.studio.components.tcompv0.jdbc.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.jdbc.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.jira.feature/feature.xml

@@ -2,10 +2,10 @@
 <feature
       id="org.talend.studio.components.tcompv0.jira.feature"
       label="Jira"
-      version="8.8.8.qualifier">
+      version="8.0.1.M12">
 
    <description url="http://www.example.com/description">
-      Jira component
+      [Enter Feature Description here.]
    </description>
 
    <copyright url="http://www.example.com/copyright">
@@ -13,79 +13,11 @@
    </copyright>
 
    <license url="http://www.example.com/license">
-      Jira component
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-OPS4J - Open Participation Software for Java
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OSGi Alliance (http://www.osgi.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Joda.org (http://www.joda.org)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the JSON license.
-
-
-This product includes software developed at
-Google, Inc.
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-AddThis
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the MIT license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the X11 license.
-
-
-This product includes software developed at
-JUnit
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-Seam Framework
-Licensed under the Apache-2.0 license.
+      [Enter License Description here.]
    </license>
-
    <requires>
       <import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
    </requires>
-
    <plugin
          id="org.talend.studio.components.tcompv0.jira"
          download-size="0"

main/features/org.talend.studio.components.tcompv0.jira.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.jira.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.marketo.feature/feature.xml

@@ -2,10 +2,10 @@
 <feature
       id="org.talend.studio.components.tcompv0.marketo.feature"
       label="Marketo"
-      version="8.8.8.qualifier">
+      version="8.0.1.M12">
 
    <description url="http://www.example.com/description">
-      Marketo component
+      [Enter Feature Description here.]
    </description>
 
    <copyright url="http://www.example.com/copyright">
@@ -13,144 +13,11 @@
    </copyright>
 
    <license url="http://www.example.com/license">
-      Marketo component
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Oracle
-Licensed under the EDL-1.0 license.
-
-
-This product includes software developed at
-fasterxml.com (http://fasterxml.com)
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-Oracle Corporation (http://www.oracle.com/)
-Licensed under the CDDL-1.0,GPL2 w/ CPE license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the JSON license.
-
-
-This product includes software developed at
-Oracle Corporation (http://www.oracle.com/)
-Licensed under the GPL-2.0-only license.
-
-
-This product includes software developed at
-AddThis
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the MIT license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.java.net)
-Licensed under the CDDL + GPLv2 with classpath exception license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the X11 license.
-
-
-This product includes software developed at
-JUnit
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-Seam Framework
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OPS4J - Open Participation Software for Java
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-Oracle (http://www.oracle.com/)
-Licensed under the CDDL + GPLv2 with classpath exception license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Oracle
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-OSGi Alliance (http://www.osgi.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Oracle (http://www.oracle.com)
-Licensed under the CDDL + GPLv2 with classpath exception license.
-
-
-This product includes software developed at
-Joda.org (http://www.joda.org)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Google, Inc.
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Oracle Corporation
-Licensed under the CDDL-1.0,GPL-2.0-only license.
-
-
-This product includes software developed at
-Oracle (http://www.oracle.com)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-Sun Microsystems (http://www.sun.com)
-Licensed under the CDDL+GPL license.
-
-
-This product includes software developed at
-Oracle
-Licensed under the Apache-2.0 license.
+      [Enter License Description here.]
    </license>
-
    <requires>
       <import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
    </requires>
-
    <plugin
          id="org.talend.studio.components.tcompv0.marketo"
          download-size="0"

main/features/org.talend.studio.components.tcompv0.marketo.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.marketo.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.marklogic.feature/feature.xml

@@ -2,10 +2,10 @@
 <feature
       id="org.talend.studio.components.tcompv0.marklogic.feature"
       label="Marklogic"
-      version="8.8.8.qualifier">
+      version="8.0.1.M12">
 
    <description url="http://www.example.com/description">
-      Marklogic component
+      [Enter Feature Description here.]
    </description>
 
    <copyright url="http://www.example.com/copyright">
@@ -13,184 +13,11 @@
    </copyright>
 
    <license url="http://www.example.com/license">
-      Marklogic component
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-Oracle Corporation (http://www.oracle.com/)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-JCraft,Inc. (http://www.jcraft.com/)
-Licensed under the BSD-3-Clause license.
-
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-fasterxml.com (http://fasterxml.com)
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the JSON license.
-
-
-This product includes software developed at
-Sun Microsystems, Inc.
-Licensed under the CDDL-1.0 license.
-
-
-This product includes software developed at
-AddThis
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.java.net)
-Licensed under the CDDL + GPLv2 with classpath exception license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the MIT license.
-
-
-This product includes software developed at
-The Netty Project (http://netty.io/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-JUnit
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-Seam Framework
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OPS4J - Open Participation Software for Java
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Extreme! Lab, Indiana University (http://www.extreme.indiana.edu/)
-Licensed under the Apache-1.0,CC0-1.0,CC-PDDC license.
-
-
-This product includes software developed at
-OSGi Alliance (http://www.osgi.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Joda.org (http://www.joda.org)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-The Eclipse Foundation (http://www.eclipse.org/)
-Licensed under the EDL-1.0 license.
-
-
-This product includes software developed at
-Oracle Corporation
-Licensed under the CDDL-1.0,GPL-2.0-only license.
-
-
-This product includes software developed at
-JOpt Simple
-Licensed under the MIT license.
-
-
-This product includes software developed at
-Chemouni Uriel (https://urielch.github.io/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the JSON license.
-
-
-This product includes software developed at
-Oracle
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OW2 (http://www.ow2.org/)
-Licensed under the BSD-3-Clause license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-MarkLogic Corporation
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-1.0 license.
-
-
-This product includes software developed at
-Google
-Licensed under the BSD-3-Clause license.
-
-
-This product includes software developed at
-Connect2id Ltd. (http://connect2id.com)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the X11 license.
-
-
-This product includes software developed at
-The Eclipse Foundation (http://www.eclipse.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-Saxonica (http://www.saxonica.com)
-Licensed under the MPL-2.0 license.
-
-
-This product includes software developed at
-Google, Inc.
-Licensed under the Apache-2.0 license.
+      [Enter License Description here.]
    </license>
-
    <requires>
       <import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
    </requires>
-
    <plugin
          id="org.talend.studio.components.tcompv0.marklogic"
          download-size="0"
@@ -203,5 +30,4 @@ Licensed under the Apache-2.0 license.
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
 </feature>

main/features/org.talend.studio.components.tcompv0.marklogic.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.marklogic.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.netsuite.feature/feature.xml

@@ -2,10 +2,10 @@
 <feature
       id="org.talend.studio.components.tcompv0.netsuite.feature"
       label="Netsuite"
-      version="8.8.8.qualifier">
+      version="8.0.1.M12">
 
    <description url="http://www.example.com/description">
-      Netsuite
+      [Enter Feature Description here.]
    </description>
 
    <copyright url="http://www.example.com/copyright">
@@ -13,129 +13,11 @@
    </copyright>
 
    <license url="http://www.example.com/license">
-      Netsuite
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Oracle
-Licensed under the EDL-1.0 license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the JSON license.
-
-
-This product includes software developed at
-Sun Microsystems, Inc.
-Licensed under the CDDL-1.0 license.
-
-
-This product includes software developed at
-Oracle Corporation
-Licensed under the CDDL-1.0,GPL-2.0-or-later license.
-
-
-This product includes software developed at
-AddThis
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the MIT license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.java.net)
-Licensed under the CDDL + GPLv2 with classpath exception license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the X11 license.
-
-
-This product includes software developed at
-Seam Framework
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-JUnit
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-OPS4J - Open Participation Software for Java
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Oracle (http://www.oracle.com)
-Licensed under the CDDL + GPLv2 with classpath exception license.
-
-
-This product includes software developed at
-OSGi Alliance (http://www.osgi.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Joda.org (http://www.joda.org)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Oracle (http://www.oracle.com)
-Licensed under the CDDL,GPL-2.0-or-later license.
-
-
-This product includes software developed at
-Google, Inc.
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-The Eclipse Foundation (http://www.eclipse.org/)
-Licensed under the EDL-1.0 license.
-
-
-This product includes software developed at
-Square, Inc. (http://squareup.com)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-or-later license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the JSON license.
-
-
-This product includes software developed at
-Oracle
-Licensed under the Apache-2.0 license.
+      [Enter License Description here.]
    </license>
-
    <requires>
       <import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
    </requires>
-
    <plugin
          id="org.talend.studio.components.tcompv0.netsuite"
          download-size="0"
@@ -148,5 +30,4 @@ Licensed under the Apache-2.0 license.
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
 </feature>

main/features/org.talend.studio.components.tcompv0.netsuite.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.netsuite.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.salesforce.feature/feature.xml

@@ -2,10 +2,10 @@
 <feature
       id="org.talend.studio.components.tcompv0.salesforce.feature"
       label="Salesforce"
-      version="8.8.8.qualifier">
+      version="8.0.1.M12">
 
    <description url="http://www.example.com/description">
-      Salesforce component
+      [Enter Feature Description here.]
    </description>
 
    <copyright url="http://www.example.com/copyright">
@@ -13,84 +13,11 @@
    </copyright>
 
    <license url="http://www.example.com/license">
-      Salesforce component
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the JSON license.
-
-
-This product includes software developed at
-AddThis
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the MIT license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the X11 license.
-
-
-This product includes software developed at
-ANTLR
-Licensed under the BSD-3-Clause license.
-
-
-This product includes software developed at
-JUnit
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-Seam Framework
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OPS4J - Open Participation Software for Java
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OSGi Alliance (http://www.osgi.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Joda.org (http://www.joda.org)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Google, Inc.
-Licensed under the Apache-2.0 license.
+      [Enter License Description here.]
    </license>
-
    <requires>
       <import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
    </requires>
-
    <plugin
          id="org.talend.studio.components.tcompv0.salesforce"
          download-size="0"
@@ -103,5 +30,4 @@ Licensed under the Apache-2.0 license.
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
 </feature>

main/features/org.talend.studio.components.tcompv0.salesforce.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.salesforce.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.snowflake.feature/feature.xml

@@ -2,10 +2,10 @@
 <feature
       id="org.talend.studio.components.tcompv0.snowflake.feature"
       label="SNOWFLAKE_feature"
-      version="8.8.8.qualifier">
+      version="8.0.1.M12">
 
    <description url="http://www.example.com/description">
-      Snowflake
+      [Enter Feature Description here.]
    </description>
 
    <copyright url="http://www.example.com/copyright">
@@ -13,94 +13,11 @@
    </copyright>
 
    <license url="http://www.example.com/license">
-      Snowflake
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Oracle
-Licensed under the EDL-1.0 license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the JSON license.
-
-
-This product includes software developed at
-Oracle Corporation
-Licensed under the CDDL-1.0,GPL-2.0-or-later license.
-
-
-This product includes software developed at
-AddThis
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the X11 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the MIT license.
-
-
-This product includes software developed at
-Seam Framework
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-JUnit
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-OPS4J - Open Participation Software for Java
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OSGi Alliance (http://www.osgi.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Joda.org (http://www.joda.org)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Google, Inc.
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-or-later license.
-
-
-This product includes software developed at
-Oracle
-Licensed under the Apache-2.0 license.
+      [Enter License Description here.]
    </license>
-
    <requires>
       <import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
    </requires>
-
    <plugin
          id="org.talend.studio.components.tcompv0.snowflake"
          download-size="0"
@@ -113,5 +30,4 @@ Licensed under the Apache-2.0 license.
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
 </feature>

main/features/org.talend.studio.components.tcompv0.snowflake.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.snowflake.feature</artifactId>

main/features/org.talend.studio.components.tcompv0.splunk.feature/feature.xml

@@ -2,10 +2,10 @@
 <feature
       id="org.talend.studio.components.tcompv0.splunk.feature"
       label="Splunk"
-      version="8.8.8.qualifier">
+      version="8.0.1.M12">
 
    <description url="http://www.example.com/description">
-      Splunk component
+      [Enter Feature Description here.]
    </description>
 
    <copyright url="http://www.example.com/copyright">
@@ -13,79 +13,11 @@
    </copyright>
 
    <license url="http://www.example.com/license">
-      Splunk component
-Copyright (c) 2006-2021 Talend Inc. - www.talend.com
-All rights reserved.
-
-This product includes software developed at
-OPS4J - Open Participation Software for Java
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-GlassFish Community (https://glassfish.dev.java.net)
-Licensed under the CDDL,GPL-2.0-only license.
-
-
-This product includes software developed at
-The Apache Software Foundation (http://jakarta.apache.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-OSGi Alliance (http://www.osgi.org/)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-Joda.org (http://www.joda.org)
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-FasterXML (http://fasterxml.com)
-Licensed under the JSON license.
-
-
-This product includes software developed at
-Google, Inc.
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-AddThis
-Licensed under the Apache-2.0 license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the MIT license.
-
-
-This product includes software developed at
-SLF4J.ORG
-Licensed under the X11 license.
-
-
-This product includes software developed at
-JUnit
-Licensed under the EPL-1.0 license.
-
-
-This product includes software developed at
-Seam Framework
-Licensed under the Apache-2.0 license.
+      [Enter License Description here.]
    </license>
-
    <requires>
       <import plugin="org.talend.designer.maven.repo.tcompv0" version="0.0.0" match="greaterOrEqual"/>
    </requires>
-
    <plugin
          id="org.talend.studio.components.tcompv0.splunk"
          download-size="0"
@@ -98,5 +30,4 @@ Licensed under the Apache-2.0 license.
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-
 </feature>

main/features/org.talend.studio.components.tcompv0.splunk.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.studio.components.tcompv0.splunk.feature</artifactId>

main/features/org.talend.tos.components.feature/feature.xml

@@ -1,252 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.talend.tos.components.feature"
-      label="Components-feature"
-      version="8.8.8.qualifier">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <requires>
-      <import feature="org.talend.studio.components.tcompv0.jdbc.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.talend.studio.components.tcompv0.netsuite.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.talend.studio.components.tcompv0.googledrive.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.talend.studio.components.tcompv0.marketo.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.talend.studio.components.tcompv0.azurestorage.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.talend.studio.components.tcompv0.snowflake.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.talend.studio.components.tcompv0.jira.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.talend.studio.components.tcompv0.splunk.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.talend.studio.components.tcompv0.salesforce.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import feature="org.talend.esb.tooling.ws.consumer.feature" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="biz.aQute.bnd.annotation" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="javax.wsdl" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="joda-time" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.help.ui" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="jaxb-api" version="0.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.talend.components.api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.components.api.service.osgi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.components.azurestorage"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.components.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.components.common-oauth"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.components.googledrive"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.components.jdbc.definition"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.components.jira"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.components.marketo"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.components.netsuite"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.components.salesforce.definition"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.components.snowflake.definition"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.components.splunk"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.abstractmap"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.alfrescooutput"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.components.exchange"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.designer.components.localprovider"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.talend.designer.core.generic"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.dbmap"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.filemultischemas"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.fileoutputxml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.gefabstractmap"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.mapper"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.rowgenerator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.scd"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.unifiedcomponent"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.webservice"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.designer.xmlmap"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.expressionbuilder"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.repository.generic"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.talend.sdk.component.studio-integration"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
+<feature id="org.talend.tos.components.feature" label="Components-feature" version="8.0.1.M12">
+  <description url="http://www.example.com/description">[Enter Feature Description here.]</description>
+  <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
+  <license url="http://www.example.com/license">[Enter License Description here.]</license>
+  <requires>
+    <import feature="org.talend.studio.components.tcompv0.jdbc.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.studio.components.tcompv0.couchbase.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.studio.components.tcompv0.netsuite.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.studio.components.tcompv0.marklogic.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.studio.components.tcompv0.googledrive.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.studio.components.tcompv0.marketo.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.studio.components.tcompv0.azurestorage.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.studio.components.tcompv0.snowflake.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.studio.components.tcompv0.jira.feature" version="0.0.0" match="greaterOrEqual"/>
+  	<import feature="org.talend.studio.components.tcompv0.splunk.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.studio.components.tcompv0.salesforce.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import feature="org.talend.esb.tooling.ws.consumer.feature" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="biz.aQute.bnd.annotation" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="javax.wsdl" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="joda-time" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.eclipse.help.ui" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="jaxb-api" version="0.0.0" match="greaterOrEqual"/>
+  </requires>
+  <plugin id="org.talend.components.api" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.components.api.service.osgi" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.components.azurestorage" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.components.common" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.components.common-oauth" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.components.googledrive" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.components.jdbc.definition" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.components.jira" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.components.marketo" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.components.netsuite" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.components.salesforce.definition" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.components.snowflake.definition" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.components.splunk" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.abstractmap" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.alfrescooutput" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.components.exchange" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.designer.components.localprovider" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.designer.core.generic" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.dbmap" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.filemultischemas" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.fileoutputxml" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.gefabstractmap" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.mapper" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.rowgenerator" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.scd" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.unifiedcomponent" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.webservice" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.designer.xmlmap" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.expressionbuilder" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.repository.generic" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+  <plugin id="org.talend.sdk.component.studio-integration" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 </feature>

main/features/org.talend.tos.components.feature/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.components.feature</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.tos.core.feature" label="Feature" version="8.8.8.qualifier"> 
+<feature id="org.talend.tos.core.feature" label="Feature" version="8.0.1.M12"> 
   <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.core.feature</artifactId>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.tos.feature" label="Tos feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
+<feature id="org.talend.tos.feature" label="Tos feature" version="8.0.1.M12" provider-name=".Talend SA.">
   <description url="http://www.example.com/description">[Enter Feature Description here.]</description>
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
   <license>[Enter License Description here.]</license>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.feature</artifactId>

main/features/org.talend.tos.libraries.feature/feature.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<feature id="org.talend.tos.libraries.feature" label="Libraries_feature" version="8.8.8.qualifier"> 
+<feature id="org.talend.tos.libraries.feature" label="Libraries_feature" version="8.0.1.M12"> 
   <description url="http://www.example.com/description">[Enter Feature Description here.]</description>  
   <copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>  
   <license url="http://www.example.com/license">[Enter License Description here.]</license>  
@@ -43,6 +43,7 @@
   <plugin id="org.talend.libraries.palo" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.persist.lookup" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
   <plugin id="org.talend.libraries.salesforce" download-size="0" install-size="0" version="0.0.0"/>
+  <plugin id="org.talend.libraries.servlet" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.slf4j" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.xml" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.zmq" download-size="0" install-size="0" version="0.0.0"/>

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

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.libraries.feature</artifactId>

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Abstract Map Plug-in
 Bundle-SymbolicName: org.talend.designer.abstractmap;singleton:=true
-Bundle-Version: 8.8.8.qualifier
+Bundle-Version: 8.0.1.M12
 Bundle-Activator: org.talend.designer.abstractmap.MapPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.talend.core,

main/plugins/org.talend.designer.abstractmap/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap</artifactId>

main/plugins/org.talend.designer.abstractmap/src/java/main/messages_en.properties

@@ -0,0 +1,20 @@
+prefs.configuration.LINK_STYLE.AUTO=Auto
+prefs.configuration.title=Map components preferences :
+prefs.configuration.LINK_STYLE.LINE=Lines (fast)
+prefs.configuration.LINK_STYLE.BEZIER_CURVE=Curves
+prefs.configuration.LINK_STYLE=Default mapping links display as :
+DraggingInfosPopup.draggingEntry=Dragging {0} entry.
+DraggingInfosPopup.dropInvalid=\n<< Drop invalid >>\n
+DraggingInfosPopup.draggingEntries=Dragging {0} entries.
+DraggingInfosPopup.dropInvalidWithKey=\n<< Drop invalid >>\nPress both Shift and Ctrl keys to map one to one and overwrite
+DraggingInfosPopup.overwriteMode=\ > Overwrite mode
+DraggingInfosPopup.appendMode=\ > Append mode
+DraggingInfosPopup.appendModeToOverwrite=\ > Append mode (Ctrl key to overwrite)
+DraggingInfosPopup.insertAllSelectedEntries=\ > Insert all selected entries
+DraggingInfosPopup.insertRemainingEntries=\ > Insert remaining entries
+DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> Each source entry expression to each target expression
+DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> Each source entry to each target expression
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> All source entries expression to a single one target expression (Shift key to change mapping)
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpression=> All source entries expression to a single one target expression
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpressionShiftKey=> All source entries to a single one target expression (Shift key to change mapping)
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpression=> All source entries to a single one target expression

main/plugins/org.talend.designer.abstractmap/src/java/main/messages_fr.properties

@@ -1,17 +1,16 @@
-prefs.configuration.title=Pr\u00E9f\u00E9rences des composants de mapping :
-prefs.configuration.LINK_STYLE=Les liens de mapping par d\u00E9faut s'affichent comme :
 prefs.configuration.LINK_STYLE.AUTO=Auto
-prefs.configuration.LINK_STYLE.BEZIER_CURVE=Courbes
+prefs.configuration.title=Pr\u00E9f\u00E9rences des composants de mapping\:
 prefs.configuration.LINK_STYLE.LINE=Lignes (rapide)
-DraggingInfosPopup.draggingEntry=Glissement de {0} entr\u00E9e(s).
-DraggingInfosPopup.dropInvalid=\n<< D\u00E9p\u00F4t impossible >>\n
+prefs.configuration.LINK_STYLE.BEZIER_CURVE=Courbes
+prefs.configuration.LINK_STYLE=Affichage par d\u00E9faut du lien de mapping \:
+DraggingInfosPopup.draggingEntry=Glissement de {0} entr\u00E9e.
+DraggingInfosPopup.dropInvalid=\n<< D\u00E9poser invalide >>\n
 DraggingInfosPopup.draggingEntries=Glissement de {0} entr\u00E9es.
-DraggingInfosPopup.dropInvalidWithKey=\n<< D\u00E9p\u00F4t impossible >>\nAppuyez sur Maj et Ctrl pour mapper en un pour un et \u00E9craser
-DraggingInfosPopup.overwriteMode= > Mode \u00E9crasement
-DraggingInfosPopup.appendMode= > Mode \u00E9criture \u00E0 la suite
-DraggingInfosPopup.appendModeToOverwrite= > Mode \u00E9criture \u00E0 la suite (Ctrl pour \u00E9craser)
-DraggingInfosPopup.insertAllSelectedEntries= > Ins\u00E9rer toutes les entr\u00E9es s\u00E9lectionn\u00E9es
-DraggingInfosPopup.insertRemainingEntries= > Ins\u00E9rer toutes les entr\u00E9es restantes
+DraggingInfosPopup.overwriteMode=\ > Mode \u00E9crasement
+DraggingInfosPopup.appendMode=\ > Mode \u00E9crire apr\u00E8s
+DraggingInfosPopup.appendModeToOverwrite=> Mode \u00E9criture \u00E0 la suite (Ctrl pour \u00E9craser)
+DraggingInfosPopup.insertAllSelectedEntries=\ > Ins\u00E9rer toutes les entr\u00E9es s\u00E9lectionn\u00E9es
+DraggingInfosPopup.insertRemainingEntries=\ > Ins\u00E9rer les entr\u00E9es restantes
 DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> Chaque expression source vers chaque expression cible
 DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> Chaque expression source vers chaque expression cible
 DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> Toutes les expressions source vers une seule expression cible (Maj pour modifier le mapping)

main/plugins/org.talend.designer.abstractmap/src/java/main/messages_ja.properties

@@ -1,20 +1,20 @@
-prefs.configuration.title=\u30DE\u30C3\u30D7\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u57FA\u672C\u8A2D\u5B9A:
-prefs.configuration.LINK_STYLE=\u30C7\u30D5\u30A9\u30EB\u30C8\u30DE\u30C3\u30D4\u30F3\u30B0\u30EA\u30F3\u30AF\u306E\u8868\u793A:
 prefs.configuration.LINK_STYLE.AUTO=\u81EA\u52D5
+prefs.configuration.title=\u30DE\u30C3\u30D7\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u57FA\u672C\u8A2D\u5B9A :
+prefs.configuration.LINK_STYLE.LINE=Lines (fast)
 prefs.configuration.LINK_STYLE.BEZIER_CURVE=\u66F2\u7DDA
-prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA\uFF08\u9AD8\u901F\uFF09
-DraggingInfosPopup.draggingEntry={0}\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
+prefs.configuration.LINK_STYLE=\u30C7\u30D5\u30A9\u30EB\u30C8\u30DE\u30C3\u30D4\u30F3\u30B0\u30EA\u30F3\u30AF\u306E\u8868\u793A :
+DraggingInfosPopup.draggingEntry={0} \u30A8\u30F3\u30C8\u30EA\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
 DraggingInfosPopup.dropInvalid=\n<< \u7121\u52B9\u306A\u30C9\u30ED\u30C3\u30D7 >>\n
-DraggingInfosPopup.draggingEntries={0}\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u30C9\u30E9\u30C3\u30B0\u3057\u3066\u3044\u307E\u3059\u3002
-DraggingInfosPopup.dropInvalidWithKey=\n<< \u7121\u52B9\u306A\u30C9\u30ED\u30C3\u30D7 >>\nShift\u30AD\u30FC\u3068Ctrl\u30AD\u30FC\u3092\u540C\u6642\u306B\u62BC\u3059\u3068\u30011\u5BFE1\u3067\u30DE\u30C3\u30D4\u30F3\u30B0\u3055\u308C\u3066\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059
-DraggingInfosPopup.overwriteMode= > \u4E0A\u66F8\u304D\u30E2\u30FC\u30C9
-DraggingInfosPopup.appendMode= > \u8FFD\u52A0\u30E2\u30FC\u30C9
-DraggingInfosPopup.appendModeToOverwrite= > \u8FFD\u52A0\u30E2\u30FC\u30C9(\u4E0A\u66F8\u304D\u3059\u308B\u306B\u306F[Ctrl]\u30AD\u30FC)
-DraggingInfosPopup.insertAllSelectedEntries= > \u9078\u629E\u3057\u305F\u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u633F\u5165\u3057\u307E\u3059
-DraggingInfosPopup.insertRemainingEntries= > \u6B8B\u308A\u306E\u30A8\u30F3\u30C8\u30EA\u30FC\u3092\u633F\u5165\u3057\u307E\u3059
-DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F
-DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC
-DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
-DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC\u5F0F
-DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
-DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u30FC
+DraggingInfosPopup.draggingEntries={0} \u30A8\u30F3\u30C8\u30EA\u3092\u30C9\u30E9\u30C3\u30B0
+DraggingInfosPopup.dropInvalidWithKey=\n<< \u7121\u52B9\u306A\u30C9\u30ED\u30C3\u30D7 >>\n\u4E00\u5BFE\u4E00\u3067\u30DE\u30C3\u30D4\u30F3\u30B0\u3057\u3001\u4E0A\u66F8\u304D\u3059\u308B\u5834\u5408\u306F\u3001Shift\u30AD\u30FC\u3068Ctrl\u30AD\u30FC\u3092\u540C\u6642\u306B\u62BC\u3057\u307E\u3059
+DraggingInfosPopup.overwriteMode=> \u4E0A\u66F8\u304D\u30E2\u30FC\u30C9
+DraggingInfosPopup.appendMode=> \u8FFD\u52A0\u30E2\u30FC\u30C9
+DraggingInfosPopup.appendModeToOverwrite=> \u8FFD\u52A0\u30E2\u30FC\u30C9(\u4E0A\u66F8\u304D\u3059\u308B\u306B\u306FCtrl\u30AD\u30FC)
+DraggingInfosPopup.insertAllSelectedEntries=> \u9078\u629E\u3057\u305F\u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u633F\u5165\u3057\u307E\u3059
+DraggingInfosPopup.insertRemainingEntries=> \u6B8B\u308A\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u633F\u5165\u3057\u307E\u3059
+DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F
+DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> \u5404\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u5404\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
+DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA\u5F0F
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpressionShiftKey=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA (\u30DE\u30C3\u30D4\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u306B\u306FShift\u30AD\u30FC)
+DraggingInfosPopup.allSourceEntriesToASingleOneTargetExpression=> 1\u3064\u306E\u30BF\u30FC\u30B2\u30C3\u30C8\u5F0F\u306B\u5BFE\u3059\u308B\u3059\u3079\u3066\u306E\u30BD\u30FC\u30B9\u30A8\u30F3\u30C8\u30EA

main/plugins/org.talend.designer.abstractmap/src/java/main/messages_zh_CN.properties

@@ -1,17 +1,17 @@
-prefs.configuration.title=\u6620\u5C04\u7EC4\u4EF6\u9996\u9009\u9879:
-prefs.configuration.LINK_STYLE=\u9ED8\u8BA4\u6620\u5C04\u8FDE\u63A5\u663E\u793A\u4E3A:
 prefs.configuration.LINK_STYLE.AUTO=\u81EA\u52A8
-prefs.configuration.LINK_STYLE.BEZIER_CURVE=\u66F2\u7EBF
+prefs.configuration.title=\u6620\u5C04\u7EC4\u4EF6\u9996\u9009\u9879:
 prefs.configuration.LINK_STYLE.LINE=\u76F4\u7EBF (\u5FEB)
+prefs.configuration.LINK_STYLE.BEZIER_CURVE=\u66F2\u7EBF
+prefs.configuration.LINK_STYLE=\u9ED8\u8BA4\u6620\u5C04\u8FDE\u63A5\u663E\u793A\u4E3A:
 DraggingInfosPopup.draggingEntry=\u62D6\u52A8 {0} \u6761\u76EE
-DraggingInfosPopup.dropInvalid=\n<< \u65E0\u6548\u91CA\u653E >>\n
+DraggingInfosPopup.dropInvalid=\\n<< \u65E0\u6548\u653E\u7F6E >>\\n
 DraggingInfosPopup.draggingEntries=\u62D6\u52A8 {0} \u4E2A\u6761\u76EE\u3002
-DraggingInfosPopup.dropInvalidWithKey=\n<< \u65E0\u6548\u653E\u7F6E >>\n\u6309\u4F4F Shift \u548C Ctrl \u952E\u4EE5\u8FDB\u884C\u4E00\u5BF9\u4E00\u6620\u5C04\u5E76\u6539\u5199
-DraggingInfosPopup.overwriteMode= > \u91CD\u5199\u6A21\u5F0F
-DraggingInfosPopup.appendMode= >\u9644\u52A0\u6A21\u5F0F
-DraggingInfosPopup.appendModeToOverwrite= > \u8FFD\u52A0\u6A21\u5F0F (Ctrl \u952E\u6765\u6539\u5199)
-DraggingInfosPopup.insertAllSelectedEntries= > \u63D2\u5165\u6240\u6709\u9009\u62E9\u9879
-DraggingInfosPopup.insertRemainingEntries= > \u63D2\u5165\u5269\u4F59\u9879
+DraggingInfosPopup.dropInvalidWithKey=\\n<<\u65E0\u6548\u653E\u7F6E>>\\n\u6309\u4F4F Shift \u548C Ctrl \u952E\u4EE5\u8FDB\u884C\u4E00\u5BF9\u4E00\u6620\u5C04\u5E76\u6539\u5199
+DraggingInfosPopup.overwriteMode=\\ > \u6539\u5199\u6A21\u5F0F
+DraggingInfosPopup.appendMode=\\ > \u8FFD\u52A0\u6A21\u5F0F
+DraggingInfosPopup.appendModeToOverwrite=\\ > \u8FFD\u52A0\u6A21\u5F0F (Ctrl \u952E\u6765\u6539\u5199)
+DraggingInfosPopup.insertAllSelectedEntries=\\ > \u63D2\u5165\u6240\u6709\u9009\u5B9A\u6761\u76EE
+DraggingInfosPopup.insertRemainingEntries=\\ > \u63D2\u5165\u5269\u4F59\u6761\u76EE
 DraggingInfosPopup.eachSourceEntryExpressionToEachTargetExpression=> \u6BCF\u4E2A\u6E90\u6761\u76EE\u8868\u8FBE\u5F0F\u5230\u6BCF\u4E2A\u76EE\u6807\u8868\u8FBE\u5F0F
 DraggingInfosPopup.eachSourceEntryToEachTargetExpression=> \u6BCF\u4E2A\u6E90\u6761\u76EE\u5230\u6BCF\u4E2A\u76EE\u6807\u8868\u8FBE\u5F0F
 DraggingInfosPopup.allSourceEntriesExpressionToASingleOneTargetExpressionShiftKey=\u6240\u6709\u6E90\u9879\u90FD\u8868\u793A\u4E3A\u5355\u4E2A\u76EE\u6807\u8868\u8FBE\u5F0F(Shift\u952E\u8F6C\u6362\u4E3A\u66F4\u6539\u6620\u5C04)

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Alfresco Output Component Plug-in
 Bundle-SymbolicName: org.talend.designer.alfrescooutput;singleton:=true
-Bundle-Version: 8.8.8.qualifier
+Bundle-Version: 8.0.1.M12
 Bundle-Vendor: .Talend SA.
 Require-Bundle: org.eclipse.core.runtime,
  org.talend.core,

main/plugins/org.talend.designer.alfrescooutput/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.alfrescooutput</artifactId>

main/plugins/org.talend.designer.alfrescooutput/src/main/java/messages_en.properties

@@ -0,0 +1,20 @@
+AlfrescoModelDialog.missingAspectDefinitions.msg=The chosen aspects refer to unknown Alfresco aspect(s) : ${0}.\nPlease provide the alfresco model files that define them.
+AlfrescoModelDialog.modelTable.title=Title
+AlfrescoModelDialog.availableAspects=Available Aspects
+AlfrescoModelDialog.missingAspectDefinitions.title=Missing aspect definitions
+AlfrescoOutputManager.schemaError.title=Error in schema
+AlfrescoModelDialog.missingTypeDefinitions.msg=The chosen type refers to unknown Alfresco type(s) or aspect(s) : ${0}.\nPlease provide the alfresco model files that define them.
+AlfrescoModelDialog.missingTypeDefinitions.title=Missing type definitions
+AlfrescoModelDialog.add=Add...
+AlfrescoOutputModelManager.errorReadingModel=Error reading Alfresco model file
+AlfrescoModelDialog.aspects=Aspects
+AlfrescoOutputManager.schemaError.msg=Please synchronize schema first
+AlfrescoOutputModelManager.alreadyAdded=This model has already been added
+AlfrescoModelDialog.removeModelFailed=Failed to remove model
+AlfrescoOutputModelManager.prefixConflict=Unable to add the model, prefix conflict with previously added model for
+AlfrescoOutputModelManager.notYetAdded=This model has not yet been added
+AlfrescoModelDialog.type=Type
+AlfrescoModelDialog.addModelFailed=Failed to add model
+AlfrescoModelDialog.modelTable.name=Name
+AlfrescoModelDialog.remove=Remove
+AlfrescoOutputManager.failedLoadModel=Failed to load model from component metadata, reinitializing

main/plugins/org.talend.designer.alfrescooutput/src/main/java/messages_fr.properties

@@ -1,20 +1,20 @@
-AlfrescoOutputManager.failedLoadModel=\u00C9chec du chargement du mod\u00E8le depuis les m\u00E9tadonn\u00E9es du composant, r\u00E9initialisation.
-AlfrescoOutputManager.schemaError.title=Erreur dans le sch\u00E9ma
-AlfrescoOutputManager.schemaError.msg=Veuillez synchroniser le sch\u00E9ma d'abord
-AlfrescoOutputModelManager.alreadyAdded=Ce mod\u00E8le a d\u00E9j\u00E0 \u00E9t\u00E9 ajout\u00E9
-AlfrescoOutputModelManager.errorReadingModel=Erreur de lecture du fichier mod\u00E8le Alfresco
-AlfrescoOutputModelManager.notYetAdded=Ce mod\u00E8le n'a pas encore \u00E9t\u00E9 ajout\u00E9
-AlfrescoOutputModelManager.prefixConflict=Impossible d'ajouter le mod\u00E8le, pr\u00E9fixe en conflit avec le mod\u00E8le ajout\u00E9 pr\u00E9c\u00E9demment pour
-AlfrescoModelDialog.type=Type
-AlfrescoModelDialog.aspects=Aspects
-AlfrescoModelDialog.availableAspects=Aspects disponibles
-AlfrescoModelDialog.add=Ajouter...
-AlfrescoModelDialog.addModelFailed=\u00C9chec de l'ajout du mod\u00E8le
-AlfrescoModelDialog.remove=Supprimer
-AlfrescoModelDialog.removeModelFailed=\u00C9chec de la suppression du mod\u00E8le
-AlfrescoModelDialog.missingTypeDefinitions.title=D\u00E9finitions de type manquantes
-AlfrescoModelDialog.missingTypeDefinitions.msg=Le type s\u00E9lectionn\u00E9 se r\u00E9f\u00E8re \u00E0 des aspects ou types Alfresco inconnus : ${0}.\nVeuillez fournir les mod\u00E8les Alfresco qui les d\u00E9finissent.
-AlfrescoModelDialog.missingAspectDefinitions.title=D\u00E9finitions d'aspects manquantes
 AlfrescoModelDialog.missingAspectDefinitions.msg=Les aspects s\u00E9lectionn\u00E9s se r\u00E9f\u00E8rent \u00E0 des aspects Alfresco inconnus : ${0}.\nVeuillez fournir les mod\u00E8les Alfresco qui les d\u00E9finissent.
 AlfrescoModelDialog.modelTable.title=Titre
+AlfrescoModelDialog.availableAspects=Aspects disponibles
+AlfrescoModelDialog.missingAspectDefinitions.title=D\u00E9finitions d'aspects manquantes
+AlfrescoOutputManager.schemaError.title=Erreur dans le sch\u00E9ma
+AlfrescoModelDialog.missingTypeDefinitions.msg=Le type s\u00E9lectionn\u00E9 se r\u00E9f\u00E8re \u00E0 des aspects ou types Alfresco inconnus : ${0}. Veuillez fournir les mod\u00E8les Alfresco qui les d\u00E9finissent.
+AlfrescoModelDialog.missingTypeDefinitions.title=D\u00E9finitions de type manquantes
+AlfrescoModelDialog.add=Ajouter...
+AlfrescoOutputModelManager.errorReadingModel=Erreur de lecture du fichier mod\u00E8le Alfresco
+AlfrescoModelDialog.aspects=Aspects
+AlfrescoOutputManager.schemaError.msg=Veuillez synchroniser le sch\u00E9ma d'abord
+AlfrescoOutputModelManager.alreadyAdded=Ce mod\u00E8le a d\u00E9j\u00E0 \u00E9t\u00E9 ajout\u00E9
+AlfrescoModelDialog.removeModelFailed=Echec de la suppression du mod\u00E8le
+AlfrescoOutputModelManager.prefixConflict=Impossible d'ajouter le mod\u00E8le, pr\u00E9fixe en conflit avec le mod\u00E8le ajout\u00E9 pr\u00E9c\u00E9demment pour
+AlfrescoOutputModelManager.notYetAdded=Ce mod\u00E8le n'a pas encore \u00E9t\u00E9 ajout\u00E9
+AlfrescoModelDialog.type=Type
+AlfrescoModelDialog.addModelFailed=Echec de l'ajout du mod\u00E8le
 AlfrescoModelDialog.modelTable.name=Nom
+AlfrescoModelDialog.remove=Supprimer
+AlfrescoOutputManager.failedLoadModel=\u00C9chec du chargement du mod\u00E8le depuis les m\u00E9tadonn\u00E9es du composant, r\u00E9initialisation.

main/plugins/org.talend.designer.alfrescooutput/src/main/java/messages_ja.properties

@@ -1,20 +1,20 @@
-AlfrescoOutputManager.failedLoadModel=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30E1\u30BF\u30C7\u30FC\u30BF\u304B\u3089\u30E2\u30C7\u30EB\u30ED\u30FC\u30C9\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u518D\u521D\u671F\u5316\u4E2D,
+AlfrescoModelDialog.missingAspectDefinitions.msg=\u9078\u629E\u3055\u308C\u305F\u30A2\u30B9\u30DA\u30AF\u30C8\u306F\u4E0D\u660E\u306EAlfresco\u30A2\u30B9\u30DA\u30AF\u30C8:${0}\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059\u3002\u305D\u308C\u3089\u3092\u5B9A\u7FA9\u3057\u305FAlfresco\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u3092\u63D0\u4F9B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+AlfrescoModelDialog.modelTable.title=\u30BF\u30A4\u30C8\u30EB
+AlfrescoModelDialog.availableAspects=\u53EF\u80FD\u306A\u30A2\u30B9\u30DA\u30AF\u30C8
+AlfrescoModelDialog.missingAspectDefinitions.title=\u30A2\u30B9\u30DA\u30AF\u30C8\u5B9A\u7FA9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 AlfrescoOutputManager.schemaError.title=\u30B9\u30AD\u30FC\u30DE\u306E\u30A8\u30E9\u30FC
+AlfrescoModelDialog.missingTypeDefinitions.msg=\u9078\u629E\u3057\u305F\u65B9\u306F\u4E0D\u660E\u306EAlfresco\u578B\u3082\u3057\u304F\u306F\u30A2\u30B9\u30DA\u30AF\u30C8${0}\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059\u3002\u305D\u308C\u3089\u3092\u5B9A\u7FA9\u3057\u305FAlfresco\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u3092\u63D0\u4F9B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+AlfrescoModelDialog.missingTypeDefinitions.title=\u578B\u5B9A\u7FA9\u304C\u3042\u308A\u307E\u305B\u3093
+AlfrescoModelDialog.add=\u8FFD\u52A0...
+AlfrescoOutputModelManager.errorReadingModel=Alfresco\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u8FBC\u307F\u30A8\u30E9\u30FC
+AlfrescoModelDialog.aspects=\u30A2\u30B9\u30DA\u30AF\u30C8
 AlfrescoOutputManager.schemaError.msg=\u6700\u521D\u306B\u30B9\u30AD\u30FC\u30DE\u3092\u540C\u671F\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 AlfrescoOutputModelManager.alreadyAdded=\u3053\u306E\u30E2\u30C7\u30EB\u306F\u65E2\u306B\u8FFD\u52A0\u6E08\u307F\u3067\u3059\u3002
-AlfrescoOutputModelManager.errorReadingModel=Alfresco\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u8FBC\u307F\u30A8\u30E9\u30FC
-AlfrescoOutputModelManager.notYetAdded=\u3053\u306E\u30E2\u30C7\u30EB\u306F\u307E\u3060\u8FFD\u52A0\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-AlfrescoOutputModelManager.prefixConflict=\u5148\u306B\u8FFD\u52A0\u3055\u308C\u305F\u30E2\u30C7\u30EB\u306E\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u306E\u885D\u7A81\u306E\u305F\u3081\u3001\u30E2\u30C7\u30EB\u306E\u8FFD\u52A0\u304C\u3067\u304D\u307E\u305B\u3093\u3002
-AlfrescoModelDialog.type=\u30BF\u30A4\u30D7
-AlfrescoModelDialog.aspects=\u30A2\u30B9\u30DA\u30AF\u30C8
-AlfrescoModelDialog.availableAspects=\u53EF\u80FD\u306A\u30A2\u30B9\u30DA\u30AF\u30C8
-AlfrescoModelDialog.add=\u8FFD\u52A0...
-AlfrescoModelDialog.addModelFailed=\u30E2\u30C7\u30EB\u8FFD\u52A0\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
-AlfrescoModelDialog.remove=\u524A\u9664
 AlfrescoModelDialog.removeModelFailed=\u30E2\u30C7\u30EB\u306E\u524A\u9664\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-AlfrescoModelDialog.missingTypeDefinitions.title=\u578B\u5B9A\u7FA9\u304C\u3042\u308A\u307E\u305B\u3093
-AlfrescoModelDialog.missingTypeDefinitions.msg=\u9078\u629E\u3055\u308C\u305F\u30BF\u30A4\u30D7\u306F\u3001Alfresco\u306E\u4E0D\u660E\u306A\u30BF\u30A4\u30D7\u307E\u305F\u306F\u30A2\u30B9\u30DA\u30AF\u30C8: ${0}\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059\u3002\n\u305D\u308C\u3089\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308Balfresco\u306E\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-AlfrescoModelDialog.missingAspectDefinitions.title=\u30A2\u30B9\u30DA\u30AF\u30C8\u5B9A\u7FA9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-AlfrescoModelDialog.missingAspectDefinitions.msg=\u9078\u629E\u3055\u308C\u305F\u30A2\u30B9\u30DA\u30AF\u30C8\u306F\u3001Alfresco\u306E\u4E0D\u660E\u306A\u30A2\u30B9\u30DA\u30AF\u30C8: ${0}\u3092\u53C2\u7167\u3057\u3066\u3044\u307E\u3059\u3002\n\u305D\u308C\u3089\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u308Balfresco\u306E\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-AlfrescoModelDialog.modelTable.title=\u30BF\u30A4\u30C8\u30EB
+AlfrescoOutputModelManager.prefixConflict=\u5148\u306B\u8FFD\u52A0\u3055\u308C\u305F\u30E2\u30C7\u30EB\u306E\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u306E\u885D\u7A81\u306E\u305F\u3081\u3001\u30E2\u30C7\u30EB\u306E\u8FFD\u52A0\u304C\u51FA\u6765\u307E\u305B\u3093\u3002
+AlfrescoOutputModelManager.notYetAdded=\u3053\u306E\u30E2\u30C7\u30EB\u306F\u307E\u3060\u8FFD\u52A0\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+AlfrescoModelDialog.type=\u30BF\u30A4\u30D7
+AlfrescoModelDialog.addModelFailed=\u30E2\u30C7\u30EB\u8FFD\u52A0\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
 AlfrescoModelDialog.modelTable.name=\u540D\u524D
+AlfrescoModelDialog.remove=\u524A\u9664
+AlfrescoOutputManager.failedLoadModel=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30E1\u30BF\u30C7\u30FC\u30BF\u304B\u3089\u30E2\u30C7\u30EB\u30ED\u30FC\u30C9\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u518D\u521D\u671F\u5316\u4E2D

main/plugins/org.talend.designer.alfrescooutput/src/main/java/messages_zh_CN.properties

@@ -1,20 +1,20 @@
-AlfrescoOutputManager.failedLoadModel=\u65E0\u6CD5\u52A0\u8F7D\u7684\u7EC4\u4EF6\u5143\u6570\u636E\u6A21\u578B, \u91CD\u65B0\u521D\u59CB\u5316
+AlfrescoModelDialog.missingAspectDefinitions.msg=\u6240\u9009\u62E9\u7684\u65B9\u9762\u6D89\u53CA\u672A\u77E5\u7684Alfresco\u65B9\u9762: ${0}.\u8BF7\u63D0\u4F9Balfresco \u6A21\u578B\u6587\u4EF6\u5B9A\u4E49\u4ED6\u4EEC.
+AlfrescoModelDialog.modelTable.title=\u6807\u9898
+AlfrescoModelDialog.availableAspects=\u53EF\u7528\u56E0\u7D20
+AlfrescoModelDialog.missingAspectDefinitions.title=\u7F3A\u7701\u65B9\u9762\u5B9A\u4E49
 AlfrescoOutputManager.schemaError.title=Schema \u9519\u8BEF
+AlfrescoModelDialog.missingTypeDefinitions.msg=\u6240\u9009\u62E9\u7684\u7C7B\u578B\u6D89\u53CA\u672A\u77E5\u7684Alfresco\u7C7B\u578B\u6216\u65B9\u9762: ${0}.\uFF0C\u8BF7\u63D0\u4F9Balfresco \u6A21\u578B\u6587\u4EF6\u5B9A\u4E49\u4ED6\u4EEC.
+AlfrescoModelDialog.missingTypeDefinitions.title=\u7F3A\u7701\u7C7B\u578B\u5B9A\u4E49
+AlfrescoModelDialog.add=\u6DFB\u52A0...
+AlfrescoOutputModelManager.errorReadingModel=\u8BFB\u53D6Alfresco\u7684\u6A21\u578B\u6587\u4EF6\u9519\u8BEF
+AlfrescoModelDialog.aspects=\u65B9\u9762
 AlfrescoOutputManager.schemaError.msg=\u8BF7\u5148\u540C\u6B65 schema
 AlfrescoOutputModelManager.alreadyAdded=\u8BE5\u6A21\u578B\u5DF2\u6DFB\u52A0
-AlfrescoOutputModelManager.errorReadingModel=\u8BFB\u53D6Alfresco\u7684\u6A21\u578B\u6587\u4EF6\u9519\u8BEF
-AlfrescoOutputModelManager.notYetAdded=\u8BE5\u6A21\u578B\u5C1A\u672A\u6DFB\u52A0
-AlfrescoOutputModelManager.prefixConflict=\u65E0\u6CD5\u6DFB\u52A0\u6A21\u578B\uFF0C\u524D\u7F00\u4E0E\u4EE5\u524D\u6DFB\u52A0\u6A21\u578B\u51B2\u7A81
-AlfrescoModelDialog.type=\u7C7B\u578B
-AlfrescoModelDialog.aspects=\u65B9\u9762
-AlfrescoModelDialog.availableAspects=\u53EF\u7528\u56E0\u7D20
-AlfrescoModelDialog.add=\u6DFB\u52A0...
-AlfrescoModelDialog.addModelFailed=\u6DFB\u52A0\u6A21\u578B\u5931\u8D25
-AlfrescoModelDialog.remove=\u79FB\u9664
 AlfrescoModelDialog.removeModelFailed=\u79FB\u9664\u6A21\u578B\u5931\u8D25
-AlfrescoModelDialog.missingTypeDefinitions.title=\u7F3A\u7701\u7C7B\u578B\u5B9A\u4E49
-AlfrescoModelDialog.missingTypeDefinitions.msg=\u6240\u9009\u62E9\u7684\u7C7B\u578B\u6D89\u53CA\u672A\u77E5\u7684 Alfresco \u7C7B\u578B\u6216\u65B9\u9762: ${0}\u3002\n\u8BF7\u63D0\u4F9B\u5B9A\u4E49\u8FD9\u4E9B aspect \u7684 Alfresco \u6A21\u578B\u6587\u4EF6\u3002
-AlfrescoModelDialog.missingAspectDefinitions.title=\u7F3A\u7701\u65B9\u9762\u5B9A\u4E49
-AlfrescoModelDialog.missingAspectDefinitions.msg=\u6240\u9009\u62E9\u7684\u65B9\u9762\u6D89\u53CA\u672A\u77E5\u7684Alfresco\u65B9\u9762: ${0}.\n\u8BF7\u63D0\u4F9B\u5B9A\u4E49\u8FD9\u4E9B aspect \u7684 Alfresco \u6A21\u578B\u6587\u4EF6\u3002
-AlfrescoModelDialog.modelTable.title=\u6807\u9898
+AlfrescoOutputModelManager.prefixConflict=\u65E0\u6CD5\u6DFB\u52A0\u6A21\u578B\uFF0C\u524D\u7F00\u4E0E\u4EE5\u524D\u6DFB\u52A0\u6A21\u578B\u51B2\u7A81
+AlfrescoOutputModelManager.notYetAdded=\u8BE5\u6A21\u578B\u5C1A\u672A\u6DFB\u52A0
+AlfrescoModelDialog.type=\u7C7B\u578B
+AlfrescoModelDialog.addModelFailed=\u6DFB\u52A0\u6A21\u578B\u5931\u8D25
 AlfrescoModelDialog.modelTable.name=\u540D\u79F0
+AlfrescoModelDialog.remove=\u79FB\u9664
+AlfrescoOutputManager.failedLoadModel=\u65E0\u6CD5\u52A0\u8F7D\u7684\u7EC4\u4EF6\u5143\u6570\u636E\u6A21\u578B, \u91CD\u65B0\u521D\u59CB\u5316

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CodeGen Plug-in
 Bundle-SymbolicName: org.talend.designer.codegen;singleton:=true
-Bundle-Version: 8.8.8.qualifier
+Bundle-Version: 8.0.1.M12
 Bundle-Localization: plugin
 Require-Bundle: org.talend.core.repository,
  org.eclipse.emf.codegen,

main/plugins/org.talend.designer.codegen/jet_stub/component_part_footer.javajet

@@ -90,9 +90,11 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
 		  		INode source = con.getSource();
 				String sourceNodeId = source.getUniqueName();
 				
-				String sourceNodeLabel = NodeUtil.getLabel(source);
-					
-				String targetNodeLabel = NodeUtil.getLabel(node);
+				String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+				String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
+				
+				String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+				String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
 				
 				String sourceNodeComponent = source.getComponent().getName();
 	 			for (INode jobStructureCatcher : jobCatcherNodes) {
@@ -122,9 +124,11 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
 			  		INode source = con.getSource();
 					String sourceNodeId = source.getUniqueName();
 					
-					String sourceNodeLabel = NodeUtil.getLabel(source);
+					String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+					String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
 					
-					String targetNodeLabel = NodeUtil.getLabel(node);
+					String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+					String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
 					
 					String sourceNodeComponent = source.getComponent().getName();
 		 			for (INode jobStructureCatcher : jobCatcherNodes) {

main/plugins/org.talend.designer.codegen/jet_stub/component_part_header.javajet

@@ -137,7 +137,7 @@
 	}
 	%>
 	currentComponent="<%=node.getUniqueName() %>";
-	
+
 	<%
 	connSet =  new HashSet<IConnection>();
 	connSet.addAll(node.getIncomingConnections(EConnectionType.FLOW_MAIN));
@@ -155,17 +155,6 @@
 	//about performance monitor, no way to support more than one job catcher component, also that is not necessary
 	final String subprocessName4Catcher = logstashCurrent ? jobCatcherNodes.get(0).getDesignSubjobStartNode().getUniqueName() : null;
 	
-	if(logstashCurrent) {
-		String currentLabel = ElementParameterParser.getValue(node, "__LABEL__");
-		if(currentLabel==null || "".equals(currentLabel) || "__UNIQUE_NAME__".equals(currentLabel) || cid.endsWith(NodeUtil.getLabel(node))) {
-			//not generate the unnecessary statement if label is default one
-		} else {
-		%>
-			cLabel="<%=NodeUtil.getLabel(node)%>";
-		<%
-		}
-	}
-	
 	if ((codePart.equals(ECodePart.BEGIN))&&(stat || logstashCurrent)&&connSet.size()>0) {
 		if(containsTPartitioner) {
 			%>
@@ -207,9 +196,11 @@
 					INode source = con.getSource();
 					String sourceNodeId = source.getUniqueName();
 					
-					String sourceNodeLabel = NodeUtil.getLabel(source);
+					String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+					String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
 					
-					String targetNodeLabel = NodeUtil.getLabel(node);
+					String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+					String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
 					
 					String sourceNodeComponent = source.getComponent().getName();
 				%>
@@ -241,9 +232,11 @@
 							INode source = con.getSource();
 							String sourceNodeId = source.getUniqueName();
 							
-							String sourceNodeLabel = NodeUtil.getLabel(source);
-					
-							String targetNodeLabel = NodeUtil.getLabel(node);
+							String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+							String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
+							
+							String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+							String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
 							
 							String sourceNodeComponent = source.getComponent().getName();
 						%>
@@ -266,9 +259,11 @@
 							INode source = con.getSource();
 							String sourceNodeId = source.getUniqueName();
 							
-							String sourceNodeLabel = NodeUtil.getLabel(source);
-					
-							String targetNodeLabel = NodeUtil.getLabel(node);
+							String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+							String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
+							
+							String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+							String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
 							
 							String sourceNodeComponent = source.getComponent().getName();
 							
@@ -300,9 +295,11 @@
 									INode source = con.getSource();
 									String sourceNodeId = source.getUniqueName();
 									
-									String sourceNodeLabel = NodeUtil.getLabel(source);
+									String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+									String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel.trim());
 									
-									String targetNodeLabel = NodeUtil.getLabel(node);
+									String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+									String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel.trim());
 							
 									String sourceNodeComponent = source.getComponent().getName();
 							
@@ -437,7 +434,8 @@
 		
 		if(logstashCurrent) {
 			for (INode jobStructureCatcher : jobCatcherNodes) {
-				String nodeLabel = NodeUtil.getLabel(node);
+				String label = ElementParameterParser.getValue(node, "__LABEL__");
+				String nodeLabel = ((label==null || "__UNIQUE_NAME__".equals(label) || label.contains("\"")) ? node.getUniqueName() : label.trim());
 			%>
 			if(enableLogStash) {
 				<%=jobStructureCatcher.getUniqueName() %>.addCM("<%=node.getUniqueName()%>", "<%=nodeLabel%>", "<%=node.getComponent().getName()%>");

main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet

@@ -223,7 +223,7 @@
         public boolean useDatastax(INode node){
             String dbVersion = ElementParameterParser.getValue(node, "__DB_VERSION__");
             String apiType = ElementParameterParser.getValue(node, "__API_TYPE__");
-            return "CASSANDRA_2_2".equals(dbVersion) || "CASSANDRA_3_0".equals(dbVersion) || "CASSANDRA_4_0".equals(dbVersion) || ("CASSANDRA_2_0_0".equals(dbVersion) && "DATASTAX".equals(apiType));
+            return "CASSANDRA_2_2".equals(dbVersion) || "CASSANDRA_3_0".equals(dbVersion) || ("CASSANDRA_2_0_0".equals(dbVersion) && "DATASTAX".equals(apiType));
         }
     }
 %>
@@ -514,35 +514,17 @@
 				}
 				org.apache.logging.log4j.core.config.Configurator.setLevel(org.apache.logging.log4j.LogManager.getRootLogger().getName(), log.getLevel());
 				<%}%>
-			}
-			log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Start.");
-		<%}%>
-		
-		<%
-		INode jobCatcherNode = null;
-		
-		int threadPoolSize = 0;
-		boolean tRESTRequestLoopExists = false;
+    	    }
+        	log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Start.");
+    	<%}%>
+    	
+    	<%
+    	INode jobCatcherNode = null;
 		for (INode nodeInProcess : process.getGeneratingNodes()) {
 			String componentName = nodeInProcess.getComponent().getName();
-
-			if(jobCatcherNode==null && "tJobStructureCatcher".equals(componentName)) {
+			if("tJobStructureCatcher".equals(componentName)) {
 				jobCatcherNode = nodeInProcess;
-				continue;
-			}
-
-			if(!nodeInProcess.isActivate()) continue;
-
-			if("tRESTRequestLoop".equals(componentName)) {
-				tRESTRequestLoopExists = true;
-				continue;
-			}
-			
-			if("tWriteXMLFieldOut".equals(componentName)) {
-				IConnection nextMergeConn = NodeUtil.getNextMergeConnection(nodeInProcess);
-				if(nextMergeConn == null || nextMergeConn.getInputId()==1){
-					threadPoolSize++;
-				}
+				break;
 			}
 		}
 		
@@ -669,15 +651,15 @@
 %>
         boolean inOSGi = routines.system.BundleUtils.inOSGi();
 
-        try {
-            java.util.Dictionary<String, Object> jobProperties = null;
-            if (inOSGi) {
-                jobProperties = routines.system.BundleUtils.getJobProperties(jobName);
-    
-                if (jobProperties != null && jobProperties.get("context") != null) {
-                    contextStr = (String)jobProperties.get("context");
-                }
+        if (inOSGi) {
+            java.util.Dictionary<String, Object> jobProperties = routines.system.BundleUtils.getJobProperties(jobName);
+
+            if (jobProperties != null && jobProperties.get("context") != null) {
+                contextStr = (String)jobProperties.get("context");
             }
+        }
+
+        try {
             //call job/subjob with an existing context, like: --context=production. if without this parameter, there will use the default context instead.
             java.io.InputStream inContext = <%=className%>.class.getClassLoader().getResourceAsStream("<%=jobClassPackageFolder%>/contexts/" + contextStr + ".properties");
             if (inContext == null) {
@@ -687,17 +669,8 @@
                 try {
                     //defaultProps is in order to keep the original context value
                     if(context != null && context.isEmpty()) {
-    	                defaultProps.load(inContext);
-    	                if (inOSGi && jobProperties != null) {
-                             java.util.Enumeration<String> keys = jobProperties.keys();
-                             while (keys.hasMoreElements()) {
-                                 String propKey = keys.nextElement();
-                                 if (defaultProps.containsKey(propKey)) {
-                                     defaultProps.put(propKey, (String) jobProperties.get(propKey));
-                                 }
-                             }
-    	                }
-    	                context = new ContextProperties(defaultProps);
+	                defaultProps.load(inContext);
+	                context = new ContextProperties(defaultProps);
                     }
                 } finally {
                     inContext.close();
@@ -762,6 +735,9 @@
                                     } catch (java.lang.RuntimeException e) {
                                         //do nothing
                                     }
+                                } else {
+                                    context.<%=ctxParam.getName()%> = pwd_<%=ctxParam.getName()%>_value;
+                                    context.put("<%=ctxParam.getName()%>",context.<%=ctxParam.getName()%>);
                                 }
                             }
 <%
@@ -1216,26 +1192,6 @@ this.globalResumeTicket = true;//to run tPostJob
 	            e.printStackTrace();
 	        }
         }
-<%
-    }
-
-    //tRESTRequest may appear in microservice, the code may be called before call submit(task) method, so can't shutdown it here
-    if(!tRESTRequestLoopExists && threadPoolSize>0) {
-%>
-        es.shutdown();
-        <%//shutdownNow should never be executed, only for safe%>
-        try {
-            if(!es.awaitTermination(60, java.util.concurrent.TimeUnit.SECONDS)) {
-                es.shutdownNow();
-                if(!es.awaitTermination(60, java.util.concurrent.TimeUnit.SECONDS)) {
-
-                }
-            }
-        } catch (java.lang.InterruptedException ie) {
-            es.shutdownNow();
-        } catch (java.lang.Exception e) {
-
-        }
 <%
     }
 %>
@@ -1407,27 +1363,16 @@ if (execStat) {
             Object obj_cluster;
             Object obj_conn;
 <%  for (INode cassandraDbNode : cassandraComponentsList) {
-		String dbVersionCassandra = ElementParameterParser.getValue(cassandraDbNode, "__DB_VERSION__");
-        if((new API_selector()).useDatastax(cassandraDbNode)) { 
-			if("CASSANDRA_4_0".equals(dbVersionCassandra)) {
-			%>
-				obj_conn = globalMap.remove("connection_<%=cassandraDbNode.getUniqueName()%>");if(obj_conn != null) {
-					((com.datastax.oss.driver.api.core.CqlSession) obj_conn).close();
-				}
-			<%
-			} else {
-			%>
-				obj_cluster = globalMap.remove("cluster_<%=cassandraDbNode.getUniqueName()%>");
-				obj_conn = globalMap.remove("connection_<%=cassandraDbNode.getUniqueName()%>");
-				if(obj_conn != null) {
-					((com.datastax.driver.core.Session) obj_conn).close();
-				}
-				if(obj_cluster != null) {
-					((com.datastax.driver.core.Cluster) obj_cluster).close();
-				}
-			<%
-			}
-		} else { %>
+        if((new API_selector()).useDatastax(cassandraDbNode)) { %>
+            obj_cluster = globalMap.remove("cluster_<%=cassandraDbNode.getUniqueName()%>");
+            obj_conn = globalMap.remove("connection_<%=cassandraDbNode.getUniqueName()%>");
+            if(obj_conn != null) {
+                ((com.datastax.driver.core.Session) obj_conn).close();
+            }
+            if(obj_cluster != null) {
+                ((com.datastax.driver.core.Cluster) obj_cluster).close();
+            }
+<%      } else { %>
             obj_conn = globalMap.remove("cluster_<%=cassandraDbNode.getUniqueName()%>");
             if(obj_conn!=null) {
                 ((me.prettyprint.hector.api.Cluster) obj_conn).getConnectionManager().shutdown();

main/plugins/org.talend.designer.codegen/jet_stub/generic/component_util_indexedrecord_to_rowstruct.javajet

@@ -170,8 +170,16 @@ class IndexedRecordToRowStructGenerator {
             if (columnName.equals(dynamicColName)) {
             %>
                 java.util.Map<String, Object> dynamicValue_<%=cid%> = (java.util.Map<String, Object>) <%=codeVarSchemaEnforcer%>.get(<%=i%>);
+				org.apache.avro.Schema dynSchema_<%=cid%> = ((org.talend.codegen.enforcer.OutgoingDynamicSchemaEnforcer) <%=codeVarSchemaEnforcer%>).getDynamicFieldsSchema();
+                for (org.apache.avro.Schema.Field dynamicField_<%=cid%> : dynSchema_<%=cid%>.getFields()){
+					String name = dynamicField_<%=cid%>.name();
+					if("true".equals(dynamicField_<%=cid%>.getProp("ENABLE_SPECIAL_TABLENAME"))){
+							dynamicValue_<%=cid%>.put(dynamicField_<%=cid%>.getProp("talend.field.dbColumnName"), dynamicValue_<%=cid%>.get(name));
+							dynamicValue_<%=cid%>.remove(name);
+					}
+				}
                 for (java.util.Map.Entry<String, Object> dynamicValueEntry_<%=cid%> : dynamicValue_<%=cid%>.entrySet()) {
-                    <%=codeVarDynamic%>.addColumnValue(dynamicValueEntry_<%=cid%>.getValue());
+                    <%=codeVarDynamic%>.setColumnValue(<%=codeVarDynamic%>.getIndex(dynamicValueEntry_<%=cid%>.getKey()), dynamicValueEntry_<%=cid%>.getValue());
                 }
                 <%=codeVarRowStruct%>.<%=dynamicColName%> = <%=codeVarDynamic%>;
             <%

main/plugins/org.talend.designer.codegen/jet_stub/header.javajet

@@ -343,10 +343,6 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
 	public Integer errorCode = null;
 	private String currentComponent = "";
 	<%
-	// is necessary? avoid some compiler issue as var name not found? TODO consider remove it, also the currentComponent above
-	%>
-	private String cLabel =  null;
-	<%
 	//tParallelize will wrap globalMap with synchronizedMap
 	if(isRunInMultiThread || NodeUtil.containsMultiThreadComponent(process)){
 	%>
@@ -389,101 +385,11 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
 
 <%
 	INode jobCatcherNode = null;
-
-	//one matched component or part, one thread
-	//why not computed by cpu or resource : please image this case : 
-	//loop==>(input==>(twritexmlfield A)==>(twritexmlfield B)==>(twritexmlfield C)==>output), dead lock as cycle dependency and only one thead in thread pool
-	//maybe newCachedThreadPool is a better idea,  but that have risk for creating more threads, then more memory for TDI-47230
-	//why not generate thread pool object in subprocess scope : 
-	// 1: major reason : difficult to control the var scope, somewhere can't access it, then compiler issue
-	// 2: we may need this thread pool for bigger scope, not only for twritexmlfield/twritejsonfield in future
-	// 3: we don't suppose this thread pool cost big resource after all tasks done, so we can shutdown it more later,
-	//		for example, most time, user will use less than 3 twritexmlfield in one job, then 3 threads thread pool, we can close them in job finish code part, 
-	//		not a big cost to keep that. And of course, we best to start&clean it in subprocess finish, but that's risk of 1 above.
-	int threadPoolSize = 0;
-	boolean tHMapExists = false;
-	boolean tHMapOutExists = false;
-	boolean tRESTRequestLoopExists = false;
 	for (INode nodeInProcess : processNodes) {
 		String componentName = nodeInProcess.getComponent().getName();
-
-		if(jobCatcherNode==null && "tJobStructureCatcher".equals(componentName)) {
+		if("tJobStructureCatcher".equals(componentName)) {
 			jobCatcherNode = nodeInProcess;
-			continue;
-		}
-
-		if(!nodeInProcess.isActivate()) continue;
-
-		if("tHMap".equals(componentName)) {
-			tHMapExists = true;
-			continue;
-		}
-
-		if("tHMapOut".equals(componentName)) {
-			tHMapOutExists = true;
-			continue;
-		}
-
-		if("tRESTRequestLoop".equals(componentName)) {
-			tRESTRequestLoopExists = true;
-			continue;
-		}
-		
-		if("tWriteXMLFieldOut".equals(componentName)) {
-			IConnection nextMergeConn = NodeUtil.getNextMergeConnection(nodeInProcess);
-			if(nextMergeConn == null || nextMergeConn.getInputId()==1){
-				threadPoolSize++;
-			}
-		}
-	}
-
-	if(threadPoolSize>0) {
-		if(tRESTRequestLoopExists) {//miscroservice
-%>
-			private class DaemonThreadFactory implements java.util.concurrent.ThreadFactory {
-				java.util.concurrent.ThreadFactory factory = java.util.concurrent.Executors.defaultThreadFactory();
-				
-				public java.lang.Thread newThread(java.lang.Runnable r) {
-					java.lang.Thread t = factory.newThread(r);
-					t.setDaemon(true);
-					return t;
-				}
-			}
-<%
-		}
-
-		if(tHMapExists || tHMapOutExists) {
-%>
-private final java.util.concurrent.ExecutorService es = java.util.concurrent.Executors.newFixedThreadPool(<%=threadPoolSize%> <%if(tRESTRequestLoopExists) {%>,new DaemonThreadFactory()<%}%>);
-<%
-		} else {
-%>
-private final java.util.concurrent.ExecutorService es = java.util.concurrent.Executors.newCachedThreadPool(<%if(tRESTRequestLoopExists) {%>new DaemonThreadFactory()<%}%>);
-<%
-		}
-
-		if(tRESTRequestLoopExists) {//miscroservice
-%>
-		{
-			java.lang.Runtime.getRuntime().addShutdownHook(new java.lang.Thread() {
-				public void run() {
-					es.shutdown();
-					try {
-						if(!es.awaitTermination(60, java.util.concurrent.TimeUnit.SECONDS)) {
-							es.shutdownNow();
-							if(!es.awaitTermination(60, java.util.concurrent.TimeUnit.SECONDS)) {
-
-							}
-						}
-					} catch (java.lang.InterruptedException ie) {
-						es.shutdownNow();
-					} catch (java.lang.Exception e) {
-
-					}
-				}
-			});
-		}
-<%
+			break;
 		}
 	}
 	
@@ -601,10 +507,7 @@ private class TalendException extends Exception {
 
 	private java.util.Map<String, Object> globalMap = null;
 	private Exception e = null;
-	
 	private String currentComponent = null;
-	private String cLabel =  null;
-	
 	private String virtualComponentName = null;
 	
 	public void setVirtualComponentName (String virtualComponentName){
@@ -616,11 +519,6 @@ private class TalendException extends Exception {
 		this.globalMap = globalMap;
 		this.e = e;
 	}
-	
-	private TalendException(Exception e, String errorComponent, String errorComponentLabel, final java.util.Map<String, Object> globalMap) {
-		this(e, errorComponent, globalMap);
-		this.cLabel = errorComponentLabel;
-	}
 
 	public Exception getException() {
 		return this.e;
@@ -680,15 +578,6 @@ private class TalendException extends Exception {
 <%
 		boolean needCatchTalendException = false;
 		
-		if(enableLogStash) {
-%>
-		if(enableLogStash) {
-			<%=jobCatcherNode.getUniqueName() %>.addJobExceptionMessage(currentComponent, cLabel, null, e);
-			<%=jobCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
-		}
-<%
-		}
-		
 		if (process.getNodesOfType("tLogCatcher").size() > 0) {
 			List<INode> logCatchers = (List<INode>)process.getNodesOfType("tLogCatcher");
 			for (INode logCatcher : logCatchers) {
@@ -699,7 +588,7 @@ private class TalendException extends Exception {
 <%
 				}
 			}
-			
+
 			INode virtualNCatchNode = null;
 			boolean hasRealCatchNode = false;
 			for (INode logCatcher : logCatchers) {

main/plugins/org.talend.designer.codegen/jet_stub/iterate_subprocess_footer.javajet

@@ -71,7 +71,7 @@
 								}
 							}					
 				            		            
-		                    TalendException te = new TalendException(e, currentComponent, cLabel, globalMap);
+		                    TalendException te = new TalendException(e, currentComponent, globalMap);
 							<%
 							if(NodeUtil.hasVirtualComponent(subTree.getNodes())){
 							%>

main/plugins/org.talend.designer.codegen/jet_stub/iterate_subprocess_header.javajet

@@ -200,7 +200,6 @@ for (IConnection iterateConn : iterateConnSet) { //1
 					
 					this.isRunning = true;
 					String currentComponent = "";
-					String cLabel = null;
 					java.util.Map<String, Object> resourceMap = new java.util.HashMap<String, Object>();
 					<%
 					if(NodeUtil.hasVirtualComponent(subTree.getNodes())){

main/plugins/org.talend.designer.codegen/jet_stub/subprocess_footer.javajet

@@ -67,7 +67,7 @@
 								this.errorCode = localErrorCode;
 							}
 						}					
-			            pool.setErrorThread(this, new TalendException(e, currentComponent, cLabel, globalMap));
+			            pool.setErrorThread(this, new TalendException(e, currentComponent, globalMap));
 			            //pool.setErrorThread(this,e);
 			            pool.stopAllThreads();
 					}finally{
@@ -117,7 +117,7 @@
 		} catch (InterruptedException e) {
 			e.printStackTrace();
 		} catch (java.lang.Exception te) {
-			throw new TalendException(te, currentComponent, cLabel, globalMap);
+			throw new TalendException(te, currentComponent, globalMap);
 		}
 	<%
 	}else{
@@ -228,7 +228,7 @@
 				<%
 				}
 				%>
-				TalendException te = new TalendException(e, currentComponent, cLabel, globalMap);
+				TalendException te = new TalendException(e, currentComponent, globalMap);
 				<%
 				if(NodeUtil.hasVirtualComponent(subTree.getNodes())){
 				%>

main/plugins/org.talend.designer.codegen/jet_stub/subprocess_header.javajet

@@ -20,7 +20,6 @@
 		org.talend.core.model.process.IHashConfiguration
 		org.talend.core.model.process.IHashableColumn
 		org.talend.core.model.utils.NodeUtil
-		org.talend.core.model.utils.TalendTextUtils
 	"
 	class="SubProcessHeader"
 	skeleton="subprocess_header_java.skeleton"
@@ -184,48 +183,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 				public <%= typeToGenerate %> get<%=column.getLabel().substring(0, 1).toUpperCase()%><%=column.getLabel().substring(1)%> () {
 					return this.<%=column.getLabel()%>;
 				}
-
-				public Boolean <%=column.getLabel()%>IsNullable(){
-				    return <%=column.isNullable()%>;
-				}
-				public Boolean <%=column.getLabel()%>IsKey(){
-				    return <%=column.isKey()%>;
-				}
-				public Integer <%=column.getLabel()%>Length(){
-				    return <%=column.getLength()%>;
-				}
-				public Integer <%=column.getLabel()%>Precision(){
-				    return <%=column.getPrecision()%>;
-				}
-				public String <%=column.getLabel()%>Default(){
-				<% if (column.getDefault() == null) { %>
-					return null;
-				<% } else { %>
-					return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getDefault()))%>";
-				<% } %>
-				}
-				public String <%=column.getLabel()%>Comment(){
-				<% if (column.getComment() == null) { %>
-				    return null;
-				<% } else { %>
-				    return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getComment()))%>";
-				<% } %>
-				}
-				public String <%=column.getLabel()%>Pattern(){
-				<% if (column.getPattern() == null) { %>
-				    return null;
-				<% } else { %>
-					return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getPattern()))%>";
-				<% } %>
-				}
-				public String <%=column.getLabel()%>OriginalDbColumnName(){
-				<% if (column.getOriginalDbColumnName() == null) { %>
-				    return null;
-				<% } else { %>
-					return "<%=TalendTextUtils.escapeJavaText(TalendTextUtils.removeQuotes(column.getOriginalDbColumnName()))%>";
-				<% } %>
-				}
-
 				<%
 				if((conn.getLineStyle() == EConnectionType.FLOW_REF) && conn.getTarget().getUniqueName().startsWith("tXMLMap") && "id_Document".equals(javaType.getId())) {
 				%>
@@ -407,26 +364,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return strReturn;
 	}
-	
-	private String readString(org.jboss.marshalling.Unmarshaller unmarshaller) throws IOException{
-		String strReturn = null;
-		int length = 0;
-        length = unmarshaller.readInt();
-		if (length == -1) {
-			strReturn = null;
-		} else {
-			if(length > commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>.length) {
-				if(length < 1024 && commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>.length == 0) {
-   					commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %> = new byte[1024];
-				} else {
-   					commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %> = new byte[2 * length];
-   				}
-			}
-			unmarshaller.readFully(commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>, 0, length);
-			strReturn = new String(commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>, 0, length, utf8Charset);
-		}
-		return strReturn;
-	}
 
     private void writeString(String str, ObjectOutputStream dos) throws IOException{
 		if(str == null) {
@@ -437,21 +374,11 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 			dos.write(byteArray);
     	}
     }
-    
-    private void writeString(String str, org.jboss.marshalling.Marshaller marshaller) throws IOException{
-		if(str == null) {
-			marshaller.writeInt(-1);
-		} else {
-            byte[] byteArray = str.getBytes(utf8Charset);
-            marshaller.writeInt(byteArray.length);
-            marshaller.write(byteArray);
-    	}
-    }
 <%
 					} else if(!hasString2 && (isLookup && !hashableColumnsNames.contains(column.getLabel()))){
 						hasString2 = true;
 %>
-	
+
 	private String readString(DataInputStream dis, ObjectInputStream ois) throws IOException{
 		String strReturn = null;
 		int length = 0;
@@ -465,30 +392,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return strReturn;
 	}
-	
-	private String readString(DataInputStream dis, org.jboss.marshalling.Unmarshaller unmarshaller) throws IOException{
-		String strReturn = null;
-		int length = 0;
-        length = unmarshaller.readInt();
-		if (length == -1) {
-			strReturn = null;
-		} else {
-			byte[] byteArray = new byte[length];
-			unmarshaller.read(byteArray);
-			strReturn = new String(byteArray, utf8Charset);
-		}
-		return strReturn;
-	}
-	
-	private void writeString(String str, DataOutputStream dos, org.jboss.marshalling.Marshaller marshaller) throws IOException{
-		if(str == null) {
-			marshaller.writeInt(-1);
-		} else {
-            byte[] byteArray = str.getBytes(utf8Charset);
-            marshaller.writeInt(byteArray.length);
-            marshaller.write(byteArray);
-    	}
-	}
 
 	private void writeString(String str, DataOutputStream dos, ObjectOutputStream oos) throws IOException{
 		if(str == null) {
@@ -517,18 +420,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return dateReturn;
 	}
-	
-	private java.util.Date readDate(org.jboss.marshalling.Unmarshaller unmarshaller) throws IOException{
-		java.util.Date dateReturn = null;
-        int length = 0;
-        length = unmarshaller.readByte();
-		if (length == -1) {
-			dateReturn = null;
-		} else {
-	    	dateReturn = new Date(unmarshaller.readLong());
-		}
-		return dateReturn;
-	}
 
     private void writeDate(java.util.Date date1, ObjectOutputStream dos) throws IOException{
 		if(date1 == null) {
@@ -538,15 +429,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 	    	dos.writeLong(date1.getTime());
     	}
     }
-    
-    private void writeDate(java.util.Date date1, org.jboss.marshalling.Marshaller marshaller) throws IOException{
-		if(date1 == null) {
-			marshaller.writeByte(-1);
-		} else {
-			marshaller.writeByte(0);
-			marshaller.writeLong(date1.getTime());
-    	}
-    }
 <%
 					}else if (!hasDate2 && (isLookup && !hashableColumnsNames.contains(column.getLabel()))) {
 						hasDate2 = true;
@@ -563,18 +445,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return dateReturn;
 	}
-	
-	private java.util.Date readDate(DataInputStream dis, org.jboss.marshalling.Unmarshaller unmarshaller ) throws IOException{
-		java.util.Date dateReturn = null;
-		int length = 0;
-        length = unmarshaller.readByte();
-		if (length == -1) {
-			dateReturn = null;
-		} else {
-	    	dateReturn = new Date(unmarshaller.readLong());
-		}
-		return dateReturn;
-	}
 
 	private void writeDate(java.util.Date date1, DataOutputStream dos, ObjectOutputStream oos) throws IOException{
 		if(date1 == null) {
@@ -584,15 +454,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 	    	dos.writeLong(date1.getTime());
     	}
 	}
-	
-	private void writeDate(java.util.Date date1, DataOutputStream dos, org.jboss.marshalling.Marshaller marshaller) throws IOException{
-		if(date1 == null) {
-			marshaller.writeByte(-1);
-		} else {
-			marshaller.writeByte(0);
-			marshaller.writeLong(date1.getTime());
-    	}
-	}
 <%
 					}
 				} else if(typeToGenerate.equals("byte[]")) {
@@ -612,20 +473,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return byteArrayReturn;
 	}
-	
-	private byte[] readByteArray(org.jboss.marshalling.Unmarshaller dis) throws IOException{
-		byte[] byteArrayReturn;
-		int length = 0;
-        length = dis.readInt();
-		if (length == -1) {
-			byteArrayReturn = null;
-		} else {
-			byte[] byteArray = new byte[length];
-			dis.readFully(byteArray);
-			byteArrayReturn = byteArray;
-		}
-		return byteArrayReturn;
-	}
 
     private void writeByteArray(byte[] byteArray, ObjectOutputStream dos) throws IOException{
 		if(byteArray == null) {
@@ -635,15 +482,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 			dos.write(byteArray);
     	}
     }
-    
-    private void writeByteArray(byte[] byteArray, org.jboss.marshalling.Marshaller marshaller) throws IOException{
-		if(byteArray == null) {
-			marshaller.writeInt(-1);
-		} else {
-			marshaller.writeInt(byteArray.length);
-			marshaller.write(byteArray);
-    	}
-    }
 <%
 					}else if (!hasByteArray2 && (isLookup && !hashableColumnsNames.contains(column.getLabel()))) {
 						hasByteArray2 = true;
@@ -661,20 +499,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return byteArrayReturn;
 	}
-	
-	private byte[] readByteArray(DataInputStream dis, org.jboss.marshalling.Unmarshaller unmarshaller ) throws IOException{
-		byte[] byteArrayReturn;
-        int length = 0;
-        length = unmarshaller.readInt();
-		if (length == -1) {
-			byteArrayReturn = null;
-		} else {
-			byte[] byteArray = new byte[length];
-			unmarshaller.read(byteArray);
-			byteArrayReturn = byteArray;
-		}
-		return byteArrayReturn;
-	}
 
 	private void writeByteArray(byte[] byteArray, DataOutputStream dos, ObjectOutputStream oos) throws IOException{
 		if(byteArray == null) {
@@ -684,15 +508,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 			dos.write(byteArray);
     	}
 	}
-	
-	private void writeByteArray(byte[] byteArray, DataOutputStream dos, org.jboss.marshalling.Marshaller marshaller) throws IOException{
-		if(byteArray == null) {
-			marshaller.writeInt(-1);
-		} else {
-			marshaller.writeInt(byteArray.length);
-			marshaller.write(byteArray);
-    	}
-	}
 <%
 					}
 				}else {
@@ -713,18 +528,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return intReturn;
 	}
-	
-	private Integer readInteger(org.jboss.marshalling.Unmarshaller dis) throws IOException{
-		Integer intReturn;
-        int length = 0;
-        length = dis.readByte();
-		if (length == -1) {
-			intReturn = null;
-		} else {
-	    	intReturn = dis.read<%= typeToGenerate %>();
-		}
-		return intReturn;
-	}
 
 	private void writeInteger(Integer intNum, ObjectOutputStream dos) throws IOException{
 		if(intNum == null) {
@@ -734,15 +537,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 	    	dos.write<%= typeToGenerate %>(intNum);
     	}
 	}
-	
-	private void writeInteger(Integer intNum, org.jboss.marshalling.Marshaller marshaller) throws IOException{
-		if(intNum == null) {
-			marshaller.writeByte(-1);
-		} else {
-			marshaller.writeByte(0);
-			marshaller.write<%= typeToGenerate %>(intNum);
-    	}
-	}
 <%
 						} else if(!hasInteger2 && (isLookup && !hashableColumnsNames.contains(column.getLabel()))){
 							hasInteger2 = true;
@@ -758,18 +552,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		}
 		return intReturn;
 	}
-	
-	private Integer readInteger(DataInputStream dis, org.jboss.marshalling.Unmarshaller unmarshaller) throws IOException{
-		Integer intReturn;
-        int length = 0;
-        length = unmarshaller.readByte();
-		if (length == -1) {
-			intReturn = null;
-		} else {
-			intReturn = unmarshaller.read<%= typeToGenerate %>();
-		}
-		return intReturn;
-	}
 
 	private void writeInteger(Integer intNum, DataOutputStream dos, ObjectOutputStream oos) throws IOException{
 		if(intNum == null) {
@@ -779,15 +561,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 	    	dos.write<%= typeToGenerate %>(intNum);
     	}
 	}
-	
-	private void writeInteger(Integer intNum, DataOutputStream dos,org.jboss.marshalling.Marshaller marshaller ) throws IOException{
-		if(intNum == null) {
-			marshaller.writeByte(-1);
-		} else {
-			marshaller.writeByte(0);
-			marshaller.write<%= typeToGenerate %>(intNum);
-    	}
-	}
 <%
 						}
 					}
@@ -889,101 +662,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
       }
 
 
-    }
-    
-    public void <%= isLookup ? "readKeys" : "read" %>Data(org.jboss.marshalling.Unmarshaller dis) {
-
-		synchronized(commonByteArrayLock_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>) {
-
-        	try {
-
-        		int length = 0;
-		<%
-		 hasAtLeastOneRead = false;
-		 hasAtLeastOneObjectType = false;
-		if (metadata !=null) {
-			for (IMetadataColumn column: metadata.getListColumns()) {
-			  if (!isLookup || hashableColumnsNames.contains(column.getLabel())) {
-			  	hasAtLeastOneRead = true;
-				JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
-			 	String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
-
-				if (JavaTypesManager.isJavaPrimitiveType(column.getTalendType(), column.isNullable())) {
-					typeToGenerate=typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
-					%>
-			        this.<%=column.getLabel() %> = dis.read<%= typeToGenerate %>();
-					<%
-				} else if(typeToGenerate.equals("String")) {
-					%>
-					this.<%=column.getLabel() %> = readString(dis);
-					<%
-				} else if(typeToGenerate.equals("java.util.Date")) {
-					%>
-					this.<%=column.getLabel() %> = readDate(dis);
-					<%
-				} else if(typeToGenerate.equals("byte[]")) {
-					%>
-					this.<%=column.getLabel() %> = readByteArray(dis);
-					<%
-				} else if(javaType.isObjectBased() || typeToGenerate.equals("Geometry") || typeToGenerate.equals("Dynamic")) {
-			 		hasAtLeastOneObjectType = true;
-			 		if("id_Document".equals(javaType.getId()) || "id_Dynamic".equals(javaType.getId())) {
-			 			typeToGenerate = javaType.getNullableClass().getCanonicalName();
-			 		}
-					%>
-						this.<%=column.getLabel() %> = (<%= typeToGenerate %>) dis.readObject();
-					<%
-				} else {
-					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
-					typeToGenerate=typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
-					if(typeToGenerate.equals("Int")){
-					%>
-						this.<%=column.getLabel() %> = readInteger(dis);
-					<%
-					} else {
-					%>
-			            length = dis.readByte();
-           				if (length == -1) {
-           	    			this.<%=column.getLabel() %> = null;
-           				} else {
-           			    	this.<%=column.getLabel() %> = dis.read<%= typeToGenerate %>();
-           				}
-					<%
-					}
-				}
-			  }
-			}
-    	}
-	    if(hasAtLeastOneRead) {
-	    %>
-        	} catch (IOException e) {
-	            throw new RuntimeException(e);
-        <%
-        }
-        %>
-
-		<%
-		if(hasAtLeastOneObjectType) {
-		%>
-			} catch(ClassNotFoundException eCNFE) {
-				 throw new RuntimeException(eCNFE);
-		<%
-		}
-		%>
-
-        }
-
-		<%
-		if(!hasAtLeastOneRead) {
-		%>
-			finally {}
-		<%
-		}
-		%>
-
-      }
-
-
     }
 
     public void <%= isLookup ? "writeKeys" : "write" %>Data(ObjectOutputStream dos) {
@@ -1061,82 +739,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		%>
 
     }
-    
-    public void <%= isLookup ? "writeKeys" : "write" %>Data(org.jboss.marshalling.Marshaller dos) {
-        try {
-
-		<%
-		hasAtLeastOneWrite = false;
-		hasAtLeastOneObjectType = false;
-		if (metadata !=null) {
-			for (IMetadataColumn column: metadata.getListColumns()) {
-			  if (!isLookup || hashableColumnsNames.contains(column.getLabel())) {
-				JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
-				hasAtLeastOneWrite = true;
-			 	String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
-				%>
-					// <%=typeToGenerate %>
-				<%
-				if (JavaTypesManager.isJavaPrimitiveType(column.getTalendType(), column.isNullable())) {
-					typeToGenerate=typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
-					%>
-		            	dos.write<%= typeToGenerate %>(this.<%=column.getLabel() %>);
-					<%
-				} else if(typeToGenerate.equals("String")) {
-					%>
-						writeString(this.<%=column.getLabel() %>,dos);
-					<%
-				} else if(typeToGenerate.equals("java.util.Date")) {
-					%>
-						writeDate(this.<%=column.getLabel() %>,dos);
-					<%
-				} else if(typeToGenerate.equals("byte[]")) {
-					%>
-						writeByteArray(this.<%=column.getLabel() %>,dos);
-					<%
-				} else if(javaType.isObjectBased() || typeToGenerate.equals("Geometry") || typeToGenerate.equals("Dynamic")) {
-					%>
-       			    	dos.writeObject(this.<%=column.getLabel() %>);
-					<%
-				} else {
-					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
-					typeToGenerate = typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
-					if(typeToGenerate.equals("Int")){
-					%>
-						writeInteger(this.<%=column.getLabel() %>,dos);
-					<%
-					} else {
-					%>
-						if(this.<%=column.getLabel() %> == null) {
-			                dos.writeByte(-1);
-						} else {
-               				dos.writeByte(0);
-           			    	dos.write<%= typeToGenerate %>(this.<%=column.getLabel() %>);
-		            	}
-					<%
-					}
-				}
-			  }
-			}
-    	}
-	    if(hasAtLeastOneWrite) {
-	    %>
-        	} catch (IOException e) {
-	            throw new RuntimeException(e);
-        <%
-        }
-        %>
-        }
-
-        <%
-		if(!hasAtLeastOneWrite) {
-		%>
-			finally {}
-		<%
-		}
-		%>
-
-    }
 
     <%
 	if(isLookup) { // T SH 002
@@ -1234,94 +836,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
         %>
 
     }
-    
-    public void readValuesData(DataInputStream dis, org.jboss.marshalling.Unmarshaller objectIn) {
-        try {
-			int length = 0;
-		<%
-		hasAtLeastOneRead = false;
-		hasAtLeastOneObjectType = false;
-		if (metadata !=null) {
-			for (IMetadataColumn column: metadata.getListColumns()) {
-			  if (!hashableColumnsNames.contains(column.getLabel())) {
-				JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
-				hasAtLeastOneRead = true;
-			 	String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
-
-				if (JavaTypesManager.isJavaPrimitiveType(column.getTalendType(), column.isNullable())) {
-					typeToGenerate=typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
-					%>
-			            this.<%=column.getLabel() %> = objectIn.read<%= typeToGenerate %>();
-					<%
-				} else if(typeToGenerate.equals("String")) {
-					%>
-						this.<%=column.getLabel() %> = readString(dis,objectIn);
-					<%
-				} else if(typeToGenerate.equals("byte[]")) {
-					%>
-						this.<%=column.getLabel() %> = readByteArray(dis,objectIn);
-					<%
-				} else if(typeToGenerate.equals("java.util.Date")) {
-					%>
-						this.<%=column.getLabel() %> = readDate(dis,objectIn);
-					<%
-				} else if(typeToGenerate.equals("Object") || typeToGenerate.equals("Geometry") || typeToGenerate.equals("BigDecimal") || typeToGenerate.equals("List") || typeToGenerate.equals("Dynamic") || typeToGenerate.equals("Document")) {
-			 		hasAtLeastOneObjectType = true;
-			 		if("id_Document".equals(javaType.getId()) || "id_Dynamic".equals(javaType.getId())) {
-			 			typeToGenerate = javaType.getNullableClass().getCanonicalName();
-			 		}
-					%>
-       			    	this.<%=column.getLabel() %> = (<%= typeToGenerate %>) objectIn.readObject();
-					<%
-				} else {
-					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
-					typeToGenerate=typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
-					if(typeToGenerate.equals("Int")){
-					%>
-						this.<%=column.getLabel() %> = readInteger(dis,objectIn);
-					<%
-					} else {
-					%>
-			            length = objectIn.readByte();
-           				if (length == -1) {
-           	    			this.<%=column.getLabel() %> = null;
-           				} else {
-           			    	this.<%=column.getLabel() %> = objectIn.read<%= typeToGenerate %>();
-           				}
-					<%
-					}
-				}
-			  }
-			}
-    	}
-    	if(hasAtLeastOneRead) {
-	    %>
-        	} catch (IOException e) {
-	            throw new RuntimeException(e);
-        <%
-        }
-        %>
-
-		<%
-		if(hasAtLeastOneObjectType) {
-		%>
-			} catch(ClassNotFoundException eCNFE) {
-				 throw new RuntimeException(eCNFE);
-		<%
-		}
-		%>
-
-        }
-
-		<%
-    	if(!hasAtLeastOneRead) {
-	    %>
-        	finally {}
-        <%
-        }
-        %>
-
-    }
 
     /**
      * Return a byte array which represents Values data.
@@ -1397,83 +911,6 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
         %>
 
     }
-    
-    public void writeValuesData(DataOutputStream dos, org.jboss.marshalling.Marshaller objectOut){
-                try {
-
-		<%
-		hasAtLeastOneWrite = false;
-		if (metadata !=null) {
-			for (IMetadataColumn column: metadata.getListColumns()) {
-			  if (!hashableColumnsNames.contains(column.getLabel())) {
-				JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
-				hasAtLeastOneWrite = true;
-			 	String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
-				if (JavaTypesManager.isJavaPrimitiveType(column.getTalendType(), column.isNullable())) {
-					typeToGenerate=typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
-					%>
-					objectOut.write<%= typeToGenerate %>(this.<%=column.getLabel() %>);
-					<%
-				} else if(typeToGenerate.equals("String")) {
-					%>
-						writeString(this.<%=column.getLabel() %>, dos, objectOut);
-					<%
-				} else if(typeToGenerate.equals("byte[]")) {
-					%>
-						writeByteArray(this.<%=column.getLabel() %>, dos, objectOut);
-					<%
-				} else if(typeToGenerate.equals("java.util.Date")) {
-					%>
-						writeDate(this.<%=column.getLabel() %>, dos, objectOut);
-					<%
-				} else if(typeToGenerate.equals("Object") || typeToGenerate.equals("Geometry") || typeToGenerate.equals("BigDecimal") || typeToGenerate.equals("List") || typeToGenerate.equals("Dynamic") || typeToGenerate.equals("Document")) {
-					%>
-       			    	objectOut.writeObject(this.<%=column.getLabel() %>);
-					<%
-				} else {
-					typeToGenerate =JavaTypesManager.getTypeToGenerate(column.getTalendType(), false);
-					typeToGenerate = typeToGenerate.substring(0,1).toUpperCase()+typeToGenerate.substring(1);
-					if(typeToGenerate.equals("Int")){
-					%>
-					writeInteger(this.<%=column.getLabel() %>, dos, objectOut);
-					<%
-					} else {
-					%>
-						if(this.<%=column.getLabel() %> == null) {
-							objectOut.writeByte(-1);
-						} else {
-							objectOut.writeByte(0);
-							objectOut.write<%= typeToGenerate %>(this.<%=column.getLabel() %>);
-		            	}
-					<%
-					}
-				}
-			  }
-			}
-    	}
-
-    	if(hasAtLeastOneRead) {
-	    %>
-        	} catch (IOException e) {
-	            throw new RuntimeException(e);
-        <%
-        }
-        %>
-        	}
-        <%
-    	if(!hasAtLeastOneRead) {
-	    %>
-        	finally {}
-        <%
-        }
-        %>
-    }
-
-
-    
-    public boolean supportMarshaller(){
-        return true;
-    }
 
     <%
 	} // T SH 002
@@ -1641,7 +1078,6 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
 
 				this.isRunning = true;
 				String currentComponent = "";
-				String cLabel = null;
 				<%
 				   	if(NodeUtil.hasVirtualComponent(subTree.getNodes())){
 					   %>
@@ -1675,7 +1111,6 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
 		int iterateLoop = 0;
 	<%}%>
 	String currentComponent = "";
-	String cLabel =  null;
 	java.util.Map<String, Object> resourceMap = new java.util.HashMap<String, Object>();
 
 	try {

main/plugins/org.talend.designer.codegen/plugin_en.properties

@@ -0,0 +1,5 @@
+providerName=www.example.org
+pluginName=EmittersPool Model
+components=Components
+trunjob=tRunJob
+format=Format

main/plugins/org.talend.designer.codegen/plugin_fr.properties

@@ -1,5 +1,5 @@
-pluginName=Mod\u00E8le EmittersPool
 providerName=www.example.org
+pluginName=Mod\u00E8le EmittersPool
 components=Composants
 trunjob=tRunJob
 format=Format

main/plugins/org.talend.designer.codegen/plugin_ja.properties

@@ -1,5 +1,5 @@
-pluginName=EmittersPool \u30E2\u30C7\u30EB
 providerName=www.example.org
+pluginName=EmittersPool \u30E2\u30C7\u30EB
 components=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
 trunjob=tRunJob
 format=\u5F62\u5F0F

main/plugins/org.talend.designer.codegen/plugin_zh_CN.properties

@@ -1,5 +1,5 @@
-pluginName=\u7EC4\u4EF6\u6A21\u5757
 providerName=www.example.org
+pluginName=\u7EC4\u4EF6\u6A21\u5757
 components=\u7EC4\u4EF6
 trunjob=tRunJob
 format=\u683C\u5F0F

main/plugins/org.talend.designer.codegen/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen</artifactId>

main/plugins/org.talend.designer.codegen/src/main/java/messages.properties

@@ -10,7 +10,6 @@ CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
 CodeGenerator.JET.TimeOut=JET initialisation Time Out
 CodeGenerator.newLine=\n\n\n\n
 CodeGenerator.Node.NotFound=Node not found in current process
-CodeGenerator.Components.NotFound={0}: Component is missing: {1}; use -D{2}=false in your studio or commandline to skip this check, and a warning message will be logged.
 JavaRoutineSynchronizer.UnsupportedOperation.Exception1=method not implemented: org.talend.designer.codegen.JavaRoutineSynchronizer line:49
 JavaRoutineSynchronizer.UnsupportedOperation.Exception2=method not implemented: org.talend.designer.codegen.JavaRoutineSynchronizer line:58
 JetSkeletonManager.unableLoad=unable to load skeleton update cache file

main/plugins/org.talend.designer.codegen/src/main/java/messages_en.properties

@@ -0,0 +1,148 @@
+JavaRoutineSynchronizer.UnsupportedOperation.Exception1=method not implemented: org.talend.designer.codegen.JavaRoutineSynchronizer line:49
+CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=JETEmitters Project not present, full reinitialize is needed
+generatedcode.footerprocess.nbcharsgenerated={0} characters generated by {1}
+CodeGeneratorEmittersPoolFactory.Class.NotFound=Template still present, but class {0} has disapeared from workspace. This unit needs to be recompiled.
+CodeGeneratorEmittersPoolFactory.PersitentData.Error=Persitent data cannot be saved :
+generatedcode.copyright.title=Copyright (c) 2005-2011, Talend Inc.
+CodeGeneratorEmittersPoolFactory.initMessage=Generation Engine Initialization in progress...
+generatedcode.copyright.body5=(http://www.gnu.org/licenses/lgpl.html).
+EmfEmittersPersistence.CodeGen.DataMissing=Missing code generation data. Starting full code generation.
+CodeGenerator.JET.TimeOut=JET initialisation Time Out
+generatedcode.copyright.body4=You may distribute this code under the terms of the GNU LGPL license
+CodeGenerator.Node.NotFound=Node not found in current process
+generatedcode.copyright.body3=You can find more information about Talend products at www.talend.com.
+EmittersPoolFactoryImpl.Class.IllegalArg=The class ' {0}' is not a valid classifier
+generatedcode.copyright.body2=/ JobDesigner (CodeGenerator version {0}).
+JavaRoutineSynchronizer.UnsupportedOperation.Exception2=method not implemented: org.talend.designer.codegen.JavaRoutineSynchronizer line:58
+CodeGenerator.getGraphicalNode1=------process.getGraphicalNodes()------
+CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
+CodeGenerator.newLine=\n\n\n\n
+JetSkeletonManager.unableLoad=unable to load skeleton update cache file
+JetSkeletonManager.unableSave=unable to save skeleton update cache file
+JetSkeletonManager.updateProblem=when update skeleton persistence data, there have some problems
+CodeGeneratorEmittersPoolFactory.codeThread=Code generation background thread
+CodeGeneratorEmittersPoolFactory.componentCompiled=Components compiled in {0} ms
+CodeGeneratorEmittersPoolFactory.failCompail=Components compile fail : \r\n
+CodeGeneratorEmittersPoolFactory.initialException=Exception during Initialization
+CodeGeneratorEmittersPoolFactory.jetEmitterInitialException=Error during JetEmitter initalization
+CodeGeneratorService.invalidLanguage1=invalid language type.
+CodeGeneratorService.invalidLanguage2=invalid language type.
+CodeGenInit.addMarkers=Adding markers to workspace
+CodeGenInit.createProject=create {0} project
+CodeGenInit.deleteProject=delete {0} project
+CodeGenInit.initTemplate=init Templates
+CodeGenInit.removeLink=Remove linked resources
+CodeGenInit.saveWorkspace=Saving workspace
+DocumentRootImpl.mixed=\ (mixed:
+NodesSubTree.enableParallel=__ENABLE_PARALLEL__
+PoolTypeImpl.persistentPool= \ (persistentPool:
+TalendJetEmitter.compileFail=\ compile fail : {0} : {1}
+TalendJetEmitter.exception=Exception on
+JetFilesProviderManager.unableLoad=Unable to load {0}JetFilesProviderManager.unableLoad
+CodeGeneratorEmittersPoolFactory.dialogContent=JetEmitter Generation is canceled,to avoid problems cause by this, please press Ctrl+Shift+F3 to generate again\!
+CodeGeneratorEmittersPoolFactory.operationCanceled=Operation Canceled
+ComponentsFactory.afterSystemComponent=after system component
+ComponentsFactory.componentNotFound=Component folder not found\:
+ComponentsFactory.load.components=Load Components...
+ComponentsFactory.parentNotRecompiled=Warning\: parents of *.inc.javajet are not recompiled \!
+ComponentsLocalProviderService.componentLoadError=Component load error
+ComponentsLocalProviderService.talendExchangeError=Talend Exchange Error
+ComponentsPreferencePage.ButtonLabel0=Ok
+ComponentsPreferencePage.configuration.LINK_STYLE=Default mapping links display as :
+ComponentsPreferencePage.rowLimit=Row limit
+ComponentsPreferencePage.WarningMsg=You need to restart Talend Open Studio to load extra components.
+ComponentsPreferencePage.WarningTitle=Warning
+ComponentsPreferencePage.directoryFieldLabel=User component folder\:
+ComponentsProviderManager.unableLoad=unable to load component provider
+ComponenttRunJobPreferencePage.label=Don't show corresponding job after double click on a tRunJob Component.
+ComponentJobletPreferencePage.label=Don't show corresponding job after double click on a Joblet Component.
+ComponenttRunJobPreferencePage.showCorrespondingJob=Show corresponding job after double click on a tRunJob Component.
+XsdValidationCacheManager.unableLoadxsd=unable to load xsd validation cache file
+XsdValidationCacheManager.unableSavexsd=unable to save xsd validation cache file
+prefs.configuration.LINK_STYLE.AUTO=Auto
+prefs.configuration.LINK_STYLE.BEZIER_CURVE=Curves
+prefs.configuration.LINK_STYLE.LINE=Lines (fast)
+FAMILY.AS400=AS400
+FAMILY.Access=Access
+FAMILY.Alfresco=Alfresco
+FAMILY.Business=Business
+FAMILY.Business_Intelligence=Business Intelligence
+FAMILY.CentricCRM=CentricCRM
+FAMILY.Charts=Charts
+FAMILY.Connections=Connections
+FAMILY.Custom_Code=Custom Code
+FAMILY.DB2=DB2
+FAMILY.DB_Generic=DB Generic
+FAMILY.DB_JDBC=DB JDBC
+FAMILY.DB_SCD=DB SCD
+FAMILY.Data_Quality=Data Quality
+FAMILY.Databases=Databases
+FAMILY.ELT=ELT
+FAMILY.ESB=ESB
+FAMILY.EXASolution=EXASolution
+FAMILY.eXist=eXist
+FAMILY.FTP=FTP
+FAMILY.Fields=Fields
+FAMILY.File=File
+FAMILY.FireBird=FireBird
+FAMILY.Greenplum=Greenplum
+FAMILY.HSQLDb=HSQLDb
+FAMILY.Healthcare=Healthcare
+FAMILY.Hive=Hive
+FAMILY.Informix=Informix
+FAMILY.Ingres=Ingres
+FAMILY.Input=Input
+FAMILY.Interbase=Interbase
+FAMILY.Internet=Internet
+FAMILY.Jasper=Jasper
+FAMILY.JavaDB=JavaDB
+FAMILY.JDBC=JDBC
+FAMILY.LDAP=LDAP
+FAMILY.Logs_Errors=Logs & Errors
+FAMILY.MS_SQL_Server=MS SQL Server
+FAMILY.MSSql=MSSql
+FAMILY.Management=Management
+FAMILY.MaxDB=MaxDB
+FAMILY.Microsoft_AX=Microsoft AX
+FAMILY.Microsoft_CRM=Microsoft CRM
+FAMILY.Misc=Misc
+FAMILY.MySQL=MySQL
+FAMILY.Netezza=Netezza
+FAMILY.OLAP_Cube=OLAP Cube
+FAMILY.Oracle=Oracle
+FAMILY.Orchestration=Orchestration
+FAMILY.Output=Output
+FAMILY.ParAccel=ParAccel
+FAMILY.PostgreSQL=PostgreSQL
+FAMILY.PostgresPlus=PostgresPlus
+FAMILY.Processing=Processing
+FAMILY.SAP=SAP
+FAMILY.Sas=Sas
+FAMILY.SCD=SCD
+FAMILY.SCP=SCP
+FAMILY.SPSS=SPSS
+FAMILY.SQLite=SQLite
+FAMILY.Salesforce=Salesforce
+FAMILY.SugarCRM=SugarCRM
+FAMILY.Sybase=Sybase
+FAMILY.System=System
+FAMILY.Technical=Technical
+FAMILY.Teradata=Teradata
+FAMILY.Vertica=Vertica
+FAMILY.VtigerCRM=VtigerCRM
+FAMILY.XML=XML
+CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=Update the palette for editors
+ComponentsPreferencePage.componentAssist=Enable Component Creation Assistant
+ComponentsPreferencePage.notValidDirectory=Your selection will result in folder nesting, which is not recommended. Do you want to continue anyway?
+ComponentsFactory.loadComponents.missingFolder=The folder "{0}" is missing in the plugin "{1}".
+ComponentsPreferencePage_SuccessTitle=Success
+ComponentsPreferencePage_SuccessMessage1=Need restart studio to load the new components. Else, will be loaded in next time when start.
+ComponentsPreferencePage_SuccessMessage2=Do you want to restart right now?
+ComponentsPreferencePage.installComponentsFailure=Install components failure
+generatedcode.copyright.body1=This source code has been automatically generated by {0}
+ComponentsFactory.init.waitForFinish.timeout=Can't initialise ComponentsFactory, please try again.
+FAMILY.Data_Privacy=Data Privacy
+ComponentsPreferencePage.enableOnLineHelp=Enable online help for components
+ComponentsPreferencePage.titleInstallHelp=Install offline help feature?
+ComponentsPreferencePage.msgInstallHelp=This will open additional packages dialog to install offline help feature, do you want to continue?
+ComponentsPreferencePage.grpHelp=Help

main/plugins/org.talend.designer.codegen/src/main/java/messages_fr.properties

@@ -1,76 +1,61 @@
-generatedcode.copyright.title=Copyright (c) 2005-2011, Talend SA.
-generatedcode.copyright.body1=Le code source a \u00E9t\u00E9 automatiquement g\u00E9n\u00E9r\u00E9 par {0}
-generatedcode.copyright.body2=/ JobDesigner (CodeGenerator version {0}).
-generatedcode.copyright.body3=Vous pouvez trouver plus d'informations sur les produits Talend sur www.talend.com.
-generatedcode.copyright.body4=Vous pouvez distribuer ce code sous les termes de la licence GNU LGPL
-generatedcode.copyright.body5=(http://www.gnu.org/licenses/lgpl.html).
+JavaRoutineSynchronizer.UnsupportedOperation.Exception1=M\u00E9thode non impl\u00E9ment\u00E9e : org.talend.designer.codegen.JavaRoutineSynchronizer line:49
+CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=Le projet JETEmitters est introuvable, une r\u00E9initialisation compl\u00E8te est requise
 generatedcode.footerprocess.nbcharsgenerated={0} caract\u00E8res g\u00E9n\u00E9r\u00E9s par {1}
+CodeGeneratorEmittersPoolFactory.Class.NotFound=Le template est toujours pr\u00E9sent, mais la classe {0} a disparue. Cette fonction doit d'\u00EAtre recompil\u00E9e.
+CodeGeneratorEmittersPoolFactory.PersitentData.Error=Les donn\u00E9es persistantes ne peuvent pas \u00EAtre enregistr\u00E9es : 
+generatedcode.copyright.title=Copyright (c) 2005-2011, Talend Inc.
+CodeGeneratorEmittersPoolFactory.initMessage=L'initialisation du moteur de g\u00E9n\u00E9ration est en cours...
+generatedcode.copyright.body5=(http://www.gnu.org/licenses/lgpl.html).
+EmfEmittersPersistence.CodeGen.DataMissing=Donn\u00E9e de g\u00E9n\u00E9ration de code manquante. D\u00E9but de g\u00E9n\u00E9ration du code entier.
+CodeGenerator.JET.TimeOut=D\u00E9lai d'initialisation JET d\u00E9pass\u00E9
+generatedcode.copyright.body4=Vous pouvez distribuer ce code sous les termes de la licence GNU LGPL
+CodeGenerator.Node.NotFound=Noeud introuvable dans le processus courant
+generatedcode.copyright.body3=Vous pouvez trouver plus d'informations sur les produits Talend sur www.talend.com.
+EmittersPoolFactoryImpl.Class.IllegalArg=La classe '{0}' n'est pas un classifiant valide
+generatedcode.copyright.body2=/ JobDesigner (CodeGenerator version {0}).
+JavaRoutineSynchronizer.UnsupportedOperation.Exception2=M\u00E9thode non impl\u00E9ment\u00E9e : org.talend.designer.codegen.JavaRoutineSynchronizer line:58
 CodeGenerator.getGraphicalNode1=------process.getGraphicalNodes()------
 CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
-CodeGenerator.JET.TimeOut=D\u00E9lai d'initialisation JET d\u00E9pass\u00E9
 CodeGenerator.newLine=\n\n\n\n
-CodeGenerator.Node.NotFound=N\u0153ud introuvable dans le processus courant
-CodeGenerator.Components.NotFound={0}\u00A0: Le composant est manquant\u00A0: {1}; utilisez -D{2}=false dans votre Studio ou CommandLine pour ignorer cette v\u00E9rification. Un message d'avertissement sera enregistr\u00E9 dans les logs.
-JavaRoutineSynchronizer.UnsupportedOperation.Exception1=M\u00E9thode non impl\u00E9ment\u00E9e : org.talend.designer.codegen.JavaRoutineSynchronizer line:49
-JavaRoutineSynchronizer.UnsupportedOperation.Exception2=M\u00E9thode non impl\u00E9ment\u00E9e : org.talend.designer.codegen.JavaRoutineSynchronizer line:58
 JetSkeletonManager.unableLoad=Impossible de charger le fichier de cache de la mise \u00E0 jour du squelette
-JetSkeletonManager.unableSave=impossible d'enregistrer le fichier de cache de la mise \u00E0 jour du squelette
-JetSkeletonManager.updateProblem=Des probl\u00E8mes sont survenus lors de la mise \u00E0 jour des donn\u00E9es persistantes du squelette.
-EmfEmittersPersistence.CodeGen.DataMissing=Donn\u00E9e de g\u00E9n\u00E9ration de code manquante. D\u00E9but de g\u00E9n\u00E9ration du code entier.
-CodeGeneratorEmittersPoolFactory.PersitentData.Error=Les donn\u00E9es persistantes ne peuvent pas \u00EAtre enregistr\u00E9es\u00A0:
-CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=Le projet JETEmitters est introuvable, une r\u00E9initialisation compl\u00E8te est requise
-CodeGeneratorEmittersPoolFactory.Class.NotFound=Le template est toujours pr\u00E9sent, mais la classe {0} a disparue. Cette fonction doit d'\u00EAtre recompil\u00E9e.
+JetSkeletonManager.unableSave=impossible d'enregistrer le fichier de cache de la mise \u00E0 jour skeleton
+JetSkeletonManager.updateProblem=quand les donn\u00E9es persistantes du squelette sont mises \u00E0 jour, il y a des probl\u00E8mes.
 CodeGeneratorEmittersPoolFactory.codeThread=G\u00E9n\u00E9ration de code en arri\u00E8re-plan
 CodeGeneratorEmittersPoolFactory.componentCompiled=Composants compil\u00E9s en {0} ms
-CodeGeneratorEmittersPoolFactory.dialogContent=La g\u00E9n\u00E9ration JetEmitter est annul\u00E9e, afin d'\u00E9viter des probl\u00E8mes. Veuillez appuyez sur Ctrl+Maj+F3 pour g\u00E9n\u00E9rer \u00E0 nouveau.
-CodeGeneratorEmittersPoolFactory.failCompail=\u00C9chec de compilation des composants : \r\n
-EmittersPoolFactoryImpl.Class.IllegalArg=La classe ' {0} ' n'est pas un classifiant valide.
+CodeGeneratorEmittersPoolFactory.failCompail=\u00C9chec de compilation des composants \: \r\n
 CodeGeneratorEmittersPoolFactory.initialException=Exception durant l'initialisation
-CodeGeneratorEmittersPoolFactory.initMessage=Initialisation du moteur de g\u00E9n\u00E9ration en cours...
 CodeGeneratorEmittersPoolFactory.jetEmitterInitialException=Erreur d'initialisation de JetEmitter
-CodeGeneratorEmittersPoolFactory.operationCanceled=Op\u00E9ration annul\u00E9e
-CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=Mettre \u00E0 jour la palette pour les \u00E9diteurs
 CodeGeneratorService.invalidLanguage1=Type de langage invalide.
 CodeGeneratorService.invalidLanguage2=Type de langage invalide.
 CodeGenInit.addMarkers=Ajouter des marqueurs dans l'espace de travail
-CodeGenInit.createProject=Cr\u00E9er un projet {0}
+CodeGenInit.createProject=Cr\u00E9er le projet {0}
 CodeGenInit.deleteProject=Supprimer le projet {0}
 CodeGenInit.initTemplate=Init templates
 CodeGenInit.removeLink=Supprimer les ressources li\u00E9es
 CodeGenInit.saveWorkspace=Enregistrement de l'espace de travail
-DocumentRootImpl.mixed= (m\u00E9lang\u00E9 :
+DocumentRootImpl.mixed=(mix\u00E9\:
 NodesSubTree.enableParallel=__ENABLE_PARALLEL__
-PoolTypeImpl.persistentPool= (PoolPersistant :
+PoolTypeImpl.persistentPool=(PoolPersistant \:
 TalendJetEmitter.compileFail= erreur de compilation : {0} : {1}
 TalendJetEmitter.exception=Exception sur
-JetFilesProviderManager.unableLoad=Impossible de charger {0}
-ComponentsFactory.afterSystemComponent=apr\u00E8s le composant syst\u00E8me
-ComponentsFactory.componentNotFound=Dossier du composant introuvable :
+JetFilesProviderManager.unableLoad=Impossible de charger {0} JetFilesProviderManager.unableLoad
+CodeGeneratorEmittersPoolFactory.dialogContent=La g\u00E9n\u00E9ration JetEmitter est annul\u00E9e, afin d'\u00E9viter des probl\u00E8mes, veuillez appuyez sur Ctrl+Maj+F3 pour g\u00E9n\u00E9rer \u00E0 nouveau.
+CodeGeneratorEmittersPoolFactory.operationCanceled=Op\u00E9ration annul\u00E9e
+ComponentsFactory.afterSystemComponent=apr\u00E8s le(s) composant(s) syst\u00E8me
+ComponentsFactory.componentNotFound=Impossible de trouver le dossier du composant :
 ComponentsFactory.load.components=Chargement des composants...
-ComponentsFactory.parentNotRecompiled=Avertissement : les parents des *.inc.javajet n'ont pas \u00E9t\u00E9 recompil\u00E9s !
-ComponentsFactory.loadComponents.missingFolder=Le dossier "{0}" ne contient pas le plug-in "{1}".
-ComponentsFactory.init.waitForFinish.timeout=Impossible d'initialiser ComponentsFactory, veuillez r\u00E9essayer.
+ComponentsFactory.parentNotRecompiled=Attention\: les parents de *.inc.javajet ne sont pas recompil\u00E9s.
 ComponentsLocalProviderService.componentLoadError=Erreur de chargement du composant
-ComponentsLocalProviderService.talendExchangeError=Erreur Talend Exchange
-ComponentsPreferencePage.ButtonLabel0=Ok
-ComponentsPreferencePage.componentAssist=Activer l'assistant de cr\u00E9ation de composant
+ComponentsLocalProviderService.talendExchangeError=Erreur de Talend Exchange
+ComponentsPreferencePage.ButtonLabel0=OK
 ComponentsPreferencePage.configuration.LINK_STYLE=Les liens de mapping par d\u00E9faut s'affichent comme :
 ComponentsPreferencePage.rowLimit=Limite de lignes
 ComponentsPreferencePage.WarningMsg=Vous devez red\u00E9marrer Talend Open Studio afin de charger les composants suppl\u00E9mentaires.
 ComponentsPreferencePage.WarningTitle=Avertissement
-ComponentsPreferencePage.directoryFieldLabel=R\u00E9pertoire des composants utilisateur :
-ComponentsPreferencePage.notValidDirectory=Votre s\u00E9lection va imbriquer des dossiers, ce n'est pas recommand\u00E9. Continuer ?
-ComponentsPreferencePage.installComponentsFailure=\u00C9chec de l'installation des composants
-ComponentsProviderManager.unableLoad=impossible de charger un fournisseur de composant
-ComponenttRunJobPreferencePage.label=Ne pas ouvrir le Job correspondant lors du double-clic sur un tRunJob.
+ComponentsPreferencePage.directoryFieldLabel=Dossier des composants utilisateur :
+ComponentsProviderManager.unableLoad=Impossible de charger un fournisseur de composant
+ComponenttRunJobPreferencePage.label=Ne pas afficher le Job correspondant apr\u00E8s un double-clic sur un composant tRunJob.
 ComponentJobletPreferencePage.label=Ne pas afficher le Job correspondant apr\u00E8s un double-clic sur un composant Joblet.
-ComponentsPreferencePage_SuccessTitle=Succ\u00E8s
-ComponentsPreferencePage_SuccessMessage1=Red\u00E9marrez le Studio pour charger les nouveaux composants. Sinon, ils seront charg\u00E9s au prochain d\u00E9marrage.
-ComponentsPreferencePage_SuccessMessage2=Red\u00E9marrer maintenant ?
-ComponentsPreferencePage.enableOnLineHelp=Activer l'aide en ligne pour les composants
-ComponentsPreferencePage.titleInstallHelp=Installer la fonctionnalit\u00E9 d'aide hors ligne\u00A0?
-ComponentsPreferencePage.msgInstallHelp=Cela va ouvrir une bo\u00EEte de dialogue de packages suppl\u00E9mentaires pour installer la fonctionnalit\u00E9 d'aide hors ligne, continuer ?
-ComponentsPreferencePage.grpHelp=Aide
 ComponenttRunJobPreferencePage.showCorrespondingJob=Afficher le Job correspondant apr\u00E8s un double-clic sur un composant tRunJob.
 XsdValidationCacheManager.unableLoadxsd=impossible de charger le fichier de cache de validation xsd
 XsdValidationCacheManager.unableSavexsd=impossible d'enregistrer le fichier de cache de validation xsd
@@ -78,20 +63,19 @@ prefs.configuration.LINK_STYLE.AUTO=Auto
 prefs.configuration.LINK_STYLE.BEZIER_CURVE=Courbes
 prefs.configuration.LINK_STYLE.LINE=Lignes (rapide)
 FAMILY.AS400=AS400
-FAMILY.Access=Acc\u00E8s
+FAMILY.Access=Access
 FAMILY.Alfresco=Alfresco
 FAMILY.Business=Applications M\u00E9tier
 FAMILY.Business_Intelligence=Business Intelligence
 FAMILY.CentricCRM=CentricCRM
-FAMILY.Charts=Diagrammes
+FAMILY.Charts=Graphiques
 FAMILY.Connections=Connexions
-FAMILY.Custom_Code=Code personnalis\u00E9
+FAMILY.Custom_Code=Code Utilisateur
 FAMILY.DB2=DB2
 FAMILY.DB_Generic=Base de donn\u00E9es g\u00E9n\u00E9rique
 FAMILY.DB_JDBC=Base de donn\u00E9es JDBC
-FAMILY.DB_SCD=Base de donn\u00E9es SCD
+FAMILY.DB_SCD=DB SCD
 FAMILY.Data_Quality=Qualit\u00E9 de donn\u00E9es
-FAMILY.Data_Privacy=Confidentialit\u00E9 des donn\u00E9es
 FAMILY.Databases=Bases de donn\u00E9es
 FAMILY.ELT=ELT
 FAMILY.ESB=ESB
@@ -102,7 +86,7 @@ FAMILY.Fields=Champs
 FAMILY.File=Fichier
 FAMILY.FireBird=Firebird
 FAMILY.Greenplum=Greenplum
-FAMILY.HSQLDb=HSQLDB
+FAMILY.HSQLDb=HSQLDb
 FAMILY.Healthcare=Healthcare
 FAMILY.Hive=Hive
 FAMILY.Informix=Informix
@@ -127,11 +111,11 @@ FAMILY.Netezza=Netezza
 FAMILY.OLAP_Cube=Cube OLAP
 FAMILY.Oracle=Oracle
 FAMILY.Orchestration=Orchestration
-FAMILY.Output=Sortie
-FAMILY.ParAccel=ParAccel
+FAMILY.Output=\u00C9criture
+FAMILY.ParAccel=Paraccel
 FAMILY.PostgreSQL=PostgreSQL
 FAMILY.PostgresPlus=PostgresPlus
-FAMILY.Processing=Traitement de
+FAMILY.Processing=Transformation
 FAMILY.SAP=SAP
 FAMILY.Sas=Sas
 FAMILY.SCD=SCD
@@ -147,3 +131,15 @@ FAMILY.Teradata=Teradata
 FAMILY.Vertica=Vertica
 FAMILY.VtigerCRM=VtigerCRM
 FAMILY.XML=XML
+CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=Mettre \u00E0 jour la palette pour les \u00E9diteurs
+ComponentsPreferencePage.componentAssist=Activer l'assistant de cr\u00E9ation de composant
+ComponentsPreferencePage.notValidDirectory=Votre s\u00E9lection va imbriquer des dossiers, ce n'est pas recommand\u00E9. Continuer ?
+ComponentsFactory.loadComponents.missingFolder=Le plug-in "{1}" manque dans le dossier "{0}".
+ComponentsPreferencePage_SuccessMessage1=Red\u00E9marrez le Studio pour charger les nouveaux composants. Sinon,ils seront charg\u00E9s au prochain d\u00E9marrage.
+ComponentsPreferencePage_SuccessMessage2=Red\u00E9marrer maintenant ?
+ComponentsPreferencePage.installComponentsFailure=\u00C9chec de l'installation des composants
+ComponentsFactory.init.waitForFinish.timeout=Impossible d\'initialiser ComponentsFactory, veuillez r\u00E9essayer.
+ComponentsPreferencePage.enableOnLineHelp=Activer l\'aide en ligne pour les composants
+ComponentsPreferencePage.titleInstallHelp=Installer la fonctionnalit\u00E9 d\'aide hors ligne\u00A0?
+ComponentsPreferencePage.msgInstallHelp=Cela va ouvrir une bo\u00EEte de dialogue de packages suppl\u00E9mentaires pour installer la fonctionnalit\u00E9 d\'aide hors ligne, continuer ?
+ComponentsPreferencePage.grpHelp=Aide

main/plugins/org.talend.designer.codegen/src/main/java/messages_ja.properties

@@ -1,113 +1,97 @@
-generatedcode.copyright.title=Copyright (c) 2005-2011, Talend Inc.
-generatedcode.copyright.body1=\u3053\u306E\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306F{0}\u306B\u3088\u3063\u3066\u81EA\u52D5\u7684\u306B\u751F\u6210\u3055\u308C\u307E\u3057\u305F
+JavaRoutineSynchronizer.UnsupportedOperation.Exception1=\u30E1\u30BD\u30C3\u30C9\u304C\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093: org.talend.designer.codegen.JavaRoutineSynchronizer line:49
+CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=JETEmitter \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3001\u5168\u4F53\u306E\u518D\u521D\u671F\u5316\u304C\u5FC5\u8981\u3067\u3059\u3002
+generatedcode.footerprocess.nbcharsgenerated={1} \u306B\u3088\u308A {0} \u6587\u5B57\u751F\u6210\u3055\u308C\u307E\u3057\u305F
+CodeGeneratorEmittersPoolFactory.Class.NotFound=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306F\u307E\u3060\u5B58\u5728\u3057\u307E\u3059\u304C\u3001\u30AF\u30E9\u30B9 {0} \u306F\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u304B\u3089\u6D88\u3048\u307E\u3057\u305F\u3002\u3053\u306E\u30E6\u30CB\u30C3\u30C8\u306E\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u304C\u5FC5\u8981\u3067\u3059\u3002
+CodeGeneratorEmittersPoolFactory.PersitentData.Error=\u6301\u7D9A\u30C7\u30FC\u30BF\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093 :
+generatedcode.copyright.title=Copyright (c) 2005-2009, Talend Inc.
+CodeGeneratorEmittersPoolFactory.initMessage=\u751F\u6210\u30A8\u30F3\u30B8\u30F3\u306E\u521D\u671F\u5316\u4E2D...
+generatedcode.copyright.body5=(http://www.gnu.org/licenses/lgpl.html)\u3002
+EmfEmittersPersistence.CodeGen.DataMissing=\u30B3\u30FC\u30C9\u751F\u6210\u306E\u30C7\u30FC\u30BF\u304C\u4E0D\u8DB3\u3057\u3066\u3044\u307E\u3059\u3002\u5B8C\u5168\u306A\u30B3\u30FC\u30C9\u751F\u6210\u3092\u958B\u59CB\u3057\u3066\u3044\u307E\u3059\u3002
+CodeGenerator.JET.TimeOut=JET\u521D\u671F\u5316\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8
+generatedcode.copyright.body4=\u3053\u306E\u30B3\u30FC\u30C9\u306FGNU LGPL\u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u6761\u4EF6\u306B\u57FA\u3065\u3044\u3066\u914D\u5E03\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059
+CodeGenerator.Node.NotFound=\u73FE\u5728\u306E\u30D7\u30ED\u30BB\u30B9\u306B\u30CE\u30FC\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+generatedcode.copyright.body3=Talend\u88FD\u54C1\u306E\u3055\u3089\u306B\u8A73\u3057\u3044\u60C5\u5831\u306F\u3001www.talend.com\u3092\u3054\u89A7\u4E0B\u3055\u3044\u3002
+EmittersPoolFactoryImpl.Class.IllegalArg=\u30AF\u30E9\u30B9 '{0}' \u306F\u6709\u52B9\u306A\u5206\u985E\u5B50\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 generatedcode.copyright.body2=/ JobDesigner (CodeGenerator\u30D0\u30FC\u30B8\u30E7\u30F3{0}).
-generatedcode.copyright.body3=You can find more information about Talend products at www.talend.com.
-generatedcode.copyright.body4=\u3053\u306E\u30B3\u30FC\u30C9\u306FGNU LGPL\u30E9\u30A4\u30BB\u30F3\u30B9\u306E\u6761\u4EF6\u306B\u57FA\u3065\u3044\u3066\u914D\u5E03\u3067\u304D\u307E\u3059
-generatedcode.copyright.body5=(http://www.gnu.org/licenses/lgpl.html).
-generatedcode.footerprocess.nbcharsgenerated={1}\u306B\u3088\u308A{0}\u6587\u5B57\u751F\u6210\u3055\u308C\u307E\u3057\u305F
+JavaRoutineSynchronizer.UnsupportedOperation.Exception2=\u30E1\u30BD\u30C3\u30C9\u304C\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093: org.talend.designer.codegen.JavaRoutineSynchronizer line:58
 CodeGenerator.getGraphicalNode1=------process.getGraphicalNodes()------
 CodeGenerator.getGraphicalNode2=------process.getGeneratingNodes()------
-CodeGenerator.JET.TimeOut=JET\u306E\u521D\u671F\u5316\u51E6\u7406\u304C\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3057\u307E\u3057\u305F
-CodeGenerator.newLine=\n\n\n\n
-CodeGenerator.Node.NotFound=\u73FE\u5728\u306E\u30D7\u30ED\u30BB\u30B9\u306B\u30CE\u30FC\u30C9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-CodeGenerator.Components.NotFound={0}: \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u6B20\u843D\u3057\u3066\u3044\u307E\u3059: {1}\u3002Studio\u3067 -D{2}=false\u3092\u4F7F\u3046\u3068\u3053\u306E\u30C1\u30A7\u30C3\u30AF\u304C\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u3001\u8B66\u544A\u30E1\u30C3\u30BB\u30FC\u30B8\u304C\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB\u306B\u8A18\u9332\u3055\u308C\u307E\u3059\u3002
-JavaRoutineSynchronizer.UnsupportedOperation.Exception1=\u30E1\u30BD\u30C3\u30C9\u304C\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093\\: org.talend.designer.codegen.JavaRoutineSynchronizer line\\:49
-JavaRoutineSynchronizer.UnsupportedOperation.Exception2=\u30E1\u30BD\u30C3\u30C9\u304C\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093\\: org.talend.designer.codegen.JavaRoutineSynchronizer line\\:58
-JetSkeletonManager.unableLoad=\u30B9\u30B1\u30EB\u30C8\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
-JetSkeletonManager.unableSave=\u30B9\u30B1\u30EB\u30C8\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
-JetSkeletonManager.updateProblem=\u30B9\u30B1\u30EB\u30C8\u30F3\u6C38\u7D9A\u30C7\u30FC\u30BF\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6642\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F,
-EmfEmittersPersistence.CodeGen.DataMissing=\u30B3\u30FC\u30C9\u751F\u6210\u306E\u30C7\u30FC\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u5B8C\u5168\u306A\u30B3\u30FC\u30C9\u751F\u6210\u3092\u958B\u59CB\u3057\u3066\u3044\u307E\u3059\u3002
-CodeGeneratorEmittersPoolFactory.PersitentData.Error=\u6301\u7D9A\u30C7\u30FC\u30BF\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093:
-CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=JETEmitter \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3001\u5168\u4F53\u306E\u518D\u521D\u671F\u5316\u304C\u5FC5\u8981\u3067\u3059\u3002
-CodeGeneratorEmittersPoolFactory.Class.NotFound=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306F\u307E\u3060\u5B58\u5728\u3057\u307E\u3059\u304C\u3001\u30AF\u30E9\u30B9{0}\u306F\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u304B\u3089\u6D88\u3048\u307E\u3057\u305F\u3002\u3053\u306E\u30E6\u30CB\u30C3\u30C8\u306E\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u304C\u5FC5\u8981\u3067\u3059\u3002
+CodeGenerator.newLine=\\n\\n\\n\\n
+JetSkeletonManager.unableLoad=\u30B9\u30B1\u30EB\u30C8\u30F3\u66F4\u65B0\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
+JetSkeletonManager.unableSave=\u30B9\u30B1\u30EB\u30C8\u30F3\u66F4\u65B0\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
+JetSkeletonManager.updateProblem=\u30B9\u30B1\u30EB\u30C8\u30F3\u6C38\u7D9A\u30C7\u30FC\u30BF\u66F4\u65B0\u6642\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 CodeGeneratorEmittersPoolFactory.codeThread=\u30B3\u30FC\u30C9\u751F\u6210\u306E\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30B9\u30EC\u30C3\u30C9
 CodeGeneratorEmittersPoolFactory.componentCompiled=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306F{0}\u30DF\u30EA\u79D2\u3067\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u307E\u3057\u305F
-CodeGeneratorEmittersPoolFactory.dialogContent=JetEmitter\u751F\u6210\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F\u3001\u3053\u306E\u539F\u56E0\u3092\u907F\u3051\u308B\u305F\u3081\u306B\u3001Ctrl + Shift + F3 \u3092\u62BC\u4E0B\u3057\u3066\u518D\u5EA6\u751F\u6210\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-CodeGeneratorEmittersPoolFactory.failCompail=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u306B\u5931\u6557\u3057\u307E\u3057\u305F : \r\n
-EmittersPoolFactoryImpl.Class.IllegalArg=\u30AF\u30E9\u30B9{0}\u306F\u6709\u52B9\u306A\u5206\u985E\u5B50\u3067\u306F\u3042\u308A\u307E\u305B\u3093
+CodeGeneratorEmittersPoolFactory.failCompail=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30B3\u30F3\u30D1\u30A4\u30EB\u306B\u5931\u6557\u3057\u307E\u3057\u305F : \\r\\n
 CodeGeneratorEmittersPoolFactory.initialException=\u521D\u671F\u5316\u4E2D\u306B\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-CodeGeneratorEmittersPoolFactory.initMessage=\u751F\u6210\u30A8\u30F3\u30B8\u30F3\u306E\u521D\u671F\u5316\u4E2D...
 CodeGeneratorEmittersPoolFactory.jetEmitterInitialException=JetEmitter\u306E\u521D\u671F\u5316\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-CodeGeneratorEmittersPoolFactory.operationCanceled=\u64CD\u4F5C\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
-CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=\u30D1\u30EC\u30C3\u30C8\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
 CodeGeneratorService.invalidLanguage1=\u7121\u52B9\u306A\u8A00\u8A9E\u30BF\u30A4\u30D7\u3067\u3059\u3002
 CodeGeneratorService.invalidLanguage2=\u7121\u52B9\u306A\u8A00\u8A9E\u30BF\u30A4\u30D7\u3067\u3059\u3002
 CodeGenInit.addMarkers=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306B\u30DE\u30FC\u30AB\u30FC\u3092\u8FFD\u52A0\u4E2D
-CodeGenInit.createProject={0}\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u4F5C\u6210
-CodeGenInit.deleteProject={0}\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u524A\u9664
+CodeGenInit.createProject={0} \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210
+CodeGenInit.deleteProject={0} \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u524A\u9664
 CodeGenInit.initTemplate=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u521D\u671F\u5316
 CodeGenInit.removeLink=\u30EA\u30F3\u30AF\u3055\u308C\u305F\u30EA\u30BD\u30FC\u30B9\u306E\u524A\u9664
 CodeGenInit.saveWorkspace=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u306E\u4FDD\u5B58\u4E2D
-DocumentRootImpl.mixed= (\u4E21\u7528:
+DocumentRootImpl.mixed=\ (mixed :
 NodesSubTree.enableParallel=__ENABLE_PARALLEL__
-PoolTypeImpl.persistentPool= (persistentPool:
-TalendJetEmitter.compileFail= \u30B3\u30F3\u30D1\u30A4\u30EB\u5931\u6557: {0} : {1}
+PoolTypeImpl.persistentPool=\ (persistentPool:
+TalendJetEmitter.compileFail=\u30B3\u30F3\u30D1\u30A4\u30EB\u5931\u6557\uFF1A{0}\uFF1A{1}
 TalendJetEmitter.exception=\u4F8B\u5916
-JetFilesProviderManager.unableLoad={0}\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
+JetFilesProviderManager.unableLoad={0}JetFilesProviderManager \u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
+CodeGeneratorEmittersPoolFactory.dialogContent=JetEmitter\u751F\u6210\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F\u3001\u3053\u306E\u539F\u56E0\u3092\u907F\u3051\u308B\u305F\u3081\u306B\u3001Ctrl + Shift + F3 \u3092\u62BC\u4E0B\u3057\u3066\u518D\u5EA6\u751F\u6210\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+CodeGeneratorEmittersPoolFactory.operationCanceled=\u64CD\u4F5C\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
 ComponentsFactory.afterSystemComponent=\u30B7\u30B9\u30C6\u30E0\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u5F8C
-ComponentsFactory.componentNotFound=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D5\u30A9\u30EB\u30C0\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 \\:
-ComponentsFactory.load.components=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9...
-ComponentsFactory.parentNotRecompiled=\u8B66\u544A: *.inc.javajet\u306E\u89AA\u306F\u518D\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-ComponentsFactory.loadComponents.missingFolder=\u30D7\u30E9\u30B0\u30A4\u30F3"{1}"\u306B\u30D5\u30A9\u30EB\u30C0\u30FC"{0}"\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-ComponentsFactory.init.waitForFinish.timeout=ComponentsFactory\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\u3002\u3084\u308A\u76F4\u3057\u3066\u307F\u3066\u304F\u3060\u3055\u3044\u3002
-ComponentsLocalProviderService.componentLoadError=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30ED\u30FC\u30C9\u30A8\u30E9\u30FC
+ComponentsFactory.componentNotFound=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D5\u30A9\u30EB\u30C0\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 :
+ComponentsFactory.load.components=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30ED\u30FC\u30C9...
+ComponentsFactory.parentNotRecompiled=\u8B66\u544A: *.inc.javajet\u306E\u89AA\u304C\u30EA\u30B3\u30F3\u30D1\u30A4\u30EB\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF01
+ComponentsLocalProviderService.componentLoadError=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30ED\u30FC\u30C9\u30A8\u30E9\u30FC
 ComponentsLocalProviderService.talendExchangeError=Talend Exchange \u30A8\u30E9\u30FC
 ComponentsPreferencePage.ButtonLabel0=OK
-ComponentsPreferencePage.componentAssist=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u4F5C\u6210\u30A2\u30B7\u30B9\u30BF\u30F3\u30C8\u3092\u6709\u52B9\u5316
-ComponentsPreferencePage.configuration.LINK_STYLE=\u30C7\u30D5\u30A9\u30EB\u30C8\u30DE\u30C3\u30D4\u30F3\u30B0\u30EA\u30F3\u30AF\u306E\u8868\u793A:
+ComponentsPreferencePage.configuration.LINK_STYLE=\u30C7\u30D5\u30A9\u30EB\u30C8\u30DE\u30C3\u30D4\u30F3\u30B0\u30EA\u30F3\u30AF\u306E\u8868\u793A :
 ComponentsPreferencePage.rowLimit=\u884C\u6570\u5236\u9650
-ComponentsPreferencePage.WarningMsg=Talend Open Studio\u3092\u518D\u8D77\u52D5\u3057\u3066\u3001\u62E1\u5F35\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ComponentsPreferencePage.WarningMsg=Talend Open Studio\u3092\u518D\u8D77\u52D5\u3057\u3066\u3001\u62E1\u5F35\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3057\u307E\u3059\u3002
 ComponentsPreferencePage.WarningTitle=\u8B66\u544A
-ComponentsPreferencePage.directoryFieldLabel=\u30E6\u30FC\u30B6\u30FC\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D5\u30A9\u30EB\u30C0 \\:
-ComponentsPreferencePage.notValidDirectory=\u3053\u308C\u3092\u9078\u629E\u3059\u308B\u3068\u30D5\u30A9\u30EB\u30C0\u30FC\u304C\u30CD\u30B9\u30C8\u3055\u308C\u307E\u3059\u3002\u3053\u308C\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093\u3002 \u7D9A\u884C\u3057\u307E\u3059\u304B?,
-ComponentsPreferencePage.installComponentsFailure=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-ComponentsProviderManager.unableLoad=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D7\u30ED\u30D0\u30A4\u30C0\u306E\u30ED\u30FC\u30C9\u304C\u3067\u304D\u307E\u305B\u3093
+ComponentsPreferencePage.directoryFieldLabel=\u30E6\u30FC\u30B6\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D5\u30A9\u30EB\u30C0 :
+ComponentsProviderManager.unableLoad=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30D7\u30ED\u30D0\u30A4\u30C0\u304C\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
 ComponenttRunJobPreferencePage.label=tRunJob\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u5F8C\u3001\u5BFE\u5FDC\u30B8\u30E7\u30D6\u3092\u8868\u793A\u3057\u306A\u3044\u3002
-ComponentJobletPreferencePage.label=Joblet\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u5F8C\u3001\u5BFE\u5FDC\u30B8\u30E7\u30D6\u3092\u8868\u793A\u3057\u306A\u3044\u3002
-ComponentsPreferencePage_SuccessTitle=\u6210\u529F
-ComponentsPreferencePage_SuccessMessage1=\u65B0\u898F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3059\u308B\u305F\u3081\u306B\u306F\u3001Studio\u3092\u518D\u8D77\u52D5\u3057\u307E\u3059\u3002\u307E\u305F\u306F\u6B21\u56DE\u306E\u958B\u59CB\u6642\u306B\u30ED\u30FC\u30C9\u3055\u308C\u307E\u3059\u3002
-ComponentsPreferencePage_SuccessMessage2=\u518D\u8D77\u52D5\u3057\u307E\u3059\u304B?
-ComponentsPreferencePage.enableOnLineHelp=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30AA\u30F3\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u3092\u6709\u52B9\u5316
-ComponentsPreferencePage.titleInstallHelp=\u30AA\u30D5\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u6A5F\u80FD\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u304B?
-ComponentsPreferencePage.msgInstallHelp=\u3053\u308C\u306B\u3088\u3063\u3066\u8FFD\u52A0\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30C0\u30A4\u30A2\u30ED\u30B0\u304C\u958B\u304D\u3001\u30AA\u30D5\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u6A5F\u80FD\u304C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u307E\u3059\u3002\u7D9A\u884C\u3057\u307E\u3059\u304B?
-ComponentsPreferencePage.grpHelp=\u30D8\u30EB\u30D7
-ComponenttRunJobPreferencePage.showCorrespondingJob=tRunJob\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u5F8C\u3001\u5BFE\u5FDC\u30B8\u30E7\u30D6\u3092\u8868\u793A\u3059\u308B\u3002
+ComponentJobletPreferencePage.label=\u30B8\u30E7\u30D6\u30EC\u30C3\u30C8\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u3057\u305F\u5F8C\u306B\u5BFE\u5FDC\u3059\u308B\u30B8\u30E7\u30D6\u3092\u8868\u793A\u3057\u306A\u3044\u3002
+ComponenttRunJobPreferencePage.showCorrespondingJob=tRunJob\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u5F8C\u3001\u5BFE\u5FDC\u30B8\u30E7\u30D6\u3092\u8868\u793A\u3059\u308B
 XsdValidationCacheManager.unableLoadxsd=XSD\u30D0\u30EA\u30C7\u30FC\u30B7\u30E7\u30F3\u306E\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093\u3002
 XsdValidationCacheManager.unableSavexsd=XSD\u30D0\u30EA\u30C7\u30FC\u30B7\u30E7\u30F3\u306E\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
 prefs.configuration.LINK_STYLE.AUTO=\u81EA\u52D5
 prefs.configuration.LINK_STYLE.BEZIER_CURVE=\u66F2\u7DDA
-prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA\uFF08\u9AD8\u901F\uFF09
+prefs.configuration.LINK_STYLE.LINE=Lines (fast)
 FAMILY.AS400=AS400
-FAMILY.Access=\u30A2\u30AF\u30BB\u30B9
+FAMILY.Access=Access
 FAMILY.Alfresco=Alfresco
-FAMILY.Business=\u30D3\u30B8\u30CD\u30B9
+FAMILY.Business=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3
 FAMILY.Business_Intelligence=\u30D3\u30B8\u30CD\u30B9\u30A4\u30F3\u30C6\u30EA\u30B8\u30A7\u30F3\u30B9
 FAMILY.CentricCRM=CentricCRM
 FAMILY.Charts=\u30C1\u30E3\u30FC\u30C8
-FAMILY.Connections=\u63A5\u7D9A
+FAMILY.Connections=\u63A5\u7D9A\u8A2D\u5B9A
 FAMILY.Custom_Code=\u30AB\u30B9\u30BF\u30E0\u30B3\u30FC\u30C9
 FAMILY.DB2=DB2
 FAMILY.DB_Generic=\u6C4E\u7528ODBC
 FAMILY.DB_JDBC=\u6C4E\u7528JDBC
 FAMILY.DB_SCD=DB SCD
 FAMILY.Data_Quality=\u30C7\u30FC\u30BF\u30AF\u30AA\u30EA\u30C6\u30A3
-FAMILY.Data_Privacy=\u30C7\u30FC\u30BF\u30D7\u30E9\u30A4\u30D0\u30B7\u30FC
 FAMILY.Databases=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
 FAMILY.ELT=ELT
 FAMILY.ESB=ESB
 FAMILY.EXASolution=EXASolution
 FAMILY.eXist=eXist
-FAMILY.FTP=FTP
-FAMILY.Fields=\u30D5\u30A3\u30FC\u30EB\u30C9
+FAMILY.FTP=ftp
+FAMILY.Fields=\u9805\u76EE\u5024
 FAMILY.File=\u30D5\u30A1\u30A4\u30EB
-FAMILY.FireBird=FireBird
+FAMILY.FireBird=Firebird
 FAMILY.Greenplum=Greenplum
-FAMILY.HSQLDb=HSQLDb
-FAMILY.Healthcare=Healthcare
+FAMILY.HSQLDb=HSQLdb
+FAMILY.Healthcare=\u30D8\u30EB\u30B9\u30B1\u30A2
 FAMILY.Hive=Hive
 FAMILY.Informix=Informix
 FAMILY.Ingres=Ingres
-FAMILY.Input=\u5165\u529B
+FAMILY.Input=\u30D5\u30A1\u30A4\u30EB\u5165\u529B
 FAMILY.Interbase=Interbase
 FAMILY.Internet=\u30A4\u30F3\u30BF\u30FC\u30CD\u30C3\u30C8
 FAMILY.Jasper=Jasper
@@ -127,13 +111,13 @@ FAMILY.Netezza=Netezza
 FAMILY.OLAP_Cube=OLAP\u30AD\u30E5\u30FC\u30D6
 FAMILY.Oracle=Oracle
 FAMILY.Orchestration=\u30D7\u30ED\u30BB\u30B9\u5236\u5FA1
-FAMILY.Output=\u51FA\u529B
+FAMILY.Output=\u30D5\u30A1\u30A4\u30EB\u51FA\u529B
 FAMILY.ParAccel=ParAccel
 FAMILY.PostgreSQL=PostgreSQL
 FAMILY.PostgresPlus=PostgresPlus
-FAMILY.Processing=\u51E6\u7406\u4E2D
+FAMILY.Processing=\u5909\u63DB\u51E6\u7406
 FAMILY.SAP=SAP
-FAMILY.Sas=Sas
+FAMILY.Sas=SAS
 FAMILY.SCD=SCD
 FAMILY.SCP=SCP
 FAMILY.SPSS=SPSS
@@ -146,4 +130,19 @@ FAMILY.Technical=\u30C6\u30AF\u30CB\u30AB\u30EB
 FAMILY.Teradata=Teradata
 FAMILY.Vertica=Vertica
 FAMILY.VtigerCRM=VtigerCRM
-FAMILY.XML=XML
+FAMILY.XML=XML\u30D5\u30A1\u30A4\u30EB
+CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=\u30D1\u30EC\u30C3\u30C8\u3092\u66F4\u65B0
+ComponentsPreferencePage.componentAssist=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u4F5C\u6210\u30A2\u30B7\u30B9\u30BF\u30F3\u30C8\u3092\u6709\u52B9\u5316
+ComponentsPreferencePage.notValidDirectory=\u3053\u308C\u3092\u9078\u629E\u3059\u308B\u3068\u30D5\u30A9\u30EB\u30C0\u30FC\u304C\u30CD\u30B9\u30C8\u3055\u308C\u307E\u3059\u3002\u3053\u308C\u306F\u63A8\u5968\u3055\u308C\u307E\u305B\u3093\u3002 \u7D9A\u884C\u3057\u307E\u3059\u304B?
+ComponentsFactory.loadComponents.missingFolder=\u30D7\u30E9\u30B0\u30A4\u30F3"{1}"\u5185\u306B\u30D5\u30A9\u30EB\u30C0\u30FC"{0}"\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+ComponentsPreferencePage_SuccessTitle=\u6210\u529F
+ComponentsPreferencePage_SuccessMessage1=\u65B0\u898F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30ED\u30FC\u30C9\u3059\u308B\u305F\u3081\u306B\u306F\u3001Studio\u3092\u518D\u8D77\u52D5\u3057\u307E\u3059\u3002\u53C8\u306F\u6B21\u56DE\u306E\u958B\u59CB\u6642\u306B\u30ED\u30FC\u30C9\u3055\u308C\u307E\u3059\u3002
+ComponentsPreferencePage_SuccessMessage2=\u518D\u8D77\u52D5\u3057\u307E\u3059\u304B\uFF1F
+ComponentsPreferencePage.installComponentsFailure=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u306B\u5931\u6557\u3057\u307E\u3057\u305F
+generatedcode.copyright.body1=\u3053\u306E\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306F{0}\u306B\u3088\u3063\u3066\u81EA\u52D5\u7684\u306B\u751F\u6210\u3055\u308C\u307E\u3057\u305F
+ComponentsFactory.init.waitForFinish.timeout=ComponentsFactory\u3092\u521D\u671F\u5316\u3067\u304D\u307E\u305B\u3093\u3002\u3082\u3046\u4E00\u5EA6\u8A66\u3057\u3066\u4E0B\u3055\u3044\u3002
+FAMILY.Data_Privacy=\u30C7\u30FC\u30BF\u30D7\u30E9\u30A4\u30D0\u30B7\u30FC
+ComponentsPreferencePage.enableOnLineHelp=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30AA\u30F3\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u3092\u6709\u52B9\u5316
+ComponentsPreferencePage.titleInstallHelp=\u30AA\u30D5\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u6A5F\u80FD\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u304B?
+ComponentsPreferencePage.msgInstallHelp=\u3053\u308C\u306B\u3088\u3063\u3066\u8FFD\u52A0\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30C0\u30A4\u30A2\u30ED\u30B0\u304C\u958B\u304D\u3001\u30AA\u30D5\u30E9\u30A4\u30F3\u30D8\u30EB\u30D7\u6A5F\u80FD\u304C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u307E\u3059\u3002\u7D9A\u884C\u3057\u307E\u3059\u304B?
+ComponentsPreferencePage.grpHelp=\u30D8\u30EB\u30D7

main/plugins/org.talend.designer.codegen/src/main/java/messages_zh_CN.properties

@@ -1,35 +1,30 @@
-generatedcode.copyright.title=\u7248\u6743\u6240\u6709 (c) 2005-2011\uFF0CTalend Inc.
-generatedcode.copyright.body1=\u6B64\u6E90\u4EE3\u7801\u5DF2\u7531 {0} \u81EA\u52A8\u751F\u6210
-generatedcode.copyright.body2=/ \u4F5C\u4E1A\u8BBE\u8BA1 (CodeGenerator version {0}).
-generatedcode.copyright.body3=\u4F60\u53EF\u4EE5\u5728www.talend.com\u53D1\u73B0\u66F4\u591A\u5173\u4E8ETalend\u4EA7\u54C1\u4FE1\u606F
-generatedcode.copyright.body4=\u4F60\u53EF\u4EE5\u5728\u5728GNU LGPL \u8BB8\u53EF\u8BC1\u4E0B\u652F\u914D\u8FD9\u4E9B\u4EE3\u7801
-generatedcode.copyright.body5=(http://www.gnu.org/licenses/lgpl.html)\u3002
+JavaRoutineSynchronizer.UnsupportedOperation.Exception1=\u65B9\u6CD5\u672A\u5B9E\u65BD\uFF1Aorg.talend.designer.codegen.JavaRoutineSynchronizer line:49
+CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=JETEmitters\u5DE5\u7A0B\u4E0D\u5B58\u5728\uFF0C\u9700\u8981\u91CD\u65B0\u5B8C\u6574\u521D\u59CB\u5316\u3002
 generatedcode.footerprocess.nbcharsgenerated=\u7531 {1} \u751F\u6210\u7684 {0} \u4E2A\u5B57\u7B26
+CodeGeneratorEmittersPoolFactory.Class.NotFound=\u6A21\u677F\u4F9D\u7136\u5B58\u5728\uFF0C\u4F46\u662F\u7C7B{0}
+CodeGeneratorEmittersPoolFactory.PersitentData.Error=\u6301\u4E45\u5316\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58\uFF1A
+generatedcode.copyright.title=\u7248\u6743\u6240\u6709 (c) 2005-2011\uFF0CTalend Inc.
+CodeGeneratorEmittersPoolFactory.initMessage=\u751F\u6210\u5F15\u64CE\u6B63\u5728\u521D\u59CB\u5316...
+generatedcode.copyright.body5=(http://www.gnu.org/licenses/lgpl.html)\u3002
+EmfEmittersPersistence.CodeGen.DataMissing=\u4EE3\u7801\u751F\u6210\u6570\u636E\u6D41\u5931\uFF0C\u5F00\u59CB\u91CD\u65B0\u751F\u6210\u4EE3\u7801\u3002
+CodeGenerator.JET.TimeOut=JET \u521D\u59CB\u5316\u8D85\u65F6
+generatedcode.copyright.body4=\u4F60\u53EF\u4EE5\u5728\u5728GNU LGPL \u8BB8\u53EF\u8BC1\u4E0B\u652F\u914D\u8FD9\u4E9B\u4EE3\u7801
+CodeGenerator.Node.NotFound=\u5728\u5F53\u524D
+generatedcode.copyright.body3=\u4F60\u53EF\u4EE5\u5728www.talend.com\u53D1\u73B0\u66F4\u591A\u5173\u4E8ETalend\u4EA7\u54C1\u4FE1\u606F
+EmittersPoolFactoryImpl.Class.IllegalArg=\u7C7B \' {0}\' \u4E0D\u662F\u4E00\u4E2A\u6709\u6548\u7684\u5206\u7C7B\u5668
+generatedcode.copyright.body2=/ \u4F5C\u4E1A\u8BBE\u8BA1 (CodeGenerator version {0}).
+JavaRoutineSynchronizer.UnsupportedOperation.Exception2=\u65B9\u6CD5\u672A\u5B9E\u65BD\uFF1Aorg.talend.designer.codegen.JavaRoutineSynchronizer line:58
 CodeGenerator.getGraphicalNode1=\u8FDB\u7A0B\u5F97\u5230\u56FE\u5F62\u8282\u70B9\uFF08\uFF09
 CodeGenerator.getGraphicalNode2=\u8FDB\u7A0B\u5F97\u5230\u751F\u6210\u8282\u70B9\uFF08\uFF09
-CodeGenerator.JET.TimeOut=JET \u521D\u59CB\u5316\u8D85\u65F6
-CodeGenerator.newLine=\n\n\n\n
-CodeGenerator.Node.NotFound=\u5728\u5F53\u524D
-CodeGenerator.Components.NotFound={0}: \u7EC4\u4EF6\u7F3A\u5931: {1}; \u5728 Studio \u6216\u547D\u4EE4\u884C\u4E2D\u4F7F\u7528 -D{2}=false \u53EF\u8DF3\u8FC7\u6B64\u9879\u68C0\u67E5\uFF0C\u540C\u65F6\u89E6\u53D1\u8B66\u544A\u6D88\u606F\u3002
-JavaRoutineSynchronizer.UnsupportedOperation.Exception1=\u65B9\u6CD5\u672A\u5B9E\u65BD\uFF1Aorg.talend.designer.codegen.JavaRoutineSynchronizer line:49
-JavaRoutineSynchronizer.UnsupportedOperation.Exception2=\u65B9\u6CD5\u672A\u5B9E\u65BD\uFF1Aorg.talend.designer.codegen.JavaRoutineSynchronizer line:58
+CodeGenerator.newLine=\\n\\n\\n\\n
 JetSkeletonManager.unableLoad=\u65E0\u6CD5\u52A0\u8F7D\u4E3B\u5E72\u66F4\u65B0\u7F13\u5B58\u6587\u4EF6
 JetSkeletonManager.unableSave=\u65E0\u6CD5\u4FDD\u5B58\u4E3B\u5E72\u66F4\u65B0\u7F13\u5B58\u6587\u4EF6
 JetSkeletonManager.updateProblem=\u5F53\u66F4\u65B0\u6301\u4E45\u6570\u636E\u65F6\u51FA\u73B0\u9519\u8BEF
-EmfEmittersPersistence.CodeGen.DataMissing=\u4EE3\u7801\u751F\u6210\u6570\u636E\u6D41\u5931\uFF0C\u5F00\u59CB\u91CD\u65B0\u751F\u6210\u4EE3\u7801\u3002
-CodeGeneratorEmittersPoolFactory.PersitentData.Error=\u6301\u4E45\u5316\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58\uFF1A
-CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=JETEmitters\u5DE5\u7A0B\u4E0D\u5B58\u5728\uFF0C\u9700\u8981\u91CD\u65B0\u5B8C\u6574\u521D\u59CB\u5316\u3002
-CodeGeneratorEmittersPoolFactory.Class.NotFound=\u6A21\u677F\u4F9D\u7136\u5B58\u5728\uFF0C\u4F46\u662F\u7C7B{0}
 CodeGeneratorEmittersPoolFactory.codeThread=\u4EE3\u7801\u751F\u6210\u540E\u53F0\u7EBF\u7A0B
 CodeGeneratorEmittersPoolFactory.componentCompiled=\u7EC4\u4EF6\u7F16\u8BD1{0}\u6BEB\u79D2
-CodeGeneratorEmittersPoolFactory.dialogContent=\u4E3A\u4E86\u907F\u514D\u4EA7\u751F\u95EE\u9898\uFF0C\u8BF7\u6309Ctrl+Shift+F3\u6765\u518D\u6B21\u751F\u6210\uFF01
-CodeGeneratorEmittersPoolFactory.failCompail=\u7EC4\u4EF6\u7F16\u8BD1\u5931\u8D25: \r\n
-EmittersPoolFactoryImpl.Class.IllegalArg=\u7C7B ' {0}' \u4E0D\u662F\u4E00\u4E2A\u6709\u6548\u7684\u5206\u7C7B\u5668
+CodeGeneratorEmittersPoolFactory.failCompail=\u7EC4\u4EF6\u7F16\u8BD1\u5931\u8D25: \\r\\n
 CodeGeneratorEmittersPoolFactory.initialException=\u521D\u59CB\u5316\u5F02\u5E38
-CodeGeneratorEmittersPoolFactory.initMessage=\u751F\u6210\u5F15\u64CE\u6B63\u5728\u521D\u59CB\u5316...
 CodeGeneratorEmittersPoolFactory.jetEmitterInitialException=\u521D\u59CB\u5316JetEmitter\u51FA\u9519
-CodeGeneratorEmittersPoolFactory.operationCanceled=\u64CD\u4F5C\u5DF2\u53D6\u6D88
-CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=\u66F4\u65B0\u7F16\u8F91\u5668\u7684\u8C03\u8272\u677F
 CodeGeneratorService.invalidLanguage1=\u65E0\u6548\u7684\u8BED\u8A00\u7C7B\u578B\u3002
 CodeGeneratorService.invalidLanguage2=\u65E0\u6548\u7684\u8BED\u8A00\u7C7B\u578B\u3002
 CodeGenInit.addMarkers=\u5DE5\u4F5C\u533A\u4E2D\u6DFB\u52A0\u6807\u8BB0
@@ -38,39 +33,29 @@ CodeGenInit.deleteProject=\u5220\u9664{0} \u5DE5\u7A0B
 CodeGenInit.initTemplate=\u521D\u59CB\u5316\u6A21\u677F
 CodeGenInit.removeLink=\u5220\u9664\u8FDE\u63A5\u8D44\u6E90
 CodeGenInit.saveWorkspace=\u4FDD\u5B58\u5DE5\u4F5C\u533A
-DocumentRootImpl.mixed= (\u6DF7\u5408:
+DocumentRootImpl.mixed=\\ (\u6DF7\u5408:
 NodesSubTree.enableParallel=__ENABLE_PARALLEL__
-PoolTypeImpl.persistentPool= (persistentPool:
-TalendJetEmitter.compileFail= \u7F16\u8BD1\u5931\u8D25\uFF1A{0} : {1}
+PoolTypeImpl.persistentPool=\\ (persistentPool:
+TalendJetEmitter.compileFail=\\ \u7F16\u8BD1\u5931\u8D25\uFF1A{0} : {1}
 TalendJetEmitter.exception=\u5F02\u5E38
-JetFilesProviderManager.unableLoad=\u65E0\u6CD5\u52A0\u8F7D {0}
+JetFilesProviderManager.unableLoad=\u65E0\u6CD5\u52A0\u8F7D {0}JetFilesProviderManager.unableLoad
+CodeGeneratorEmittersPoolFactory.dialogContent=\u4E3A\u4E86\u907F\u514D\u4EA7\u751F\u95EE\u9898\uFF0C\u8BF7\u6309Ctrl+Shift+F3\u6765\u518D\u6B21\u751F\u6210\uFF01
+CodeGeneratorEmittersPoolFactory.operationCanceled=\u64CD\u4F5C\u5DF2\u53D6\u6D88
 ComponentsFactory.afterSystemComponent=\u5728\u7CFB\u7EDF\u7EC4\u4EF6\u4E4B\u540E
 ComponentsFactory.componentNotFound=\u627E\u4E0D\u5230\u7EC4\u4EF6\u6587\u4EF6\u5939:
 ComponentsFactory.load.components=\u52A0\u8F7D\u7EC4\u4EF6...
 ComponentsFactory.parentNotRecompiled=\u8B66\u544A\uFF1A*.inc.javajet \u7684\u7236\u7EA7\u6CA1\u6709\u91CD\u65B0\u7F16\u8BD1
-ComponentsFactory.loadComponents.missingFolder=\u6587\u4EF6\u5939 "{0}" \u7F3A\u5C11\u63D2\u4EF6 "{1}".
-ComponentsFactory.init.waitForFinish.timeout=\u65E0\u6CD5\u521D\u59CB\u5316 ComponentsFactory\uFF0C\u8BF7\u91CD\u8BD5\u3002
 ComponentsLocalProviderService.componentLoadError=\u7EC4\u4EF6\u52A0\u8F7D\u9519\u8BEF
 ComponentsLocalProviderService.talendExchangeError=Talend Exchange \u9519\u8BEF
-ComponentsPreferencePage.ButtonLabel0=\u786E\u8BA4
-ComponentsPreferencePage.componentAssist=\u542F\u7528\u7EC4\u4EF6\u521B\u5EFA\u52A9\u624B
+ComponentsPreferencePage.ButtonLabel0=\u786E\u5B9A
 ComponentsPreferencePage.configuration.LINK_STYLE=\u9ED8\u8BA4\u6620\u5C04\u8FDE\u63A5\u663E\u793A\u4E3A:
 ComponentsPreferencePage.rowLimit=\u884C\u9650\u5236
 ComponentsPreferencePage.WarningMsg=\u60A8\u9700\u8981\u91CD\u65B0\u542F\u52A8Talend Open Studio\u4EE5\u52A0\u8F7D\u989D\u5916\u7684\u7EC4\u4EF6\u3002
 ComponentsPreferencePage.WarningTitle=\u8B66\u544A
 ComponentsPreferencePage.directoryFieldLabel=\u7528\u6237\u7EC4\u4EF6\u6587\u4EF6\u5939:
-ComponentsPreferencePage.notValidDirectory=\u60A8\u7684\u9009\u62E9\u5C06\u5BFC\u81F4\u6587\u4EF6\u5939\u5D4C\u5957\uFF0C\u8FD9\u662F\u4E0D\u63A8\u8350\u7684\u3002 \u4F60\u60F3\u7EE7\u7EED\u5417\uFF1F
-ComponentsPreferencePage.installComponentsFailure=\u5B89\u88C5\u7EC4\u4EF6\u5931\u8D25
 ComponentsProviderManager.unableLoad=\u65E0\u6CD5\u52A0\u8F7D\u7EC4\u4EF6\u63D0\u4F9B\u7A0B\u5E8F
 ComponenttRunJobPreferencePage.label=\u53CC\u51FB tRunJob \u7EC4\u4EF6\u540E\uFF0C\u4E0D\u663E\u793A\u5BF9\u5E94\u7684\u4F5C\u4E1A
 ComponentJobletPreferencePage.label=\u53CC\u51FB\u5C0F\u4F5C\u4E1A\u7EC4\u4EF6\u540E\uFF0C\u4E0D\u663E\u793A\u76F8\u5E94\u7684\u4F5C\u4E1A\u3002
-ComponentsPreferencePage_SuccessTitle=\u6210\u529F
-ComponentsPreferencePage_SuccessMessage1=\u9700\u8981\u91CD\u542FStudio\u6765\u52A0\u8F7D\u7EC4\u4EF6\u3002\u5426\u5219\uFF0C\u4F1A\u5728\u4E0B\u6B21\u542F\u52A8\u65F6\u52A0\u8F7D\u3002
-ComponentsPreferencePage_SuccessMessage2=\u60A8\u60F3\u8981\u9A6C\u4E0A\u91CD\u542F\u5417\uFF1F
-ComponentsPreferencePage.enableOnLineHelp=\u542F\u7528\u7EC4\u4EF6\u7684\u5728\u7EBF\u5E2E\u52A9
-ComponentsPreferencePage.titleInstallHelp=\u5B89\u88C5\u79BB\u7EBF\u5E2E\u52A9\u529F\u80FD\uFF1F
-ComponentsPreferencePage.msgInstallHelp=\u8FD9\u4F1A\u6253\u5F00\u5176\u4ED6\u8F6F\u4EF6\u5305\u5BF9\u8BDD\u6846\u4EE5\u5B89\u88C5\u79BB\u7EBF\u5E2E\u52A9\u529F\u80FD\uFF0C\u662F\u5426\u7EE7\u7EED\uFF1F
-ComponentsPreferencePage.grpHelp=\u5E2E\u52A9
 ComponenttRunJobPreferencePage.showCorrespondingJob=\u53CC\u51FB tRunJob \u7EC4\u4EF6\u540E\u663E\u793A\u5BF9\u5E94\u4F5C\u4E1A
 XsdValidationCacheManager.unableLoadxsd=\u65E0\u6CD5\u52A0\u8F7D xsd \u9A8C\u8BC1\u7F13\u5B58\u6587\u4EF6
 XsdValidationCacheManager.unableSavexsd=\u65E0\u6CD5\u4FDD\u5B58 xsd \u9A8C\u8BC1\u7F13\u5B58\u6587\u4EF6
@@ -91,7 +76,6 @@ FAMILY.DB_Generic=\u6570\u636E\u5E93\u901A\u7528
 FAMILY.DB_JDBC=DB JDBC
 FAMILY.DB_SCD=DB SCD
 FAMILY.Data_Quality=Data Quality
-FAMILY.Data_Privacy=\u6570\u636E\u9690\u79C1
 FAMILY.Databases=\u6570\u636E\u5E93
 FAMILY.ELT=ELT
 FAMILY.ESB=ESB
@@ -100,7 +84,7 @@ FAMILY.eXist=eXist
 FAMILY.FTP=FTP
 FAMILY.Fields=\u5B57\u6BB5
 FAMILY.File=\u6587\u4EF6
-FAMILY.FireBird=FireBird
+FAMILY.FireBird=Firebird
 FAMILY.Greenplum=Greenplum
 FAMILY.HSQLDb=HSQLdb
 FAMILY.Healthcare=Healthcare
@@ -147,3 +131,18 @@ FAMILY.Teradata=Teradata
 FAMILY.Vertica=Vertica
 FAMILY.VtigerCRM=VtigerCRM
 FAMILY.XML=XML
+CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=\u66F4\u65B0\u7F16\u8F91\u5668\u7684\u8C03\u8272\u677F
+ComponentsPreferencePage.componentAssist=\u542F\u7528\u7EC4\u4EF6\u521B\u5EFA\u52A9\u624B
+ComponentsPreferencePage.notValidDirectory=\u60A8\u7684\u9009\u62E9\u5C06\u5BFC\u81F4\u6587\u4EF6\u5939\u5D4C\u5957\uFF0C\u8FD9\u662F\u4E0D\u63A8\u8350\u7684\u3002 \u4F60\u60F3\u7EE7\u7EED\u5417\uFF1F
+ComponentsFactory.loadComponents.missingFolder=\u6587\u4EF6\u5939 \"{0}\" \u7F3A\u5C11\u63D2\u4EF6 \"{1}\".
+ComponentsPreferencePage_SuccessTitle=\u6210\u529F
+ComponentsPreferencePage_SuccessMessage1=\u9700\u8981\u91CD\u542FStudio\u6765\u52A0\u8F7D\u7EC4\u4EF6\u3002\u5426\u5219\uFF0C\u4F1A\u5728\u4E0B\u6B21\u542F\u52A8\u65F6\u52A0\u8F7D\u3002
+ComponentsPreferencePage_SuccessMessage2=\u60A8\u60F3\u8981\u9A6C\u4E0A\u91CD\u542F\u5417\uFF1F
+ComponentsPreferencePage.installComponentsFailure=\u5B89\u88C5\u7EC4\u4EF6\u5931\u8D25
+generatedcode.copyright.body1=\u6B64\u6E90\u4EE3\u7801\u5DF2\u7531 {0} \u81EA\u52A8\u751F\u6210
+ComponentsFactory.init.waitForFinish.timeout=\u65E0\u6CD5\u521D\u59CB\u5316 ComponentsFactory\uFF0C\u8BF7\u91CD\u8BD5\u3002
+FAMILY.Data_Privacy=\u6570\u636E\u9690\u79C1
+ComponentsPreferencePage.enableOnLineHelp=\u542F\u7528\u7EC4\u4EF6\u7684\u5728\u7EBF\u5E2E\u52A9
+ComponentsPreferencePage.titleInstallHelp=\u5B89\u88C5\u79BB\u7EBF\u5E2E\u52A9\u529F\u80FD\uFF1F
+ComponentsPreferencePage.msgInstallHelp=\u8FD9\u4F1A\u6253\u5F00\u5176\u4ED6\u8F6F\u4EF6\u5305\u5BF9\u8BDD\u6846\u4EE5\u5B89\u88C5\u79BB\u7EBF\u5E2E\u52A9\u529F\u80FD\uFF0C\u662F\u5426\u7EE7\u7EED\uFF1F
+ComponentsPreferencePage.grpHelp=\u5E2E\u52A9

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/CodeGenerator.java

@@ -66,7 +66,6 @@ import org.talend.designer.codegen.model.CodeGeneratorEmittersPoolFactory;
 import org.talend.designer.codegen.model.CodeGeneratorInternalTemplatesFactoryProvider;
 import org.talend.designer.codegen.proxy.JetProxy;
 import org.talend.designer.core.generic.model.Component;
-import org.talend.designer.core.model.components.DummyComponent;
 import org.talend.designer.runprocess.ProcessorUtilities;
 
 /**
@@ -846,25 +845,6 @@ public class CodeGenerator implements ICodeGenerator {
             IComponentFileNaming componentFileNaming = ComponentsFactoryProvider.getFileNamingInstance();
 
             IComponent component = node.getComponent();
-            if (component instanceof DummyComponent) {
-                if (((DummyComponent) component).isMissingComponent()) {
-                    String processName = "";
-                    try {
-                        IProcess proc = node.getProcess();
-                        processName = proc.getName() + " " + proc.getVersion();
-                    } catch (Exception e) {
-                        ExceptionHandler.process(e);
-                    }
-                    if (IProcess.ERR_ON_COMPONENT_MISSING) {
-                        throw new CodeGeneratorException(Messages.getString("CodeGenerator.Components.NotFound", processName,
-                                component.getName(), IProcess.PROP_ERR_ON_COMPONENT_MISSING));
-                    }
-                    if (ECodePart.BEGIN.equals(part)) {
-                        log.warn(Messages.getString("CodeGenerator.Components.NotFound", processName, component.getName(),
-                                IProcess.PROP_ERR_ON_COMPONENT_MISSING));
-                    }
-                }
-            }
             // some code unification to handle all component types the same way.
             String templateURI = component.getTemplateFolder() + TemplateUtil.DIR_SEP
                     + componentFileNaming.getJetFileName(component.getTemplateNamePrefix(), language.getExtension(), part);

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/model/EmfEmittersPersistence.java

@@ -17,10 +17,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InvalidClassException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -118,18 +116,7 @@ public class EmfEmittersPersistence {
             ByteArrayInputStream stream = new ByteArrayInputStream(poolAsBytes);
             if (stream.available() > 0) {
                 try {
-                    ObjectInputStream oin = new ObjectInputStream(stream) {
-                        @Override
-                        protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
-                            // Enforce that we are only deserializing a list of LightJetBeans
-                            if (!(desc.getName().startsWith("java.util")
-                                    || LightJetBean.class.getName().equals(desc.getName())
-                                    || String.class.getName().equals(desc.getName()))) {
-                                throw new InvalidClassException("Unauthorized deserialization attempt", desc.getName());
-                            }
-                            return super.resolveClass(desc);
-                        }
-                    };
+                    ObjectInputStream oin = new ObjectInputStream(stream);
                     emittersToReturn = (List<LightJetBean>) oin.readObject();
                     oin.close();
                     return emittersToReturn;

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/model/JetSkeletonManager.java

@@ -20,10 +20,8 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InvalidClassException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -173,17 +171,7 @@ public final class JetSkeletonManager {
         BufferedInputStream bufferedInputStream = null;
         try {
             bufferedInputStream = new BufferedInputStream(new FileInputStream(file));
-            ObjectInputStream objectIn = new ObjectInputStream(bufferedInputStream) {
-                @Override
-                protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
-                    // Enforce the types that we are about to deserialize
-                    if (!(desc.getName().startsWith("java.util") || Number.class.getName().equals(desc.getName()) || Long.class.getName().equals(desc.getName())
-                            || String.class.getName().equals(desc.getName()))) {
-                        throw new InvalidClassException("Unauthorized deserialization attempt", desc.getName());
-                    }
-                    return super.resolveClass(desc);
-                }
-            };
+            ObjectInputStream objectIn = new ObjectInputStream(bufferedInputStream);
             alreadyCheckedSkeleton = (Map<String, Long>) objectIn.readObject();
         } catch (Exception e) {
             throw e;

main/plugins/org.talend.designer.components.exchange/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Exchange Plug-in
 Bundle-SymbolicName: org.talend.designer.components.exchange;singleton:=true
-Bundle-Version: 8.8.8.qualifier
+Bundle-Version: 8.0.1.M12
 Bundle-Activator: org.talend.designer.components.exchange.ExchangePlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,

main/plugins/org.talend.designer.components.exchange/plugin_en.properties

@@ -0,0 +1,5 @@
+Exchange=Exchange
+DownloadComponenentsAction.Label=Download Selected Components
+RefreshComponenentsAction.Label=Refresh Components List
+providerName=www.example.org
+pluginName=Exchange Model

main/plugins/org.talend.designer.components.exchange/plugin_fr.properties

@@ -1,5 +1,5 @@
 Exchange=Exchange
 DownloadComponenentsAction.Label=T\u00E9l\u00E9charger les composants s\u00E9lectionn\u00E9s
-RefreshComponenentsAction.Label=Actualiser la liste des composants
+RefreshComponenentsAction.Label=Rafra\u00EEchir la liste des composants
 providerName=www.example.org
 pluginName=Mod\u00E8le Exchange

main/plugins/org.talend.designer.components.exchange/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.talend.studio</groupId>
     <artifactId>tdi-studio-se</artifactId>
-    <version>8.8.8-SNAPSHOT</version>
+    <version>8.0.1-M12</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange</artifactId>

main/plugins/org.talend.designer.components.exchange/src/main/java/messages_en.properties

@@ -0,0 +1,101 @@
+ExchangeView.Exchange=Exchange
+AvailableExtensionsComposite.ExtensionName=Extension Name
+AvailableExtensionsComposite.Version=Version
+AvailableExtensionsComposite.Rating=Rating
+AvailableExtensionsComposite.Author=Author
+AvailableExtensionsComposite.FilterTitle=Filter
+AvailableExtensionsComposite.ViewDetail.installOperateStatus=Install
+AvailableExtensionsComposite.ViewDetail.WriteReview=Write a review
+AvailableExtensionsComposite.ViewDetail.InsertionReviewFailure=Insertion Review failure.
+AvailableExtensionsComposite.ViewDetail.InsertionReviewFailureTip=You should check it.
+DownloadedExtensionsComposite.ExtensionName=Extension Name
+DownloadedExtensionsComposite.DownloadedVersion=Downloaded Version
+DownloadedExtensionsComposite.DownloadDate=Download Date
+DownloadedExtensionsComposite.OperateStatus=Operate Status
+DownloadedExtensionsComposite.installOperateStatus=Install
+DownloadedExtensionsComposite.installedOperateStatus=Installed
+DownloadedExtensionsComposite.updateOperateStatus=Update
+MyExtensionsComposite.ExtensionName=Extension Name
+MyExtensionsComposite.Version=Version
+MyExtensionsComposite.UploadDate=Upload Date
+MyExtensionsComposite.AddNewExtensionTitle=Add New Extension
+MyExtensionsComposite.UpLoadNewVersionOperateStatus=Upload New Version
+MyExtensionsComposite.UpdateOperateStatus=Update
+MyExtensionsComposite.ModifyOperateStatus=Modify
+MyExtensionsComposite.DeleteOperateStatus=Delete
+MyExtensionsComposite.Form.Return=Return
+MyExtensionsComposite.Form.ExtensionTitle=Extension Title
+MyExtensionsComposite.Form.InitialVersion=Initial Version
+MyExtensionsComposite.Form.Compatibility=Compatibility
+MyExtensionsComposite.Form.Compatibility.AllVersions=All versions
+MyExtensionsComposite.Form.Compatibility.Version=Version
+MyExtensionsComposite.Form.Compatibility.AndOlder=and older
+MyExtensionsComposite.Form.Compatibility.AndNewer=and newer
+MyExtensionsComposite.Form.Compatibility.AllVersionsExcept=All versions except:
+MyExtensionsComposite.Form.Compatibility.OnlyTheseVersions=Only these versions:
+MyExtensionsComposite.Form.Description=Description
+MyExtensionsComposite.Form.Visibility=Visibility
+MyExtensionsComposite.Form.Visibility.Public=Public(visible by all)
+MyExtensionsComposite.Form.Visibility.Private=Private(visible by me)
+MyExtensionsComposite.Form.Upload=Upload
+MyExtensionsComposite.Form.Upload.SelectAnItem=Select an item from the currently open project
+MyExtensionsComposite.Form.Upload.File=File:
+MyExtensionsComposite.Form.Upload.Browse=Browse...
+MyExtensionsComposite.Form.Upload.Browse.SelectFile=Select a File of the extension to upload
+MyExtensionsComposite.Form.DeleteExtensionTile=Delete Extension
+MyExtensionsComposite.Form.DeleteExtensionMessage=Are you sure you want to delete this Extension?
+MyExtensionsComposite.Form.UploadExtension=Upload Extension
+MyExtensionsComposite.Form.UpdateExtension=Update Extension
+MyExtensionsComposite.Form.ModifyExtension=Modify Extension
+RefreshJob.FindExtensions.Title=Finding available extensions
+RefreshJob.FindExtensions.Message=Finding extensions from exchange...
+ShowContributedExtensionsJob.ShowContributedExtensions.Title=Finding contributed extensions
+ShowContributedExtensionsJob.ShowContributedExtensions.Message=Finding contributed extensions from exchange...
+ShowInstalledExtensionsJob.ShowInstalledExtensions.Title=Finding installed extensions
+ShowInstalledExtensionsJob.ShowInstalledExtensions.Message=Finding installed extensions from exchange...
+DeleteExtensionJob.DeleteExtensionJob.Title=Delete an extension...
+DeleteExtensionJob.DeleteExtensionJob.Message=Delete an extension...
+DeleteExtensionJob.DeleteFailure=Delete failure.
+DeleteExtensionJob.DeleteFailureTip=You should check it.
+ModifyExtensionJob.Title=Modify an extension...
+ModifyExtensionJob.Message=Modify an extension...
+ModifyExtensionJob.ModifyFailure=Modify failure.
+ModifyExtensionJob.ModifyFailureTip=You should check it.
+InstalledExtensionJob.Title=Installed an extension...
+InstalledExtensionJob.Message=Installed an extension...
+InsertionExtensionAction.InstalledFailure=Installed failure.
+InsertionExtensionAction.InstalledFailureTip=You should check it.
+UploadRevisionJob.Title=Upload Revision...
+UploadRevisionJob.Message=Upload Revision...
+UploadRevisionAction.InstalledFailure=Upload Revision failure.
+UploadRevisionAction.InstalledFailureTip=You should check it.
+DownloadComponenentsAction.installExchange=Install Exchange Components
+DownloadComponenentsAction.DownloadTaskTitle=Downloading files from Exchange
+DownloadComponenentsAction.DownloadTaskName=Downloading file from url:
+DownloadComponenentsAction.ReloadPalette=Reloading palette...
+DownloadComponenentsAction.DownloadFailure=Download failure.
+DownloadComponenentsAction.DownloadFailureTip=You must change the Download Settings.
+ExchangeWebService.insertionExtensionSuccessful=Insertion Extension successful.
+ExchangeWebService.downloadingExtensionSuccessful=Downloaded Extension successful.
+ExchangeWebService.deleteExtensionSuccessful=Deleted Extension successful.
+ExchangeWebService.insertReviewSuccessful=Insertion Review successful.
+ExchangeWebService.updateRevisionSuccessful=Update Revision successful.
+ExchangeWebService.insertionRevisionSuccessful=Insertion Revision successful.
+ImportExchangeDialog.dialogTitle=Select an item from Talend Exchange
+ImportExchangeDialog.WARNING=WARNING
+ImportExchangeDialog.NOTSELECTWARNING=Please select one item from table.
+ImportExchangeDialog.downloadProgressBar=Download Item,Please Wait\!
+ImportExchangeDialog.EXTENSION_NAME=Extension Name
+ImportExchangeDialog.AUTHOR_NAME=Author Name
+ImportExchangeDialog.LATEST_REVISION=Latest Revision
+ImportExchangeDialog.EXTENSION_DESCRIPTION=Extension Description
+ImportExchangeDialog.REFRESH_BUTTON=Refresh
+ImportExchangeDialog.REFRESHING_PROGRESSBAR=Refreshing\! Please Wait.....
+ImportExchangeDialog.OPERATION_CANCELLED=Operation was cancelled
+Exchange.logon.error=Exchange user have not been registered, please register using the preferences .
+ImportExchangeDialog.download.extensions=Download extensions\! Please Wait\!
+DownloadComponenentsAction_restartMessage=Install the new component successfully, but need to restart studio to load it, do you want to restart now?
+DownloadComponenentsAction_restartTitle=Need restart
+DownloadComponenentsAction_failureTitle=Failure
+DownloadComponenentsAction_failureMessage=Fail to install the component {0}, need check the component is valid or not.
+DownloadComponenentsAction.installComponentsTitle=Install components

main/plugins/org.talend.designer.components.exchange/src/main/java/messages_fr.properties

@@ -2,35 +2,31 @@ ExchangeView.Exchange=Exchange
 AvailableExtensionsComposite.ExtensionName=Nom de l'extension
 AvailableExtensionsComposite.Version=Version
 AvailableExtensionsComposite.Rating=Note
-AvailableExtensionsComposite.Author=Cr\u00E9\u00E9 par :
+AvailableExtensionsComposite.Author=Auteur
 AvailableExtensionsComposite.FilterTitle=Filtre
 AvailableExtensionsComposite.ViewDetail.installOperateStatus=Installer
 AvailableExtensionsComposite.ViewDetail.WriteReview=Donnez votre avis
-AvailableExtensionsComposite.ViewDetail.InsertionReviewFailure=\u00C9chec d'insertion de la revue.
-AvailableExtensionsComposite.ViewDetail.InsertionReviewFailureTip=V\u00E9rifiez.
+AvailableExtensionsComposite.ViewDetail.InsertionReviewFailureTip=Veuillez v\u00E9rifier.
 DownloadedExtensionsComposite.ExtensionName=Nom de l'extension
 DownloadedExtensionsComposite.DownloadedVersion=Version t\u00E9l\u00E9charg\u00E9e
 DownloadedExtensionsComposite.DownloadDate=Date de t\u00E9l\u00E9chargement
-DownloadedExtensionsComposite.OperateStatus=Statut de l'op\u00E9ration
 DownloadedExtensionsComposite.installOperateStatus=Installer
 DownloadedExtensionsComposite.installedOperateStatus=Install\u00E9
-DownloadedExtensionsComposite.updateOperateStatus=Update
+DownloadedExtensionsComposite.updateOperateStatus=UPDATE
 MyExtensionsComposite.ExtensionName=Nom de l'extension
 MyExtensionsComposite.Version=Version
-MyExtensionsComposite.UploadDate=Date de chargement
-MyExtensionsComposite.AddNewExtensionTitle=Ajouter une extension
+MyExtensionsComposite.UploadDate=Date du chargement
+MyExtensionsComposite.AddNewExtensionTitle=Ajouter une nouvelle extension
 MyExtensionsComposite.UpLoadNewVersionOperateStatus=Charger une nouvelle version
-MyExtensionsComposite.UpdateOperateStatus=Update
+MyExtensionsComposite.UpdateOperateStatus=UPDATE
 MyExtensionsComposite.ModifyOperateStatus=Modifier
-MyExtensionsComposite.DeleteOperateStatus=Supprimer
+MyExtensionsComposite.DeleteOperateStatus=DELETE
 MyExtensionsComposite.Form.Return=Retourner
 MyExtensionsComposite.Form.ExtensionTitle=Titre de l'extension
 MyExtensionsComposite.Form.InitialVersion=Version initiale
 MyExtensionsComposite.Form.Compatibility=Compatibilit\u00E9
 MyExtensionsComposite.Form.Compatibility.AllVersions=Toutes les versions
 MyExtensionsComposite.Form.Compatibility.Version=Version
-MyExtensionsComposite.Form.Compatibility.AndOlder=et plus ancien
-MyExtensionsComposite.Form.Compatibility.AndNewer=et plus r\u00E9cent
 MyExtensionsComposite.Form.Compatibility.AllVersionsExcept=Toutes les versions sauf :
 MyExtensionsComposite.Form.Compatibility.OnlyTheseVersions=Uniquement ces versions :
 MyExtensionsComposite.Form.Description=Description
@@ -42,60 +38,55 @@ MyExtensionsComposite.Form.Upload.SelectAnItem=S\u00E9lectionnez un \u00E9l\u00E
 MyExtensionsComposite.Form.Upload.File=Fichier :
 MyExtensionsComposite.Form.Upload.Browse=Parcourir...
 MyExtensionsComposite.Form.Upload.Browse.SelectFile=S\u00E9lectionnez un fichier de l'extension \u00E0 charger
-MyExtensionsComposite.Form.DeleteExtensionTile=Supprimer l'extension
-MyExtensionsComposite.Form.DeleteExtensionMessage=Voulez-vous vraiment supprimer cette extension\u00A0?
+MyExtensionsComposite.Form.DeleteExtensionTile=Supprimer cette extension
+MyExtensionsComposite.Form.DeleteExtensionMessage=Voulez-vous vraiment supprimer cette extension ?
 MyExtensionsComposite.Form.UploadExtension=Charger l'extension
 MyExtensionsComposite.Form.UpdateExtension=Mettre \u00E0 jour l'extension
 MyExtensionsComposite.Form.ModifyExtension=Modifier l'extension
-Exchange.logon.error=L'utilisateur d'Exchange n'est pas enregistr\u00E9. Enregistrez-vous via les Pr\u00E9f\u00E9rences.
 RefreshJob.FindExtensions.Title=Recherche d'extensions disponibles
 RefreshJob.FindExtensions.Message=Recherche d'extensions depuis Exchange...
-ShowContributedExtensionsJob.ShowContributedExtensions.Title=Recherche des extensions communautaires
-ShowContributedExtensionsJob.ShowContributedExtensions.Message=Recherche d'extensions communautaires depuis Exchange...
 ShowInstalledExtensionsJob.ShowInstalledExtensions.Title=Recherche d'extensions install\u00E9es
 ShowInstalledExtensionsJob.ShowInstalledExtensions.Message=Recherche d'extensions install\u00E9es depuis Exchange...
 DeleteExtensionJob.DeleteExtensionJob.Title=Supprimer une extension...
 DeleteExtensionJob.DeleteExtensionJob.Message=Supprimer une extension...
-DeleteExtensionJob.DeleteFailure=\u00C9chec de la suppression.
-DeleteExtensionJob.DeleteFailureTip=V\u00E9rifiez.
+DeleteExtensionJob.DeleteFailure=Echec de la connexion.
+DeleteExtensionJob.DeleteFailureTip=Veuillez v\u00E9rifier.
 ModifyExtensionJob.Title=Modifier une extension...
 ModifyExtensionJob.Message=Modifier une extension...
-ModifyExtensionJob.ModifyFailure=\u00C9chec de la modification
+ModifyExtensionJob.ModifyFailure=Echec de la modification
 ModifyExtensionJob.ModifyFailureTip=V\u00E9rifiez.
 InstalledExtensionJob.Title=Installation de l'extension...
-InstalledExtensionJob.Message=Installation de l'extension...
-InsertionExtensionAction.InstalledFailure=\u00C9chec de l'installation
-InsertionExtensionAction.InstalledFailureTip=V\u00E9rifiez.
+InsertionExtensionAction.InstalledFailure=Echec de l'installation
+InsertionExtensionAction.InstalledFailureTip=Vous devez le v\u00E9rifier.
 UploadRevisionJob.Title=Chargement de la r\u00E9vision...
-UploadRevisionJob.Message=Chargement de la r\u00E9vision...
-UploadRevisionAction.InstalledFailure=\u00C9chec du chargement de la r\u00E9vision.
-UploadRevisionAction.InstalledFailureTip=V\u00E9rifiez.
-DownloadComponenentsAction_restartMessage=Installation du nouveau composant r\u00E9ussie, mais un red\u00E9marrage est requis pour le charger. Red\u00E9marrer ?
-DownloadComponenentsAction_restartTitle=Red\u00E9marrage requis
-DownloadComponenentsAction_failureTitle=\u00C9chec
-DownloadComponenentsAction_failureMessage=\u00C9chec de l'installation du composant {0}, v\u00E9rifiez s'il est valide.
+UploadRevisionJob.Message=Charger une r\u00E9vision...
+UploadRevisionAction.InstalledFailure=Echec du chargement de la r\u00E9vision.
+UploadRevisionAction.InstalledFailureTip=Vous devez le v\u00E9rifier.
 DownloadComponenentsAction.installExchange=Installer les composants Exchange
 DownloadComponenentsAction.DownloadTaskTitle=T\u00E9l\u00E9chargement des fichiers depuis Exchange
 DownloadComponenentsAction.DownloadTaskName=T\u00E9l\u00E9chargement du fichier depuis l'URL :
-DownloadComponenentsAction.ReloadPalette=Actualisation de la Palette...
-DownloadComponenentsAction.DownloadFailure=\u00C9chec du t\u00E9l\u00E9chargement
+DownloadComponenentsAction.ReloadPalette=Recharger la palette...
+DownloadComponenentsAction.DownloadFailure=Echec du t\u00E9l\u00E9chargement
 DownloadComponenentsAction.DownloadFailureTip=Vous devez modifier les param\u00E8tres de t\u00E9l\u00E9chargement.
-DownloadComponenentsAction.installComponentsTitle=Installer les composants
 ExchangeWebService.insertionExtensionSuccessful=Insertion de l'extension r\u00E9ussie.
 ExchangeWebService.downloadingExtensionSuccessful=T\u00E9l\u00E9chargement de l'extension r\u00E9ussi.
 ExchangeWebService.deleteExtensionSuccessful=Suppression de l'extension r\u00E9ussie.
-ExchangeWebService.insertReviewSuccessful=Insertion de la r\u00E9vision r\u00E9ussie.
 ExchangeWebService.updateRevisionSuccessful=Mise \u00E0 jour de la r\u00E9vision r\u00E9ussie.
 ExchangeWebService.insertionRevisionSuccessful=Insertion de la r\u00E9vision r\u00E9ussie.
 ImportExchangeDialog.dialogTitle=S\u00E9lectionnez un \u00E9l\u00E9ment de Talend Exchange
-ImportExchangeDialog.WARNING=AVERTISSEMENT
+ImportExchangeDialog.WARNING=Avertissement
 ImportExchangeDialog.NOTSELECTWARNING=S\u00E9lectionnez un \u00E9l\u00E9ment dans la table.
 ImportExchangeDialog.downloadProgressBar=T\u00E9l\u00E9chargement d'\u00E9l\u00E9ment(s), veuillez patienter.
 ImportExchangeDialog.EXTENSION_NAME=Nom de l'extension
 ImportExchangeDialog.AUTHOR_NAME=Nom de l'auteur
 ImportExchangeDialog.LATEST_REVISION=Derni\u00E8re r\u00E9vision
 ImportExchangeDialog.EXTENSION_DESCRIPTION=Description de l'extension
-ImportExchangeDialog.download.extensions=T\u00E9l\u00E9chargement des extensions ! Patientez.
-ImportExchangeDialog.REFRESH_BUTTON=Actualiser
-ImportExchangeDialog.REFRESHING_PROGRESSBAR=Actualisation, veuillez patienter...
+ImportExchangeDialog.REFRESH_BUTTON=Rafra\u00EEchir
+ImportExchangeDialog.REFRESHING_PROGRESSBAR=Rafra\u00EEchissement, veuillez patienter..
 ImportExchangeDialog.OPERATION_CANCELLED=L'op\u00E9ration a \u00E9t\u00E9 annul\u00E9e
+Exchange.logon.error=L'utilisateur de l'Exchange n'est pas enregistr\u00E9. Enregistrez-vous via les Pr\u00E9f\u00E9rences.
+DownloadComponenentsAction_restartMessage=Installation du nouveau composant r\u00E9ussie, mais un red\u00E9marrage est requis pour le charger. Red\u00E9marrer ?
+DownloadComponenentsAction_restartTitle=Red\u00E9marrage requis
+DownloadComponenentsAction_failureTitle=\u00C9chec
+DownloadComponenentsAction_failureMessage=\u00C9chec de l'installation du composant {0}, v\u00E9rifiez s'il est valide.
+DownloadComponenentsAction.installComponentsTitle=Installer les composants

main/plugins/org.talend.designer.components.exchange/src/main/java/messages_ja.properties

@@ -13,25 +13,25 @@ DownloadedExtensionsComposite.DownloadedVersion=\u30C0\u30A6\u30F3\u30ED\u30FC\u
 DownloadedExtensionsComposite.DownloadDate=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u65E5\u4ED8
 DownloadedExtensionsComposite.OperateStatus=\u30B9\u30C6\u30FC\u30BF\u30B9\u64CD\u4F5C
 DownloadedExtensionsComposite.installOperateStatus=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
-DownloadedExtensionsComposite.installedOperateStatus=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F
-DownloadedExtensionsComposite.updateOperateStatus=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+DownloadedExtensionsComposite.installedOperateStatus=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08
+DownloadedExtensionsComposite.updateOperateStatus=\u66F4\u65B0
 MyExtensionsComposite.ExtensionName=Extension\u540D
 MyExtensionsComposite.Version=\u30D0\u30FC\u30B8\u30E7\u30F3
 MyExtensionsComposite.UploadDate=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u65E5\u4ED8
 MyExtensionsComposite.AddNewExtensionTitle=\u65B0\u898FExtension\u8FFD\u52A0
 MyExtensionsComposite.UpLoadNewVersionOperateStatus=\u65B0\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9
-MyExtensionsComposite.UpdateOperateStatus=\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+MyExtensionsComposite.UpdateOperateStatus=\u66F4\u65B0
 MyExtensionsComposite.ModifyOperateStatus=\u5909\u66F4
 MyExtensionsComposite.DeleteOperateStatus=\u524A\u9664
 MyExtensionsComposite.Form.Return=\u623B\u308A\u5024
 MyExtensionsComposite.Form.ExtensionTitle=Extension\u30BF\u30A4\u30C8\u30EB
 MyExtensionsComposite.Form.InitialVersion=\u521D\u671F\u30D0\u30FC\u30B8\u30E7\u30F3
-MyExtensionsComposite.Form.Compatibility=\u4E92\u63DB\u6027
-MyExtensionsComposite.Form.Compatibility.AllVersions=\u3059\u3079\u3066\u306E\u30D0\u30FC\u30B8\u30E7\u30F3
+MyExtensionsComposite.Form.Compatibility=\u9069\u5408\u6027
+MyExtensionsComposite.Form.Compatibility.AllVersions=\u5168\u3066\u306E\u30D0\u30FC\u30B8\u30E7\u30F3
 MyExtensionsComposite.Form.Compatibility.Version=\u30D0\u30FC\u30B8\u30E7\u30F3
 MyExtensionsComposite.Form.Compatibility.AndOlder=\u3088\u308A\u53E4\u3044
 MyExtensionsComposite.Form.Compatibility.AndNewer=\u3088\u308A\u65B0\u3057\u3044
-MyExtensionsComposite.Form.Compatibility.AllVersionsExcept=\u3059\u3079\u3066\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u4EE5\u5916
+MyExtensionsComposite.Form.Compatibility.AllVersionsExcept=\u5168\u3066\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u4EE5\u5916
 MyExtensionsComposite.Form.Compatibility.OnlyTheseVersions=\u3053\u308C\u3089\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3060\u3051:
 MyExtensionsComposite.Form.Description=\u8AAC\u660E
 MyExtensionsComposite.Form.Visibility=\u53EF\u8996\u6027
@@ -43,11 +43,10 @@ MyExtensionsComposite.Form.Upload.File=\u30D5\u30A1\u30A4\u30EB:
 MyExtensionsComposite.Form.Upload.Browse=\u53C2\u7167...
 MyExtensionsComposite.Form.Upload.Browse.SelectFile=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u3059\u308Bextension\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E
 MyExtensionsComposite.Form.DeleteExtensionTile=Extension\u524A\u9664
-MyExtensionsComposite.Form.DeleteExtensionMessage=\u3053\u306E\u62E1\u5F35\u5B50\u3092\u524A\u9664\u3057\u307E\u3059\u304B?
+MyExtensionsComposite.Form.DeleteExtensionMessage=\u3053\u306EExtension\u3092\u524A\u9664\u3057\u3066\u3082\u3044\u3044\u3067\u3059\u304B\uFF1F
 MyExtensionsComposite.Form.UploadExtension=Extension\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9
-MyExtensionsComposite.Form.UpdateExtension=Extension\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8
+MyExtensionsComposite.Form.UpdateExtension=Extension\u66F4\u65B0
 MyExtensionsComposite.Form.ModifyExtension=Extension\u4FEE\u6B63
-Exchange.logon.error=Exchange\u30E6\u30FC\u30B6\u30FC\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u521D\u671F\u8A2D\u5B9A\u3092\u4F7F\u7528\u3057\u3066\u767B\u9332\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 RefreshJob.FindExtensions.Title=\u53D6\u5F97\u53EF\u80FD\u306Aextensions
 RefreshJob.FindExtensions.Message=Exchange\u304B\u3089\u62E1\u5F35\u6A5F\u80FD\u3092\u691C\u7D22...
 ShowContributedExtensionsJob.ShowContributedExtensions.Title=extensions\u3092\u53D6\u5F97
@@ -56,7 +55,7 @@ ShowInstalledExtensionsJob.ShowInstalledExtensions.Title=extensions\u3092\u30A4\
 ShowInstalledExtensionsJob.ShowInstalledExtensions.Message=exchange\u304B\u3089extensions\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u2026
 DeleteExtensionJob.DeleteExtensionJob.Title=Extension\u3092\u524A\u9664\u3057\u307E\u3059\u2026
 DeleteExtensionJob.DeleteExtensionJob.Message=Extension\u3092\u524A\u9664\u3057\u307E\u3059\u2026
-DeleteExtensionJob.DeleteFailure=\u524A\u9664\u3067\u304D\u307E\u305B\u3093
+DeleteExtensionJob.DeleteFailure=\u524A\u9664\u51FA\u6765\u307E\u305B\u3093
 DeleteExtensionJob.DeleteFailureTip=\u30C1\u30A7\u30C3\u30AF\u3092\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ModifyExtensionJob.Title=Extension\u3092\u4FEE\u6B63\u2026
 ModifyExtensionJob.Message=Extension\u3092\u4FEE\u6B63\u2026
@@ -70,32 +69,33 @@ UploadRevisionJob.Title=\u30EA\u30D3\u30B8\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u
 UploadRevisionJob.Message=\u30EA\u30D3\u30B8\u30E7\u30F3\u3092\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9
 UploadRevisionAction.InstalledFailure=\u30EA\u30D3\u30B8\u30E7\u30F3\u306E\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u306B\u5931\u6557\u3002
 UploadRevisionAction.InstalledFailureTip=\u30C1\u30A7\u30C3\u30AF\u3092\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-DownloadComponenentsAction_restartMessage=\u65B0\u898F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u304C\u6210\u529F\u3057\u307E\u3057\u305F\u3002Studio\u306E\u518D\u8D77\u52D5\u304C\u5FC5\u8981\u3067\u3059\u3002\u518D\u8D77\u52D5\u3057\u307E\u3059\u304B?
-DownloadComponenentsAction_restartTitle=\u518D\u8D77\u52D5\u8981
-DownloadComponenentsAction_failureTitle=\u5931\u6557
-DownloadComponenentsAction_failureMessage=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8{0}\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u59A5\u5F53\u304B\u3054\u78BA\u8A8D\u304F\u3060\u3055\u3044\u3002
 DownloadComponenentsAction.installExchange=Exchange\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
 DownloadComponenentsAction.DownloadTaskTitle=Exchange\u304B\u3089\u30D5\u30A1\u30A4\u30EB\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9
-DownloadComponenentsAction.DownloadTaskName=\u30D5\u30A1\u30A4\u30EB\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D URL \\:
-DownloadComponenentsAction.ReloadPalette=\u30D1\u30EC\u30C3\u30C8\u306E\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8...
+DownloadComponenentsAction.DownloadTaskName=URL\u304B\u3089\u30D5\u30A1\u30A4\u30EB\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9:
+DownloadComponenentsAction.ReloadPalette=\u30D1\u30EC\u30C3\u30C8\u306E\u66F4\u65B0...
 DownloadComponenentsAction.DownloadFailure=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u5931\u6557\u3002
 DownloadComponenentsAction.DownloadFailureTip=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u8A2D\u5B9A\u3092\u5909\u66F4\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-DownloadComponenentsAction.installComponentsTitle=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
 ExchangeWebService.insertionExtensionSuccessful=Extension\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u304C\u6210\u529F\u3057\u307E\u3057\u305F
 ExchangeWebService.downloadingExtensionSuccessful=Extension\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u6210\u529F\u3002
 ExchangeWebService.deleteExtensionSuccessful=Extension\u524A\u9664\u6210\u529F\u3002
 ExchangeWebService.insertReviewSuccessful=Review\u633F\u5165\u6210\u529F\u3002
-ExchangeWebService.updateRevisionSuccessful=\u30EA\u30D3\u30B8\u30E7\u30F3\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u6210\u529F\u3002
+ExchangeWebService.updateRevisionSuccessful=\u30EA\u30D3\u30B8\u30E7\u30F3\u66F4\u65B0\u6210\u529F\u3002
 ExchangeWebService.insertionRevisionSuccessful=\u30EA\u30D3\u30B8\u30E7\u30F3\u633F\u5165\u6210\u529F\u3002
 ImportExchangeDialog.dialogTitle=Talend Exchange \u304B\u3089\u9805\u76EE\u306E\u9078\u629E
 ImportExchangeDialog.WARNING=\u8B66\u544A
-ImportExchangeDialog.NOTSELECTWARNING=\u30C6\u30FC\u30D6\u30EB\u304B\u3089\u30A2\u30A4\u30C6\u30E0\u3092\uFF11\u3064\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044...
-ImportExchangeDialog.downloadProgressBar=\u30A2\u30A4\u30C6\u30E0\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044!
+ImportExchangeDialog.NOTSELECTWARNING=\u30C6\u30FC\u30D6\u30EB\u304B\u3089\u30A2\u30A4\u30C6\u30E0\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044\u3002
+ImportExchangeDialog.downloadProgressBar=\u30A2\u30A4\u30C6\u30E0\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D\u3067\u3059...
 ImportExchangeDialog.EXTENSION_NAME=Extension\u540D
 ImportExchangeDialog.AUTHOR_NAME=\u4F5C\u6210\u8005\u540D
 ImportExchangeDialog.LATEST_REVISION=\u6700\u65B0\u30EA\u30D3\u30B8\u30E7\u30F3
 ImportExchangeDialog.EXTENSION_DESCRIPTION=\u62E1\u5F35\u306E\u8AAC\u660E
-ImportExchangeDialog.download.extensions=\u62E1\u5F35\u6A5F\u80FD\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
 ImportExchangeDialog.REFRESH_BUTTON=\u66F4\u65B0
-ImportExchangeDialog.REFRESHING_PROGRESSBAR=\u66F4\u65B0\u4E2D\u3067\u3059\u3002\u66AB\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u3002
-ImportExchangeDialog.OPERATION_CANCELLED=\u64CD\u4F5C\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
+ImportExchangeDialog.REFRESHING_PROGRESSBAR=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u4E2D\u3067\u3059...
+ImportExchangeDialog.OPERATION_CANCELLED=\u64CD\u4F5C\u3092\u30AD\u30E3\u30F3\u30BB\u30EB
+Exchange.logon.error=Exchange\u30E6\u30FC\u30B6\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u521D\u671F\u8A2D\u5B9A\u3092\u4F7F\u7528\u3057\u3066\u767B\u9332\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ImportExchangeDialog.download.extensions=\u62E1\u5F35\u6A5F\u80FD\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D\u3067\u3059\u3001\u66AB\u304F\u304A\u5F85\u3061\u4E0B\u3055\u3044\u3002
+DownloadComponenentsAction_restartMessage=\u65B0\u898F\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u304C\u6210\u529F\u3057\u307E\u3057\u305F\u3002Studio\u306E\u518D\u8D77\u52D5\u304C\u5FC5\u8981\u3067\u3059\u3002\u518D\u8D77\u52D5\u3057\u307E\u3059\u304B?
+DownloadComponenentsAction_restartTitle=\u518D\u8D77\u52D5\u8981
+DownloadComponenentsAction_failureTitle=\u5931\u6557
+DownloadComponenentsAction_failureMessage=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8{0}\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u59A5\u5F53\u304B\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002
+DownloadComponenentsAction.installComponentsTitle=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB

main/plugins/org.talend.designer.components.exchange/src/main/java/messages_zh_CN.properties

@@ -47,7 +47,6 @@ MyExtensionsComposite.Form.DeleteExtensionMessage=\u786E\u5B9E\u8981\u5220\u9664
 MyExtensionsComposite.Form.UploadExtension=\u4E0A\u4F20\u6269\u5C55
 MyExtensionsComposite.Form.UpdateExtension=\u66F4\u65B0\u6269\u5C55
 MyExtensionsComposite.Form.ModifyExtension=\u4FEE\u6539\u6269\u5C55
-Exchange.logon.error=\u4EA4\u6362\u7528\u6237\u5C1A\u672A\u6CE8\u518C\uFF0C\u8BF7\u4F7F\u7528\u9996\u9009\u9879\u6CE8\u518C\u3002
 RefreshJob.FindExtensions.Title=\u6B63\u5728\u67E5\u627E\u53EF\u7528\u6269\u5C55
 RefreshJob.FindExtensions.Message=\u6B63\u5728\u4ECEExchange\u67E5\u627E\u6269\u5C55...
 ShowContributedExtensionsJob.ShowContributedExtensions.Title=\u5BFB\u627E\u5DF2\u5206\u914D\u63D2\u4EF6
@@ -70,17 +69,12 @@ UploadRevisionJob.Title=\u4E0A\u4F20\u4FEE\u8BA2...
 UploadRevisionJob.Message=\u4E0A\u4F20\u4FEE\u8BA2...
 UploadRevisionAction.InstalledFailure=\u4E0A\u4F20\u4FEE\u6539\u5931\u8D25\u3002
 UploadRevisionAction.InstalledFailureTip=\u60A8\u5E94\u8BE5\u68C0\u67E5\u5B83\u3002
-DownloadComponenentsAction_restartMessage=\u6210\u529F\u5B89\u88C5\u65B0\u7EC4\u4EF6\uFF0C\u9700\u8981\u91CD\u542Fstudio\u6765\u52A0\u8F7D\uFF0C\u73B0\u5728\u91CD\u542F\u5417\uFF1F
-DownloadComponenentsAction_restartTitle=\u9700\u7528\u91CD\u542F
-DownloadComponenentsAction_failureTitle=\u5931\u8D25
-DownloadComponenentsAction_failureMessage=\u5B89\u88C5\u7EC4\u4EF6{0}\u5931\u8D25\uFF0C\u9700\u8981\u68C0\u67E5\u7EC4\u4EF6\u662F\u5426\u6709\u6548\u3002
 DownloadComponenentsAction.installExchange=\u5B89\u88C5\u6765\u81EA Exchange \u4EA4\u6D41\u4E2D\u5FC3\u7684\u7EC4\u4EF6
 DownloadComponenentsAction.DownloadTaskTitle=\u4ECEExchange\u4E0B\u8F7D\u6587\u4EF6
 DownloadComponenentsAction.DownloadTaskName=\u4ECE\u4EE5\u4E0B url \u4E0B\u8F7D\u6587\u4EF6:
 DownloadComponenentsAction.ReloadPalette=\u91CD\u65B0\u8F7D\u5165\u8C03\u8272\u677F...
 DownloadComponenentsAction.DownloadFailure=\u4E0B\u8F7D\u5931\u8D25\u3002
 DownloadComponenentsAction.DownloadFailureTip=\u5FC5\u987B\u4FEE\u6539\u4E0B\u8F7D\u8BBE\u7F6E\u3002
-DownloadComponenentsAction.installComponentsTitle=\u5B89\u88C5\u7EC4\u4EF6
 ExchangeWebService.insertionExtensionSuccessful=\u6269\u5C55\u63D2\u4EF6\u5DF2\u63D2\u5165\u6210\u529F
 ExchangeWebService.downloadingExtensionSuccessful=\u6269\u5C55\u63D2\u4EF6\u5DF2\u4E0B\u8F7D\u6210\u529F
 ExchangeWebService.deleteExtensionSuccessful=\u6269\u5C55\u63D2\u4EF6\u5DF2\u5220\u9664\u6210\u529F\u3002
@@ -95,7 +89,13 @@ ImportExchangeDialog.EXTENSION_NAME=\u6269\u5C55\u540D
 ImportExchangeDialog.AUTHOR_NAME=\u4F5C\u8005\u540D\u79F0
 ImportExchangeDialog.LATEST_REVISION=\u6700\u65B0\u7248\u672C
 ImportExchangeDialog.EXTENSION_DESCRIPTION=\u6269\u5C55\u63CF\u8FF0
-ImportExchangeDialog.download.extensions=\u4E0B\u8F7D\u6269\u5C55\uFF01\u8BF7\u7A0D\u5019\uFF01
 ImportExchangeDialog.REFRESH_BUTTON=\u5237\u65B0
 ImportExchangeDialog.REFRESHING_PROGRESSBAR=\u6B63\u5728\u5237\u65B0\uFF0C\u8BF7\u7A0D\u5019......
 ImportExchangeDialog.OPERATION_CANCELLED=\u64CD\u4F5C\u5DF2\u53D6\u6D88
+Exchange.logon.error=\u4EA4\u6362\u7528\u6237\u5C1A\u672A\u6CE8\u518C\uFF0C\u8BF7\u4F7F\u7528\u9996\u9009\u9879\u6CE8\u518C\u3002
+ImportExchangeDialog.download.extensions=\u4E0B\u8F7D\u6269\u5C55\uFF01\u8BF7\u7A0D\u5019\uFF01
+DownloadComponenentsAction_restartMessage=\u6210\u529F\u5B89\u88C5\u65B0\u7EC4\u4EF6\uFF0C\u9700\u8981\u91CD\u542Fstudio\u6765\u52A0\u8F7D\uFF0C\u73B0\u5728\u91CD\u542F\u5417\uFF1F
+DownloadComponenentsAction_restartTitle=\u9700\u7528\u91CD\u542F
+DownloadComponenentsAction_failureTitle=\u5931\u8D25
+DownloadComponenentsAction_failureMessage=\u5B89\u88C5\u7EC4\u4EF6{0}\u5931\u8D25\uFF0C\u9700\u8981\u68C0\u67E5\u7EC4\u4EF6\u662F\u5426\u6709\u6548\u3002
+DownloadComponenentsAction.installComponentsTitle=\u5B89\u88C5\u7EC4\u4EF6

main/plugins/org.talend.designer.components.libs/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Components Libs Plug-in
 Bundle-SymbolicName: org.talend.designer.components.libs
-Bundle-Version: 8.8.8.qualifier
+Bundle-Version: 8.0.1.M12
 Require-Bundle: org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: .Talend SA.

main/plugins/org.talend.designer.components.libs/libs_src/CouchDBUtil/pom.xml

@@ -8,14 +8,6 @@
   <version>1.0.0</version>
   <packaging>jar</packaging>
 
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
-      <distribution>may be downloaded from the Maven repository</distribution>
-    </license>
-  </licenses>
-
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>

main/plugins/org.talend.designer.components.libs/libs_src/NetSuite_Management/pom.xml

@@ -6,14 +6,6 @@
 	<name>NetSuite_Management</name>
 	<version>1.0.3</version>
 
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
-			<distribution>may be downloaded from the Maven repository</distribution>
-		</license>
-	</licenses>
-
 	<dependencies>
 	<dependency>
 		<groupId>org.talend</groupId>

main/plugins/org.talend.designer.components.libs/libs_src/Netsuite_Client/pom.xml

@@ -6,14 +6,6 @@
 	<name>Netsuite_Client</name>
 	<version>1.0.0</version>
 
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
-			<distribution>may be downloaded from the Maven repository</distribution>
-		</license>
-	</licenses>
-
 	<dependencies>
 	</dependencies>
 

main/plugins/org.talend.designer.components.libs/libs_src/TalendSAX/pom.xml

@@ -7,15 +7,6 @@
 	<version>1.0.1-20190326</version>
 	<packaging>jar</packaging>
 
-
-	<licenses>
-		<license>
-			<name>Apache License, Version 2.0</name>
-			<url>https://www.talendforge.org/modules/licenses/APACHE_v2.txt</url>
-			<distribution>may be downloaded from the Maven repository</distribution>
-		</license>
-	</licenses>
-
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>

main/plugins/org.talend.designer.components.libs/libs_src/adal4j/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>adal4j</artifactId>
-	<version>1.6.4-20211021</version>
+	<version>1.6.4-20210713</version>
 	<packaging>jar</packaging>
 	<name>adal4j</name>
 	<description>
@@ -94,7 +94,7 @@
 		<dependency>
 			<groupId>com.nimbusds</groupId>
 			<artifactId>oauth2-oidc-sdk</artifactId>
-			<version>9.7</version>
+			<version>6.5</version>
 		</dependency>
 		<dependency>
 			<groupId>com.nimbusds</groupId>

main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/main/java/com/microsoft/aad/adal4j/AdalOAuthRequest.java

@@ -40,6 +40,7 @@ import java.util.Collections;
 import java.util.Map;
 
 import com.nimbusds.oauth2.sdk.ParseException;
+import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
 import com.nimbusds.oauth2.sdk.http.HTTPRequest;
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import org.slf4j.Logger;
@@ -137,7 +138,7 @@ class AdalOAuthRequest extends HTTPRequest {
         HttpHelper.configureAdditionalHeaders(conn, params);
         conn.setDoOutput(true);
         conn.setRequestProperty("Content-Type",
-                HTTPContentType.ApplicationURLEncoded.contentType);
+                CommonContentTypes.APPLICATION_URLENCODED.toString());
 
         if (this.getQuery() != null) {
             try(final OutputStreamWriter writer = new OutputStreamWriter(

main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/main/java/com/microsoft/aad/adal4j/AdalTokenRequest.java

@@ -37,6 +37,7 @@ import com.nimbusds.oauth2.sdk.ParseException;
 import com.nimbusds.oauth2.sdk.SerializeException;
 import com.nimbusds.oauth2.sdk.TokenErrorResponse;
 import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
+import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
 import com.nimbusds.oauth2.sdk.http.HTTPRequest;
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import com.nimbusds.oauth2.sdk.util.URLUtils;
@@ -145,7 +146,7 @@ class AdalTokenRequest {
      * @return
      * @throws SerializeException
      */
-    AdalOAuthRequest toOAuthRequest() throws SerializeException, ParseException {
+    AdalOAuthRequest toOAuthRequest() throws SerializeException {
 
         if (this.uri == null) {
             throw new SerializeException("The endpoint URI is not specified");
@@ -154,7 +155,7 @@ class AdalTokenRequest {
         final AdalOAuthRequest httpRequest = new AdalOAuthRequest(
                 HTTPRequest.Method.POST, this.uri, headerMap, this.proxy,
                 this.sslSocketFactory);
-        httpRequest.setContentType(HTTPContentType.ApplicationURLEncoded.contentType);
+        httpRequest.setContentType(CommonContentTypes.APPLICATION_URLENCODED);
         final Map<String, List<String>> params = this.grant.toParameters();
         httpRequest.setQuery(URLUtils.serializeParameters(params));
         if (this.clientAuth != null) {

main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/main/java/com/microsoft/aad/adal4j/ClientAuthenticationPost.java

@@ -28,9 +28,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.mail.internet.ContentType;
+
 import com.nimbusds.oauth2.sdk.SerializeException;
 import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
 import com.nimbusds.oauth2.sdk.auth.ClientAuthenticationMethod;
+import com.nimbusds.oauth2.sdk.http.CommonContentTypes;
 import com.nimbusds.oauth2.sdk.http.HTTPRequest;
 import com.nimbusds.oauth2.sdk.id.ClientID;
 import com.nimbusds.oauth2.sdk.util.URLUtils;
@@ -57,15 +60,15 @@ class ClientAuthenticationPost extends ClientAuthentication {
         if (httpRequest.getMethod() != HTTPRequest.Method.POST)
             throw new SerializeException("The HTTP request method must be POST");
 
-        String ct = String.valueOf(httpRequest.getEntityContentType());
+        ContentType ct = httpRequest.getContentType();
 
         if (ct == null)
             throw new SerializeException("Missing HTTP Content-Type header");
 
-        if (!ct.equals(HTTPContentType.ApplicationURLEncoded.contentType))
+        if (!ct.match(CommonContentTypes.APPLICATION_URLENCODED))
             throw new SerializeException(
                     "The HTTP Content-Type header must be "
-                            + HTTPContentType.ApplicationURLEncoded.contentType);
+                            + CommonContentTypes.APPLICATION_URLENCODED);
 
         Map<String, List<String>> params = httpRequest.getQueryParameters();
 

main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/main/java/com/microsoft/aad/adal4j/HTTPContentType.java

@@ -1,19 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.microsoft.aad.adal4j;
-
-/**
- * Enum containing HTTP Content-Type header values
- */
-enum HTTPContentType {
-
-    ApplicationURLEncoded("application/x-www-form-urlencoded; charset=UTF-8"),
-    ApplicationJSON("application/json; charset=UTF-8");
-
-    public final String contentType;
-
-    HTTPContentType(String contentType) {
-        this.contentType = contentType;
-    }
-}

main/plugins/org.talend.designer.components.libs/libs_src/adal4j/src/samples/web-app-samples-for-adal4j/pom.xml

@@ -37,18 +37,7 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
 			<version>1.7.5</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
 		</dependency>
-        <dependency>
-            <groupId>ch.qos.reload4j</groupId>
-            <artifactId>reload4j</artifactId>
-            <version>1.2.19</version>
-        </dependency>
 		<!-- Spring 3 dependencies -->
 		<dependency>
 			<groupId>org.springframework</groupId>