TESB-24354:SFTP proxy bean not recognized in runtime only

fix(TUP-21333)OnSubJob Links Not Working (#3079 ) (#3102 )
https://jira.talendforge.org/browse/TUP-21333
2019-01-02 14:08:21 +08:00 · 2018-12-24 11:44:15 +08:00 · 2018-12-21 11:32:28 +01:00 · 2018-12-19 19:11:49 +08:00 · 2018-12-17 15:51:28 +02:00 · 2018-12-14 19:16:34 +08:00
552 changed files with 8110 additions and 3853 deletions
--- a/i18n/plugins/org.talend.designer.abstractmap.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.abstractmap.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.abstractmap.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.abstractmap
--- a/i18n/plugins/org.talend.designer.abstractmap.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.abstractmap.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.abstractmap.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.alfrescooutput.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.alfrescooutput.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.alfrescooutput.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.alfrescooutput
--- a/i18n/plugins/org.talend.designer.alfrescooutput.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.alfrescooutput.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.alfrescooutput.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.business.diagram.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.business.diagram.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.business.diagram.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.business.diagram
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.designer.business.diagram.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.business.diagram.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.business.diagram.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.codegen.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.codegen.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.designer.codegen Nl Fragment
 Bundle-SymbolicName: org.talend.designer.codegen.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.codegen
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.designer.codegen.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.codegen.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.codegen.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.components.exchange.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.components.exchange.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.components.exchange.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.components.exchange
--- a/i18n/plugins/org.talend.designer.components.exchange.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.components.exchange.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.components.exchange.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.core.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.core.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Designer Plug-in Nl Fragment
 Bundle-SymbolicName: org.talend.designer.core.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.core
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.designer.core.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.core.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.core.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_en.properties
+++ b/i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_en.properties
@@ -35,7 +35,6 @@ EParameterName.Level.Log.File=Level
 ToggleSubjobsAction.LABEL=Toggle Subjobs
 EParameterName.schemaOptions=Schema Options
 EParameterName.Purpose=Purpose
-EParameterName.Purpose=Purpose
 MultiPageEditorContributor.Grid=&Grid
 EParameterName.tableLogs=Logs Table
 SqlMemoController.QueryError.infoMsg=This query can not contain context parameters(like $_context) ,\n or this query has not been enclosed by {0} . Please correct.
@@ -144,7 +143,6 @@ NewProcessWizard.failureText=Job could not be saved
 ContextParameterPage.shouldPrompt=Prompt for value
 ContextParameterPage.prompt=Prompt
 EParameterName.Name=Name
-EParameterName.Name=Name
 EParameterName.onDatabaseFlag=On Databases
 ChangeMetadataCommand.messageDialog.propagate=Propagate
 ContextParameterPage.name=Name
@@ -226,7 +224,6 @@ TalendEditorContextMenuProvider.Trigger=Trigger
 ConnectionDeleteCommand.Label=Delete Connection
 Process.errorLoadingConnectionMessage=Some errors appear after the migration in the following connections, please check them: 
 EParameterName.Author=Author
-EParameterName.Author=Author
 EParameterName.componentName=Component Name
 SubjobBasicComposite.DialogTitle=Subjob Setting
 DesignerPreferencePage.SubjobColorLabel=Subjob Color
@@ -243,7 +240,6 @@ EParameterName.ConnectionFormat=Connection format
 ExecuteSystemCommandCommand.Title=Executed command 
 ChangeActivateStatusSubjobCommand.Label.DeactiveComplete=Deactivate all linked Subjobs
 EParameterName.Description=Description
-EParameterName.Description=Description
 Process.IfToUpgradeMetadata=The metadata used in the following component(s) has been modified.\nSelect the component(s) that you want to update from the repository.
 NewProcessWizard.title=New Job
 CheckController.decoration.description=Value taken from the repository
@@ -304,7 +300,6 @@ NoRepositoryDialog.Title=Error
 StatsAndLogsComposite.ReloadMessages=Current setting will be overwritten, do you want to continue?
 EParameterName.propertyType=Property Type
 EParameterName.Status=Status
-EParameterName.Status=Status
 EParameterName.Log.Db=Log to Database
 NodesPasteAction.paste=Paste
 TalendEditorPaletteFactory.Tools=Tools
--- a/i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_fr.properties
+++ b/i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_fr.properties
@@ -35,7 +35,6 @@ EParameterName.Level.Log.File=Niveau
 ToggleSubjobsAction.LABEL=Supprimer le surlignage des sous-jobs
 EParameterName.schemaOptions=Options du schéma
 EParameterName.Purpose=Objectif
-EParameterName.Purpose=Objectif
 MultiPageEditorContributor.Grid=&Grille
 EParameterName.tableLogs=Table de logs
 SqlMemoController.QueryError.infoMsg=Cette requête ne peut contenir des paramètres de contexte (comme $_context) ,\n ou cette requête n'a pas été entourée de {0}. Merci de corriger.
@@ -142,7 +141,6 @@ NewProcessWizard.failureText=Le Job n'a pas pu
 ContextParameterPage.shouldPrompt=Invite pour une valeur
 ContextParameterPage.prompt=Invite
 EParameterName.Name=Nom
-EParameterName.Name=Nom
 EParameterName.onDatabaseFlag=Dans la base de données
 ChangeMetadataCommand.messageDialog.propagate=Propager
 ContextParameterPage.name=Nom
@@ -224,7 +222,6 @@ TalendEditorContextMenuProvider.Trigger=Trigger
 ConnectionDeleteCommand.Label=Supprimer une connexion
 Process.errorLoadingConnectionMessage=Des erreurs sont apparues après la migration des connexions suivantes, merci de les vérifier \:
 EParameterName.Author=Créé par :
-EParameterName.Author=Créé par :
 EParameterName.componentName=Nom du composant
 SubjobBasicComposite.DialogTitle=Paramètre du sous-job
 DesignerPreferencePage.SubjobColorLabel=Couleur d'un sous-job
@@ -241,7 +238,6 @@ EParameterName.ConnectionFormat=Format de connexion
 ExecuteSystemCommandCommand.Title=Commande exécutée
 ChangeActivateStatusSubjobCommand.Label.DeactiveComplete=Désactiver les Sous-job liés
 EParameterName.Description=Description
-EParameterName.Description=Description
 Process.IfToUpgradeMetadata=La métadonnée utilisée dans le(s) composant(s) suivant(s) a été modifiée.\nSélectionnez le(s) composant(s) que vous voulez mettre à jour à partir du Référentiel.
 NewProcessWizard.title=Nouveau Job
 CheckController.decoration.description=Valeur prise du référentiel
@@ -302,7 +298,6 @@ NoRepositoryDialog.Title=ERROR
 StatsAndLogsComposite.ReloadMessages=Les paramètres actuels seront écrasés. Voulez-vous continuer ?
 EParameterName.propertyType=Type de propriété
 EParameterName.Status=Statut
-EParameterName.Status=Statut
 EParameterName.Log.Db=Logger dans une base de données
 NodesPasteAction.paste=Coller
 TalendEditorPaletteFactory.Tools=Outils
--- a/i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_ja.properties
+++ b/i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_ja.properties
@@ -35,7 +35,6 @@ EParameterName.Level.Log.File=\u30EC\u30D9\u30EB
 ToggleSubjobsAction.LABEL=\u30B5\u30D6\u30B8\u30E7\u30D6\u306E\u5207\u308A\u66FF\u3048
 EParameterName.schemaOptions=\u30B9\u30AD\u30FC\u30DE\u30AA\u30D7\u30B7\u30E7\u30F3
 EParameterName.Purpose=\u76EE\u7684
-EParameterName.Purpose=\u76EE\u7684
 MultiPageEditorContributor.Grid=\u30B0\u30EA\u30C3\u30C9 (&G)
 EParameterName.tableLogs=\u30E6\u30FC\u30B6\u30FC\u30ED\u30B0\u30C6\u30FC\u30D6\u30EB
 SqlMemoController.QueryError.infoMsg=\u3053\u306E\u30AF\u30A8\u30EA\u30FC\u306B\u306F\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC \uFF08$_context\u7B49\uFF09\u3092\u542B\u3080\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3001\n \u307E\u305F\u306F\u3001\u3053\u306E\u30AF\u30A8\u30EA\u306F {0} \u3067\u56F2\u307E\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u4FEE\u6B63\u3057\u3066\u304F\u3060\u3055\u3044\u3002
@@ -144,7 +143,6 @@ NewProcessWizard.failureText=\u30B8\u30E7\u30D6\u306F\u4FDD\u5B58\u3067\u304D\u3
 ContextParameterPage.shouldPrompt=\u30D7\u30ED\u30F3\u30D7\u30C8\u306E\u5024
 ContextParameterPage.prompt=\u30D7\u30ED\u30F3\u30D7\u30C8
 EParameterName.Name=\u540D\u524D
-EParameterName.Name=\u540D\u524D
 EParameterName.onDatabaseFlag=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3078\u51FA\u529B
 ChangeMetadataCommand.messageDialog.propagate=\u53CD\u6620
 ContextParameterPage.name=\u540D\u524D
@@ -226,7 +224,6 @@ TalendEditorContextMenuProvider.Trigger=\u30C8\u30EA\u30AC\u30FC
 ConnectionDeleteCommand.Label=\u63A5\u7D9A\u306E\u524A\u9664
 Process.errorLoadingConnectionMessage=\u4EE5\u4E0B\u306E\u63A5\u7D9A\u306B\u79FB\u884C\u5F8C\u3001\u3044\u304F\u3064\u304B\u306E\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3002\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044:\u3000
 EParameterName.Author=\u4F5C\u6210\u8005
-EParameterName.Author=\u4F5C\u6210\u8005
 EParameterName.componentName=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u540D
 SubjobBasicComposite.DialogTitle=\u30B5\u30D6\u30B8\u30E7\u30D6\u306E\u8A2D\u5B9A
 DesignerPreferencePage.SubjobColorLabel=\u30B5\u30D6\u30B8\u30E7\u30D6\u306E\u8272
@@ -243,7 +240,6 @@ EParameterName.ConnectionFormat=\u63A5\u7D9A\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8
 ExecuteSystemCommandCommand.Title=\u5B9F\u884C\u3057\u305F\u30B3\u30DE\u30F3\u30C9
 ChangeActivateStatusSubjobCommand.Label.DeactiveComplete=\u63A5\u7D9A\u306E\u3042\u308B\u30B5\u30D6\u30B8\u30E7\u30D6\u3092\u5168\u3066\u7121\u52B9\u5316
 EParameterName.Description=\u8AAC\u660E
-EParameterName.Description=\u8AAC\u660E
 Process.IfToUpgradeMetadata=\u4EE5\u4E0B\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3067\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u30E1\u30BF\u30C7\u30FC\u30BF\u306F\u5909\u66F4\u3055\u308C\u3066\u3044\u307E\u3059\u3002 \n\u66F4\u65B0\u3057\u305F\u3044\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30EA\u30DD\u30B8\u30C8\u30EA\u304B\u3089\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 NewProcessWizard.title=\u65B0\u898F\u30B8\u30E7\u30D6
 CheckController.decoration.description=\u30EA\u30DD\u30B8\u30C8\u30EA\u304B\u3089\u53D6\u5F97\u3057\u305F\u5024
@@ -304,7 +300,6 @@ NoRepositoryDialog.Title=\u30A8\u30E9\u30FC
 StatsAndLogsComposite.ReloadMessages=\u73FE\u5728\u306E\u8A2D\u5B9A\u306F\u4E0A\u66F8\u304D\u3055\u308C\u307E\u3059\u3001\u7D9A\u3051\u307E\u3059\u304B\uFF1F
 EParameterName.propertyType=Property Type (\u30D7\u30ED\u30D1\u30C6\u30A3\u30BF\u30A4\u30D7)
 EParameterName.Status=\u30B9\u30C6\u30FC\u30BF\u30B9
-EParameterName.Status=\u30B9\u30C6\u30FC\u30BF\u30B9
 EParameterName.Log.Db=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30ED\u30B0\u3092\u51FA\u529B
 NodesPasteAction.paste=\u8CBC\u4ED8\u3051
 TalendEditorPaletteFactory.Tools=\u30C4\u30FC\u30EB
--- a/i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_zh_CN.properties
+++ b/i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_zh_CN.properties
@@ -33,7 +33,6 @@ ActivateSubjobAction.DeactivateComplete=\u505C\u7528\u6240\u6709\u8FDE\u63A5\u76
 EParameterName.Level.Log.File=\u7EA7\u522B
 EParameterName.schemaOptions=Schema\u9009\u9879
 EParameterName.Purpose=\u76ee\u7684
-EParameterName.Purpose=\u76ee\u7684
 MultiPageEditorContributor.Grid=\u7f51\u683c(&G)
 EParameterName.tableLogs=\u65e5\u5fd7\u8868
 SqlMemoController.QueryError.infoMsg=\u67e5\u8be2\u8bed\u53e5\u4e0d\u80fd\u5305\u542b\u4e0a\u4e0b\u6587\u53c2\u6570\uff08\u50cf\uff1a $_context\uff09\uff0c\u6216\u8005\u67e5\u8be2\u8bed\u53e5\u6ca1\u6709\u62ec\u5728 {0} \u5b57\u7b26\u5185\u3002\u8bf7\u6539\u6b63\uff01
@@ -133,7 +132,6 @@ NewProcessWizard.failureText=\u4f5c\u4e1a\u4e0d\u80fd\u4fdd\u5b58
 ContextParameterPage.shouldPrompt=\u63d0\u793a\u503c
 ContextParameterPage.prompt=\u63d0\u793a
 EParameterName.Name=\u540d\u5b57
-EParameterName.Name=\u540d\u5b57
 EParameterName.onDatabaseFlag=\u8f93\u51fa\u5230\u6570\u636e\u5e93
 ChangeMetadataCommand.messageDialog.propagate=\u4f20\u64ad
 ContextParameterPage.name=\u540d\u5b57
@@ -211,7 +209,6 @@ TalendEditorContextMenuProvider.Trigger=\u89e6\u53d1\u5668
 ConnectionDeleteCommand.Label=\u5220\u9664\u8fde\u63a5
 Process.errorLoadingConnectionMessage=\u5728\u540e\u9762\u7684\u8fde\u63a5\u4e2d\u79fb\u52a8\u51fa\u73b0\u9519\u8bef\uff0c\u8bf7\u68c0\u67e5\uff1a
 EParameterName.Author=\u4f5c\u8005
-EParameterName.Author=\u4f5c\u8005
 EParameterName.componentName=\u7ec4\u4ef6\u540d
 SubjobBasicComposite.DialogTitle=\u5B50\u4F5C\u4E1A\u8BBE\u7F6E
 DesignerPreferencePage.SubjobColorLabel=\u5B50\u4F5C\u4E1A\u989C\u8272
@@ -228,7 +225,6 @@ EParameterName.ConnectionFormat=\u8FDE\u63A5\u683C\u5F0F
 ExecuteSystemCommandCommand.Title=\u5DF2\u6267\u884C\u7684\u547D\u4EE4
 ChangeActivateStatusSubjobCommand.Label.DeactiveComplete=\u505C\u7528\u6240\u6709\u8FDE\u63A5\u7684\u5B50\u4F5C\u4E1A
 EParameterName.Description=\u63cf\u8ff0
-EParameterName.Description=\u63cf\u8ff0
 Process.IfToUpgradeMetadata=\u7ec4\u4ef6{0}\u4e2d\u7684\u5143\u6570\u636e\u88ab\u4fee\u6539\u3002\n\u662f\u5426\u8981\u4ece\u50a8\u5b58\u5e93\u4e2d\u5347\u7ea7\uff1f
 NewProcessWizard.title=\u65b0\u4f5c\u4e1a
 CheckController.decoration.description=\u4ece\u50a8\u5b58\u5e93\u4e2d\u83b7\u53d6\u7684\u503c
@@ -287,7 +283,6 @@ NoRepositoryDialog.Title=\u9519\u8BEF
 StatsAndLogsComposite.ReloadMessages=\u5F53\u524D\u8BBE\u7F6E\u5C06\u88AB\u8986\u76D6\uFF0C\u4ECD\u8981\u7EE7\u7EED\u5417\uFF1F
 EParameterName.propertyType=\u5c5e\u6027\u7c7b\u578b
 EParameterName.Status=\u72B6\u6001
-EParameterName.Status=\u72B6\u6001
 EParameterName.Log.Db=\u6570\u636e\u5e93\u8bb0\u5f55\u65e5\u5fd7
 NodesPasteAction.paste=\u7c98\u8d34
 TalendEditorPaletteFactory.Tools=\u5de5\u5177
@@ -421,6 +416,7 @@ PropertyTypeController.saveToMetadata=\u5C06\u5C5E\u6027\u4FDD\u5B58\u5230\u5143
 QueryTypeController.alert=\u8B66\u6212
 QueryTypeController.nothingToGuess=\u6CA1\u6709\u8981\u8BA1\u7B97\u7684\u3002
 ReloadFromProjectSettingsMessages=\u5F53\u524D\u8BBE\u7F6E\u5C06\u88AB\u8986\u76D6\uFF0C\u4ECD\u8981\u7EE7\u7EED\u5417\uFF1F
+SQLPatternComposite.add=\u6DFB\u52A0
 SQLPatternComposite.delete=\u5220\u9664
 SQLPatternComposite.down=\u5411\u4E0B
 SQLPatternComposite.forbidModification=\u7981\u6B62\u4FEE\u6539\u7CFB\u7EDFsql\u6A21\u677F\uFF0C\u60A8\u60F3\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u5417\uFF1F
--- a/i18n/plugins/org.talend.designer.dbmap.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.dbmap.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.dbmap.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.dbmap
--- a/i18n/plugins/org.talend.designer.dbmap.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.dbmap.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.dbmap.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.documentation.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.documentation.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.documentation.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.documentation
--- a/i18n/plugins/org.talend.designer.documentation.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.documentation.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.documentation.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.documentation.nl/src/org/talend/designer/documentation/i18/messages_en.properties
+++ b/i18n/plugins/org.talend.designer.documentation.nl/src/org/talend/designer/documentation/i18/messages_en.properties
@@ -1,6 +1,5 @@
 HTMLDocGenerator_Precision=Precision
 HTMLDocGenerator_Author=Author
-HTMLDocGenerator_Author=Author
 HTMLDocGenerator_Column=Column
 HTMLDocGenerator_Comment=Comment
 HTMLDocGenerator_Component=Component
--- a/i18n/plugins/org.talend.designer.documentation.nl/src/org/talend/designer/documentation/i18/messages_fr.properties
+++ b/i18n/plugins/org.talend.designer.documentation.nl/src/org/talend/designer/documentation/i18/messages_fr.properties
@@ -1,6 +1,5 @@
 HTMLDocGenerator_Precision=Precision
 HTMLDocGenerator_Author=Auteur
-HTMLDocGenerator_Author=Auteur
 HTMLDocGenerator_Column=Colonne
 HTMLDocGenerator_Comment=Commentaire
 HTMLDocGenerator_Component=Composant
--- a/i18n/plugins/org.talend.designer.documentation.nl/src/org/talend/designer/documentation/i18/messages_ja.properties
+++ b/i18n/plugins/org.talend.designer.documentation.nl/src/org/talend/designer/documentation/i18/messages_ja.properties
@@ -1,6 +1,5 @@
 HTMLDocGenerator_Precision=\u7CBE\u5EA6
 HTMLDocGenerator_Author=\u4F5C\u6210\u8005
-HTMLDocGenerator_Author=\u4F5C\u6210\u8005
 HTMLDocGenerator_Column=\u30AB\u30E9\u30E0
 HTMLDocGenerator_Comment=\u30B3\u30E1\u30F3\u30C8
 HTMLDocGenerator_Component=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
--- a/i18n/plugins/org.talend.designer.documentation.nl/src/org/talend/designer/documentation/i18/messages_zh_CN.properties
+++ b/i18n/plugins/org.talend.designer.documentation.nl/src/org/talend/designer/documentation/i18/messages_zh_CN.properties
@@ -1,6 +1,5 @@
 HTMLDocGenerator_Precision=\u7CBE\u5EA6
 HTMLDocGenerator_Author=\u4F5C\u8005
-HTMLDocGenerator_Author=\u4F5C\u8005
 HTMLDocGenerator_Column=\u5217
 HTMLDocGenerator_Comment=\u5217\u6CE8\u91CA
 HTMLDocGenerator_Component=\u7EC4\u4EF6
--- a/i18n/plugins/org.talend.designer.fileoutputxml.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.fileoutputxml.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.fileoutputxml.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.fileoutputxml
--- a/i18n/plugins/org.talend.designer.fileoutputxml.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.fileoutputxml.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.fileoutputxml.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.gefabstractmap.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.gefabstractmap.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.gefabstractmap.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.gefabstractmap
--- a/i18n/plugins/org.talend.designer.gefabstractmap.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.gefabstractmap.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.gefabstractmap.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.mapper.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.mapper.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapper component Plug-in Nl Fragment
 Bundle-SymbolicName: org.talend.designer.mapper.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.mapper
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.designer.mapper.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.mapper.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.mapper.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.maven.job.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.maven.job.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Maven Job NL
 Bundle-SymbolicName: org.talend.designer.maven.job.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.maven.job
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
--- a/i18n/plugins/org.talend.designer.maven.job.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.maven.job.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.maven.job.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.rowgenerator.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.rowgenerator.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rowgenerator Nl Fragment
 Bundle-SymbolicName: org.talend.designer.rowgenerator.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.rowgenerator
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.designer.rowgenerator.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.rowgenerator.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.rowgenerator.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.runprocess.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.runprocess.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.designer.runprocess.nl fragment
 Bundle-SymbolicName: org.talend.designer.runprocess.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.designer.runprocess
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.designer.runprocess.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.runprocess.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.runprocess.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.scd.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.scd.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.scd.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.scd
--- a/i18n/plugins/org.talend.designer.scd.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.scd.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.scd.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.webservice.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.webservice.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.designer.webservice.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.webservice
--- a/i18n/plugins/org.talend.designer.webservice.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.webservice.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.webservice.nl</artifactId>
--- a/i18n/plugins/org.talend.designer.xmlmap.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.designer.xmlmap.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.designer.xmlmap.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.designer.xmlmap
--- a/i18n/plugins/org.talend.designer.xmlmap.nl/pom.xml
+++ b/i18n/plugins/org.talend.designer.xmlmap.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.xmlmap.nl</artifactId>
--- a/i18n/plugins/org.talend.expressionbuilder.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.expressionbuilder.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Expression Builder Nl Fragment
 Bundle-SymbolicName: org.talend.expressionbuilder.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.expressionbuilder
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.expressionbuilder.nl/pom.xml
+++ b/i18n/plugins/org.talend.expressionbuilder.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.expressionbuilder.nl</artifactId>
--- a/i18n/plugins/org.talend.expressionbuilder.nl/src/main/java/messages_zh_CN.properties
+++ b/i18n/plugins/org.talend.expressionbuilder.nl/src/main/java/messages_zh_CN.properties
@@ -1,4 +1,5 @@
 ExpressionComposite.expression=\u8868\u8FBE\u5F0F
+TestComposite.add=\u589E\u52A0
 ExpressionFileOperation.value=\u53C2\u6570\u503C
 ExpressionFileOperation.content=\u5185\u5BB9
 ExpressionFileOperation.nullable=\u662F\u5426\u4E3A\u7A7A
--- a/i18n/plugins/org.talend.presentation.onboarding.resource.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.presentation.onboarding.resource.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NL
 Bundle-SymbolicName: org.talend.presentation.onboarding.resource.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.presentation.onboarding.resource
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.presentation.onboarding.resource.nl/pom.xml
+++ b/i18n/plugins/org.talend.presentation.onboarding.resource.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>
--- a/i18n/plugins/org.talend.presentation.onboarding.resource.tos.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.presentation.onboarding.resource.tos.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NL
 Bundle-SymbolicName: org.talend.presentation.onboarding.resource.tos.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.presentation.onboarding.resource.tos
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.presentation.onboarding.resource.tos.nl/pom.xml
+++ b/i18n/plugins/org.talend.presentation.onboarding.resource.tos.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.ftp.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.ftp.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.ftp.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.repository.ftp
--- a/i18n/plugins/org.talend.repository.ftp.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.ftp.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.ftp.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.json.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.json.nl/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.repository.json.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.repository.json
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.repository.json.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.json.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.json.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.repository.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.repository
 Bundle-Localization: plugin
 Bundle-Vendor: .Talend SA.
--- a/i18n/plugins/org.talend.repository.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.nl</artifactId>
--- a/i18n/plugins/org.talend.repository.nl/src/main/java/messages_en.properties
+++ b/i18n/plugins/org.talend.repository.nl/src/main/java/messages_en.properties
@@ -176,7 +176,6 @@ connections.form.malformedField.username=The username must be a valid email.
 ImportProjectAsWizardPage.error.zip=Wrong archive file
 FileStep2.fieldSeparatorNotFinishByComma=The Field Separator doesn't finish by comma
 JobScriptsExportWizardPage.ExportJob=Export job to an archive file on the local file system.
-JobScriptsExportWizardPage.ExportJob=Export job to an archive file on the local file system.
 ImportDemoProjectPage.message=Select one of the available demo projects.
 DatabaseTableForm.nameAlert=A schema has an empty name. It has to be specified
 CreateFileDelimitedAction.action.openTitle=Open file delimited
@@ -551,7 +550,6 @@ AddListDialog.CHECKSIZE=Please check the size of the array\!
 AddListDialog.Error=Error
 AddListDialog.INPUTINDEX=please set index of current array
 WebServiceUI.Add_list_element=Add list element
-WebServiceUI.Add_list_element=Add list element
 WebServiceUI.COLUMN=Column
 WebServiceUI.Denormalize=Denormalize
 WebServiceUI.ELEMENT=Element
--- a/i18n/plugins/org.talend.repository.nl/src/main/java/messages_fr.properties
+++ b/i18n/plugins/org.talend.repository.nl/src/main/java/messages_fr.properties
@@ -176,7 +176,6 @@ connections.form.malformedField.username=L'e-mail de connexion doit
 ImportProjectAsWizardPage.error.zip=Mauvais fichier archive
 FileStep2.fieldSeparatorNotFinishByComma=Le séparateur de champ ne finit par par une virgule
 JobScriptsExportWizardPage.ExportJob=Exporter les Jobs vers une archive sur le système de fichier local.
-JobScriptsExportWizardPage.ExportJob=Exporter les Jobs vers une archive sur le système de fichier local.
 ImportDemoProjectPage.message=Sélectionnez un des projets Démo disponibles.
 DatabaseTableForm.nameAlert=Un schéma contient un nom vide. Il doit être spécifié.
 CreateFileDelimitedAction.action.openTitle=Ouvrir un fichier délimité
@@ -550,7 +549,6 @@ AddListDialog.CHECKSIZE=Veuillez v
 AddListDialog.Error=ERROR
 AddListDialog.INPUTINDEX=Veuillez définir l'index de la collection courante.
 WebServiceUI.Add_list_element=Ajouter un élément à la liste
-WebServiceUI.Add_list_element=Ajouter un élément à la liste
 WebServiceUI.COLUMN=Colonne
 WebServiceUI.Denormalize=Dénormaliser
 WebServiceUI.ELEMENT=Elément
--- a/i18n/plugins/org.talend.repository.nl/src/main/java/messages_ja.properties
+++ b/i18n/plugins/org.talend.repository.nl/src/main/java/messages_ja.properties
@@ -176,7 +176,6 @@ connections.form.malformedField.username=\u30E6\u30FC\u30B6\u30FC\u540D\u306F\u6
 ImportProjectAsWizardPage.error.zip=\u30A2\u30FC\u30AB\u30A4\u30D6\u30D5\u30A1\u30A4\u30EB\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
 FileStep2.fieldSeparatorNotFinishByComma=\u30D5\u30A3\u30FC\u30EB\u30C9\u533A\u5207\u308A\u8A18\u53F7\u306F\u30AB\u30F3\u30DE\u3067\u7D42\u4E86\u3057\u3066\u306F\u3044\u3051\u307E\u305B\u3093\u3002
 JobScriptsExportWizardPage.ExportJob=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u306B\u30B8\u30E7\u30D6\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
-JobScriptsExportWizardPage.ExportJob=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u306B\u30B8\u30E7\u30D6\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
 ImportDemoProjectPage.message=\u30C7\u30E2\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u3072\u3068\u3064\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
 DatabaseTableForm.nameAlert=\u30B9\u30AD\u30FC\u30DE\u540D\u304C\u7A7A\u3067\u3059\u3002\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 CreateFileDelimitedAction.action.openTitle=\u533A\u5207\u308A\u8A18\u53F7\u4ED8\u304D\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F
@@ -551,7 +550,6 @@ AddListDialog.CHECKSIZE=\u914D\u5217\u306E\u30B5\u30A4\u30BA\u3092\u78BA\u8A8D\u
 AddListDialog.Error=\u30A8\u30E9\u30FC
 AddListDialog.INPUTINDEX=\u73FE\u5728\u306E\u914D\u5217\u306B\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
 WebServiceUI.Add_list_element=\u30EA\u30B9\u30C8\u8981\u7D20\u306E\u8FFD\u52A0
-WebServiceUI.Add_list_element=\u30EA\u30B9\u30C8\u8981\u7D20\u306E\u8FFD\u52A0
 WebServiceUI.COLUMN=\u30AB\u30E9\u30E0
 WebServiceUI.Denormalize=\u975E\u6B63\u898F\u5316
 WebServiceUI.ELEMENT=\u30E2\u30B8\u30E5\u30FC\u30EB
--- a/i18n/plugins/org.talend.repository.nl/src/main/java/messages_zh_CN.properties
+++ b/i18n/plugins/org.talend.repository.nl/src/main/java/messages_zh_CN.properties
@@ -170,7 +170,6 @@ connections.form.malformedField.username=E-mail \u5fc5\u987b\u4e3a\u53ef\u7528\u
 ImportProjectAsWizardPage.error.zip=\u9519\u8bef\u7684\u5b58\u6863\u6587\u4ef6
 FileStep2.fieldSeparatorNotFinishByComma=\u5b57\u6bb5\u5206\u9694\u7b26\u4e0d\u662f\u4ee5\u9017\u53f7\u7ed3\u675f
 JobScriptsExportWizardPage.ExportJob=\u5bfc\u51fa\u4f5c\u4e1a\u811a\u672c\u5230\u4e00\u4e2a\u672c\u5730\u6587\u4ef6\u7cfb\u7edf\u7684\u538b\u7f29\u6587\u4ef6\u4e2d\u3002
-JobScriptsExportWizardPage.ExportJob=\u5bfc\u51fa\u4f5c\u4e1a\u811a\u672c\u5230\u4e00\u4e2a\u672c\u5730\u6587\u4ef6\u7cfb\u7edf\u7684\u538b\u7f29\u6587\u4ef6\u4e2d\u3002
 ImportDemoProjectPage.message=\u9009\u62e9\u4e00\u4e2a\u6709\u6548\u7684\u793a\u4f8b\u5de5\u7a0b.
 DatabaseTableForm.nameAlert=Schema \u540d\u4e0d\u80fd\u4e3a\u7a7a\uff0c\u987b\u88ab\u6307\u5b9a
 CreateFileDelimitedAction.action.openTitle=\u6253\u5f00\u6587\u4ef6\u5206\u9694\u7b26
@@ -487,6 +486,7 @@ ContextExportDialog_StringAttachmentNotSupported=\\u662F\u4E00\u4E2A\u6587\u4EF6
 ContextExportDialog_StringAttachmentNotSupported=\\u662F\u4E00\u4E2A\u6587\u4EF6\u5185\u5BB9\u3002.\u4E0D\u652F\u6301\u5B57\u7B26\u4E32\u9644\u4EF6\u6A21\u5F0F.
 ContextExportDialog_XsdType=XSD\u7C7B\u578B
 AbstractCreateTableAction.retrieveForbidden=\u68C0\u7D22\u88AB\u7981\u6B62
+AbstractCreateTableAction.retrieveForbidden.Message=\u8BE5\u6570\u636E\u5E93\u4E2D\u6CA1\u6709\u8868\u683C
 SelectDatabaseJarDialog.add=\u589E\u52A0
 SelectDatabaseJarDialog.delete=\u5220\u9664
 SelectDatabaseJarDialog.warningTitle=\u8B66\u544A
@@ -497,7 +497,6 @@ AddListDialog.CHECKSIZE=\u8BF7\u68C0\u67E5\u6570\u7EC4\u7684\u5927\u5C0F\uFF01
 AddListDialog.CHECKSIZE=\u8BF7\u68C0\u67E5\u6570\u7EC4\u7684\u5927\u5C0F\uFF01
 AddListDialog.Error=\u9519\u8BEF
 AddListDialog.INPUTINDEX=\u8BF7\u8BBE\u7F6E\u5F53\u524D\u6570\u7EC4\u7684\u7D22\u5F15
-WebServiceUI.Add_list_element=\u6DFB\u52A0\u5217\u8868\u5143\u7D20
 WebServiceUI.Add_list_element=\u6DFB\u52A0\u5217\u8868\u5143\u7D20
 WebServiceUI.COLUMN=\u5217
 WebServiceUI.Denormalize=\u975E\u89C4\u8303\u5316
--- a/i18n/plugins/org.talend.repository.view.di.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.repository.view.di.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl
 Bundle-SymbolicName: org.talend.repository.view.di.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.repository.view.di
--- a/i18n/plugins/org.talend.repository.view.di.nl/pom.xml
+++ b/i18n/plugins/org.talend.repository.view.di.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.view.di.nl</artifactId>
--- a/i18n/plugins/org.talend.sbi.engines.client.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.sbi.engines.client.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.sbi.engines.client.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.sbi.engines.client
--- a/i18n/plugins/org.talend.sbi.engines.client.nl/pom.xml
+++ b/i18n/plugins/org.talend.sbi.engines.client.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.sbi.engines.client.nl</artifactId>
--- a/i18n/plugins/org.talend.spagic.engines.client.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.spagic.engines.client.nl/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nl Fragment
 Bundle-SymbolicName: org.talend.spagic.engines.client.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Fragment-Host: org.talend.spagic.engines.client
--- a/i18n/plugins/org.talend.spagic.engines.client.nl/pom.xml
+++ b/i18n/plugins/org.talend.spagic.engines.client.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.spagic.engines.client.nl</artifactId>
--- a/i18n/plugins/org.talend.sqlbuilder.nl/META-INF/MANIFEST.MF
+++ b/i18n/plugins/org.talend.sqlbuilder.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.talend.sqlbuilder Nl Fragment
 Bundle-SymbolicName: org.talend.sqlbuilder.nl
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Bundle-Vendor: .Talend SA.
 Fragment-Host: org.talend.sqlbuilder
 Bundle-Localization: plugin
--- a/i18n/plugins/org.talend.sqlbuilder.nl/pom.xml
+++ b/i18n/plugins/org.talend.sqlbuilder.nl/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.sqlbuilder.nl</artifactId>
--- a/main/features/org.talend.designer.business.feature/feature.xml
+++ b/main/features/org.talend.designer.business.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.designer.business.feature"
      label="Business Feature"
-      version="7.0.1.qualifier"
+      version="7.0.2.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#business-feature">
--- a/main/features/org.talend.designer.business.feature/pom.xml
+++ b/main/features/org.talend.designer.business.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.business.feature</artifactId>
--- a/main/features/org.talend.designer.feature/feature.xml
+++ b/main/features/org.talend.designer.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.designer.feature"
      label="Designer Feature"
-      version="7.0.1.qualifier"
+      version="7.0.2.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#designer-feature">
--- a/main/features/org.talend.designer.feature/pom.xml
+++ b/main/features/org.talend.designer.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.feature</artifactId>
--- a/main/features/org.talend.rcp.branding.tos.feature/feature.xml
+++ b/main/features/org.talend.rcp.branding.tos.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.rcp.branding.tos.feature"
      label="Tos branding feature"
-      version="7.0.1.qualifier"
+      version="7.0.2.qualifier"
      provider-name=".Talend SA."
      plugin="org.talend.rcp.branding.tos">

--- a/main/features/org.talend.rcp.branding.tos.feature/pom.xml
+++ b/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>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.branding.tos.feature</artifactId>
--- a/main/features/org.talend.rcp.branding.tos.test.feature/feature.xml
+++ b/main/features/org.talend.rcp.branding.tos.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.rcp.branding.tos.test.feature"
      label="Test feature for TOS"
-      version="7.0.1.qualifier">
+      version="7.0.2.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
@@ -400,4 +400,12 @@
         version="0.0.0"
         fragment="true"
         unpack="false"/>
+         
+    <plugin
+         id="org.talend.datatools.xml.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
 </feature>
--- a/main/features/org.talend.rcp.branding.tos.test.feature/pom.xml
+++ b/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>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>
--- a/main/features/org.talend.repository.feature/feature.xml
+++ b/main/features/org.talend.repository.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.repository.feature"
      label="Repository Feature"
-      version="7.0.1.qualifier"
+      version="7.0.2.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#repository-feature">
--- a/main/features/org.talend.repository.feature/pom.xml
+++ b/main/features/org.talend.repository.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.repository.feature</artifactId>
--- a/main/features/org.talend.sbi.feature/feature.xml
+++ b/main/features/org.talend.sbi.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.sbi.feature"
      label="SBI Feature"
-      version="7.0.1.qualifier"
+      version="7.0.2.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#sbi-feature">
--- a/main/features/org.talend.sbi.feature/pom.xml
+++ b/main/features/org.talend.sbi.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.sbi.feature</artifactId>
--- a/main/features/org.talend.spagic.feature/feature.xml
+++ b/main/features/org.talend.spagic.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.spagic.feature"
      label="SPAGIC Feature"
-      version="7.0.1.qualifier"
+      version="7.0.2.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.talend.com/online/featuresdescription.html#spagic-feature">
--- a/main/features/org.talend.spagic.feature/pom.xml
+++ b/main/features/org.talend.spagic.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.spagic.feature</artifactId>
--- a/main/features/org.talend.tos.components.feature/feature.xml
+++ b/main/features/org.talend.tos.components.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.tos.components.feature"
      label="Components-feature"
-      version="7.0.1.qualifier">
+      version="7.0.2.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
--- a/main/features/org.talend.tos.components.feature/pom.xml
+++ b/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>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.tos.components.feature</artifactId>
--- a/main/features/org.talend.tos.feature/feature.xml
+++ b/main/features/org.talend.tos.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.tos.feature"
      label="Tos feature"
-      version="7.0.1.qualifier"
+      version="7.0.2.qualifier"
      provider-name=".Talend SA.">

   <description url="http://www.example.com/description">
--- a/main/features/org.talend.tos.feature/pom.xml
+++ b/main/features/org.talend.tos.feature/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.tos.feature</artifactId>
--- a/main/features/org.talend.tos.libraries.feature/feature.xml
+++ b/main/features/org.talend.tos.libraries.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
      id="org.talend.tos.libraries.feature"
      label="Libraries_feature"
-      version="7.0.1.qualifier">
+      version="7.0.2.qualifier">

   <description url="http://www.example.com/description">
      [Enter Feature Description here.]
--- a/main/features/org.talend.tos.libraries.feature/pom.xml
+++ b/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>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.tos.libraries.feature</artifactId>
--- a/main/plugins/org.talend.designer.abstractmap/META-INF/MANIFEST.MF
+++ b/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: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Bundle-Activator: org.talend.designer.abstractmap.MapPlugin
 Require-Bundle: org.eclipse.core.runtime,
 org.talend.core,
--- a/main/plugins/org.talend.designer.abstractmap/pom.xml
+++ b/main/plugins/org.talend.designer.abstractmap/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.abstractmap</artifactId>
--- a/main/plugins/org.talend.designer.alfrescooutput/META-INF/MANIFEST.MF
+++ b/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: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Bundle-Vendor: .Talend SA.
 Require-Bundle: org.eclipse.core.runtime,
 org.talend.core,
--- a/main/plugins/org.talend.designer.alfrescooutput/pom.xml
+++ b/main/plugins/org.talend.designer.alfrescooutput/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.alfrescooutput</artifactId>
--- a/main/plugins/org.talend.designer.business.diagram/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.designer.business.diagram/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.talend.designer.business.diagram; singleton:=true
-Bundle-Version: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.talend.designer.business.model.business.diagram.part.BusinessDiagramEditorPlugin
 Bundle-Vendor: %providerName
--- a/main/plugins/org.talend.designer.business.diagram/pom.xml
+++ b/main/plugins/org.talend.designer.business.diagram/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.business.diagram</artifactId>
--- a/main/plugins/org.talend.designer.codegen/META-INF/MANIFEST.MF
+++ b/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: 7.0.1.qualifier
+Bundle-Version: 7.0.2.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.talend.core.repository,
 org.eclipse.emf.codegen,
--- a/main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/footer.javajet
--- a/main/plugins/org.talend.designer.codegen/jet_stub/generic/component_process_data_begin.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/generic/component_process_data_begin.javajet
@@ -66,25 +66,27 @@ if(hasInput){
            	if (writer_<%=cid%> instanceof org.talend.components.api.component.runtime.WriterWithFeedback) {
 					org.talend.components.api.component.runtime.WriterWithFeedback writerWithFeedbackMain_<%=cid%> = (org.talend.components.api.component.runtime.WriterWithFeedback) writer_<%=cid%>;
 					writerWithFeedbackMain_<%=cid%> = new org.talend.codegen.flowvariables.runtime.FlowVariablesWriter(writerWithFeedbackMain_<%=cid%>, container_<%=cid%>);
-					java.lang.Iterable<?> outgoingRecs = writerWithFeedbackMain_<%=cid%>.getSuccessfulWrites();
-                    java.util.Iterator outgoingMainRecords_<%=cid%> = outgoingRecs.iterator();
+					java.lang.Iterable<?> outgoingRecs_<%=cid%> = writerWithFeedbackMain_<%=cid%>.getSuccessfulWrites();
+                    java.util.Iterator outgoingMainRecords_<%=cid%> = outgoingRecs_<%=cid%>.iterator();
                    Object outgoingMain_<%=cid%> = null;
                    if (outgoingMainRecords_<%=cid%>.hasNext()) {
-                    	outgoingMainRecordsList_<%=cid%> = outgoingRecs;
+                    	outgoingMainRecordsList_<%=cid%> = outgoingRecs_<%=cid%>;
                    }
              	}
            <%
            }
            if (rejectIrToRow != null) {
            %>
-            		java.lang.Iterable<?> outgoingRejectRecordsList_<%=cid%> = new java.util.ArrayList<Object>();
-					org.talend.components.api.component.runtime.WriterWithFeedback writerWithFeedbackReject_<%=cid%> = (org.talend.components.api.component.runtime.WriterWithFeedback) writer_<%=cid%>;
-					writerWithFeedbackReject_<%=cid%> = new org.talend.codegen.flowvariables.runtime.FlowVariablesWriter(writerWithFeedbackReject_<%=cid%>, container_<%=cid%>);
-					java.lang.Iterable<?> outgoingRejectRecs = writerWithFeedbackReject_<%=cid%>.getRejectedWrites();
-                    java.util.Iterator outgoingRejectRecords_<%=cid%> = outgoingRejectRecs.iterator();
+                java.lang.Iterable<?> outgoingRejectRecordsList_<%=cid%> = new java.util.ArrayList<Object>();
+                if (writer_<%=cid%> instanceof org.talend.components.api.component.runtime.WriterWithFeedback) {
+					     org.talend.components.api.component.runtime.WriterWithFeedback writerWithFeedbackReject_<%=cid%> = (org.talend.components.api.component.runtime.WriterWithFeedback) writer_<%=cid%>;
+					     writerWithFeedbackReject_<%=cid%> = new org.talend.codegen.flowvariables.runtime.FlowVariablesWriter(writerWithFeedbackReject_<%=cid%>, container_<%=cid%>);
+					     java.lang.Iterable<?> outgoingRejectRecs_<%=cid%> = writerWithFeedbackReject_<%=cid%>.getRejectedWrites();
+                    java.util.Iterator outgoingRejectRecords_<%=cid%> = outgoingRejectRecs_<%=cid%>.iterator();
                    if (outgoingRejectRecords_<%=cid%>.hasNext()) {
-                    	outgoingRejectRecordsList_<%=cid%> = outgoingRejectRecs;
+                        outgoingRejectRecordsList_<%=cid%> = outgoingRejectRecs_<%=cid%>;
                    }
+                }
            <%
            }
            if(mainIrToRow != null) {
--- a/main/plugins/org.talend.designer.codegen/jet_stub/generic/component_util_process_properties.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/generic/component_util_process_properties.javajet
@@ -11,6 +11,8 @@
 
     private final Component component;
     
+     private int schemaIndex = 0;
+     
     public ProcessPropertiesGenerator(String cid, Component component) {
         this.cid = cid;
         this.component = component;    
@@ -23,7 +25,9 @@
     
 		            Object value = property.getStoredValue();
 		            if (value != null) {
- 		            	if (setDynamicTags && (value instanceof String) && isDynamicValue(String.valueOf(value), connName)) {
+ 		            	boolean isSchemaProperty = property instanceof org.talend.daikon.properties.property.SchemaProperty;
+ 		            	
+ 		            	if (!isSchemaProperty && setDynamicTags && (value instanceof String) && isDynamicValue(String.valueOf(value), connName)) {
 		            		property.setTaggedValue(IGenericConstants.DYNAMIC_PROPERTY_VALUE, "true");
 		            	}
 		                if (value instanceof List) { // if
@@ -77,10 +81,64 @@
 		                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
 		                        <%=property.getType().replaceAll("<.*>", "")%>.<%=property.getValue()%>);
 		                    <%
- 		                } else if (property instanceof org.talend.daikon.properties.property.SchemaProperty) {
+ 		                } else if (isSchemaProperty) {
+ 		                		String schemaValue = component.getCodegenValue(property, property.getStringValue());
+ 		                		String[] splits = schemaValue.split("(?=\\\\\"name\\\\\":)");
+ 		                		
+ 		                		String classNameTail = "fisrt";
+ 		                		if(!firstCall) {
+ 		                			classNameTail = "second";
+ 		                		}
 		                    %>
+ 		                    class SchemaSettingTool_<%=cid%>_<%=++schemaIndex%>_<%=classNameTail%> {
+ 		                    		
+ 		                    		String getSchemaValue() {
+ 		                    				<%
+ 		                    				if((splits == null) || (splits.length < 2)) {
+ 		                    				%>
+ 		                    				return <%=schemaValue%>;
+ 		                    				<%
+ 		                    				} else {
+                    						%>
+ 		                    						StringBuilder s = new StringBuilder();
+                    						<%
+     		                    				for(int i=0; i<splits.length; i++) {
+     		                    						String currentSplit = splits[i];
+     		                    						if(i == 0) {
+     		                    						%>
+     		                    						a(<%=currentSplit%>",s);
+     		                    						<%
+     		                    								continue;
+     		                    						}
+     		                    						
+     		                    						if(i == (splits.length - 1)) {
+     		                    						%>
+     		                    						a("<%=currentSplit%>,s);
+     		                    						<%
+     		                    								continue;
+     		                    						}
+     		                    						
+     		                    						%>
+     		                    						a("<%=currentSplit%>",s);
+     		                    						<%
+     		                    				}
+     		                    		%>
+     		                    				return s.toString();
+     		                    		<%
+ 		                    				}
+ 		                    				%>
+ 		                    		}
+ 		                    		
+ 		                    		void a(String part, StringBuilder strB) {
+ 		                    				strB.append(part);
+ 		                    		}
+ 		                    		
+ 		                    }
+ 		                    
+ 		                    SchemaSettingTool_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%> sst_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%> = new SchemaSettingTool_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%>();
+ 		                    
 		                    props_<%=cid %><%=propInfo.fieldName%>.setValue("<%=property.getName()%>",
- 		                        new org.apache.avro.Schema.Parser().parse(<%=component.getCodegenValue(property, property.getStringValue())%>));
+ 		                        new org.apache.avro.Schema.Parser().parse(sst_<%=cid%>_<%=schemaIndex%>_<%=classNameTail%>.getSchemaValue()));
 		                    <%
 		                } else if (!(value instanceof String) || !((String)value).equals("")) {
 		                    %>
--- a/main/plugins/org.talend.designer.codegen/jet_stub/header.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/header.javajet
@@ -137,8 +137,8 @@ for (INode node : process.getNodesOfType("tRESTClient")) {
    }
 }

-boolean talendEsbJob = actAsProvider || actAsConsumer || !process.getNodesOfType("tRouteInput").isEmpty();
 boolean talendEsbJobFactory = actAsProvider || !process.getNodesOfType("tRouteInput").isEmpty();
+boolean talendEsbJob = talendEsbJobFactory || actAsConsumer;

 boolean talendStepTemplate = !process.getNodesOfType("tActionInput").isEmpty() || !process.getNodesOfType("tActionOutput").isEmpty() || !process.getNodesOfType("tJobReject").isEmpty();

@@ -209,11 +209,6 @@ protected static void logIgnoredError(String message, Throwable cause) {
 		// fix for TESB-7714
 		talendESBJob.setEndpointRegistry(registry);

-		// TESB-15920 tRESTClient and SAM not working
-		<% if (hasSAM4RS) { %>
-		talendESBJob.setEventFeature(eventFeature);
-		<% } %>
-
 		return talendESBJob;
 	}
 <% } %>
--- a/main/plugins/org.talend.designer.codegen/jet_stub/subprocess_header.javajet
+++ b/main/plugins/org.talend.designer.codegen/jet_stub/subprocess_header.javajet
@@ -97,7 +97,7 @@
 								}

 								// for tRecordMatching
-								if(conn.getTarget().getUniqueName().startsWith("tRecordMatching")){
+								if(conn.getTarget().getUniqueName().indexOf("tRecordMatching")>-1){
 									List<Map<String, String>> joinKeys = (List<Map<String,String>>)ElementParameterParser.getObjectValue(conn.getTarget(), "__BLOCKING_DEFINITION__");
 									for(Map<String, String> joinKeyLine : joinKeys){
 										String lookupKey = joinKeyLine.get("LOOKUP_COLUMN");
--- a/main/plugins/org.talend.designer.codegen/pom.xml
+++ b/main/plugins/org.talend.designer.codegen/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <groupId>org.talend.studio</groupId>
    <artifactId>tdi-studio-se</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.2-SNAPSHOT</version>
    <relativePath>../../../</relativePath>
  </parent>
  <artifactId>org.talend.designer.codegen</artifactId>
--- a/Show More
+++ b/Show More