TESB-30423:Install Patch_20200925_R2020-09_v1-7.3.1 with TDI.license, (#5373) studio export job fail

(cherry picked from commit fde070a15b)

.gitignore

@@ -11,3 +11,4 @@ main/plugins/org.talend.designer.codegen/resources/sparkstreaming_header.javajet
 main/plugins/org.talend.designer.codegen/resources/sparkstreaming_subprocess_footer.javajet
 main/plugins/org.talend.designer.codegen/resources/sparkstreaming_subprocess_header.javajet
 main/plugins/org.talend.designer.codegen/resources/routelet.skeleton
+.DS_Store

CONTRIBUTORS.md

@@ -4,5 +4,7 @@ Huge thanks to these people who contributed in making Talend product better:
  - [jlolling](https://github.com/jlolling) (Jan -and Miss- Lolling)
  - [kirkalicious](https://github.com/kirkalicious) (Kirk Tarou)
  - [mrizzato](https://github.com/mrizzato) (Massimiliano Rizzato)
+ - [overpackaging](https://github.com/overpackaging) (Steeve Dreux)
  - [brazabr](https://github.com/brazabr) (Thiago Benvenuto)
- - [phoflack](https://jira.talendforge.org/secure/ViewProfile.jspa?name=phoflack) (Philip Hoflack)
+ - [phoflack](https://jira.talendforge.org/secure/ViewProfile.jspa?name=phoflack) (Philip Hoflack)
+ - [bgunics-talend](https://github.com/bgunics-talend) (Balasz Gunics)

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap.nl</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.alfrescooutput.nl</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram.nl</artifactId>

i18n/plugins/org.talend.designer.business.diagram.nl/src/messages_en.properties

@@ -8,7 +8,7 @@ BusinessAbstractParser.StringIntegerConvertError=String value cannot be converte
 BusinessPaletteFactory.CreateGear=Create new Gear
 SimpleBusinessCreationWizardPage.Title=New Business Model
 BusinessNewDiagramFileWizard.CreateNewDiagram=Create new diagram based on {0}  model content
-BusinessAbstractParser.UnknownLiteral=Unknown literal: 
+BusinessAbstractParser.UnknownLiteral=Unknown literal:
 BusinessAbstractParser.StringLongConverError=String value cannot be converted to Long value
 AssignmentPropertySection.DeleteAssignment=Delete Assignment
 AssignmentPropertySection.Type=Type
@@ -20,7 +20,7 @@ AssignmentPropertySection.Name=Name
 CreateAssignmentCommand.CannotAssign=Cannot Assign.
 BusinessNewDiagramFileWizard.DiagramRootElement=Diagram root element
 BusinessNewDiagramFileWizard.NoDiagramRootElementSelectedError=No diagram root element selected
-BusinessVisualIDRegistry.ParseError=Unable to parse view type as a visualID number: 
+BusinessVisualIDRegistry.ParseError=Unable to parse view type as a visualID number:
 OpenDiagramAction.EditBusinessModel=Edit Business Model
 BusinessAbstractParser.ValueOfTypeByteIsExpected=Value of type Byte is expected
 BusinessAbstractParser.ValueOfTypeCharacterIsExpected=Value of type Character is expected
@@ -35,11 +35,11 @@ BusinessPaletteFactory.DatabaseComment=Create new Database
 AssignmentPropertySection.Comment=Comment
 SimpleBusinessCreationWizard.NewBusinessModel=New Business Model
 BusinessNewDiagramFileWizard.InvalidDiagramRootElementSelected=Invalid diagram root element was selected
-BusinessInitDiagramFileAction.IntialNew=Initialize new 
+BusinessInitDiagramFileAction.IntialNew=Initialize new
 FindAssignmentAction.FindAssignments=Find Assignments
 RepositoryFactoryProxyLabelProvider.NotFound= (Not Found)
 BusinessPaletteFactory.Terminal=Terminal
-BusinessAbstractParser.InvalidInputAt=Invalid input at 
+BusinessAbstractParser.InvalidInputAt=Invalid input at
 BusinessPaletteFactory.Gear=Gear
 BusinessPaletteFactory.InputComment=Create new Input
 BusinessPaletteFactory.Data=Data
@@ -54,7 +54,7 @@ BusinessModelingAssistantProvider.SelectDomainModelElement=Select domain model e
 BusinessPaletteFactory.CreateActor=Create new Actor
 BusinessAbstractParser.StringDoubleConvertError=String value cannot be converted to Double value
 BusinessPaletteFactory.Actor=Actor
-EditAction.Edit=Edit 
+EditAction.Edit=Edit
 BusinessCreationWizardPage.CreateBusinessDiagram=Create a Business diagram
 BusinessPaletteFactory.Database=Datasource
 BusinessPaletteFactory.ListComment=Create new List
@@ -66,7 +66,7 @@ BusinessInitDiagramFileAction.LoadFaild=Model file loading failed
 BusinessPaletteFactory.DecisionComment=Create new Decision
 BusinessAbstractParser.ValueOfDoubleIsExpected=Value of type Double is expected
 OpenDiagramAction.ReadBusinessModel=Read Business Model
-BusinessInitDiagramFileAction.UnableToLoadResource=Unable to load resource: 
+BusinessInitDiagramFileAction.UnableToLoadResource=Unable to load resource:
 BusinessPaletteFactory.CreateEllipse=Create new Ellipse
 BusinessNewDiagramFileWizard.DiagramFile=Diagram file
 BusinessAbstractParser.StringShortConverError=String value cannot be converted to Short value

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen.nl</artifactId>

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

@@ -2,7 +2,7 @@ JavaRoutineSynchronizer.UnsupportedOperation.Exception1=method not implemented:
 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 : 
+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).
@@ -35,7 +35,7 @@ CodeGenInit.removeLink=Remove linked resources
 CodeGenInit.saveWorkspace=Saving workspace
 DocumentRootImpl.mixed=\ (mixed:
 NodesSubTree.enableParallel=__ENABLE_PARALLEL__
-PoolTypeImpl.persistentPool=\ (persistentPool:
+PoolTypeImpl.persistentPool= \ (persistentPool:
 TalendJetEmitter.compileFail=\ compile fail : {0} : {1}
 TalendJetEmitter.exception=Exception on
 JetFilesProviderManager.unableLoad=Unable to load {0}JetFilesProviderManager.unableLoad
@@ -84,7 +84,7 @@ FAMILY.eXist=eXist
 FAMILY.FTP=FTP
 FAMILY.Fields=Fields
 FAMILY.File=File
-FAMILY.FireBird=Firebird
+FAMILY.FireBird=FireBird
 FAMILY.Greenplum=Greenplum
 FAMILY.HSQLDb=HSQLDb
 FAMILY.Healthcare=Healthcare

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

@@ -139,3 +139,7 @@ ComponentsPreferencePage_SuccessMessage1=Red\u00E9marrez le Studio pour charger
 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

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange.nl</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.core.nl</artifactId>

i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_en.properties

@@ -1,7 +1,7 @@
 FileController.decoration.description=Content taken from the repository
 AdvancedContextComposite.Name=Name
 EParameterName.tableMeter=Meter Table
-EParameterName.password=Password 
+EParameterName.password=Password
 DesignerPreferencePage.display.useRepositoryName=Use the Repository name as label for the components dragged and dropped from the Repository Metadata.
 UpdateDetectionDialog.Expand=Expand All
 EParameterName.CurrentOS=Current OS
@@ -94,7 +94,7 @@ ExecuteSystemCommandCommand.Command=Execute...
 UpdateDetectionDialog.Operations=Operations
 ChangeConnectionStatusCommand.setLinkRef=set Link as Ref
 Note.DefaultText=text
-DesignerColorsPreferencePage.ConnectionColorMessages=If you change link colors, you should restart the current job to apply changes. 
+DesignerColorsPreferencePage.ConnectionColorMessages=If you change link colors, you should restart the current job to apply changes.
 MultiPageEditorContributor.runMenu=Run
 EParameterName.uniqueName=Unique Name
 ExternalNodeChangeCommand.propagateMessage=Would you like to propagate changes ?
@@ -109,7 +109,7 @@ ConfigureConnParamDialog.ContextText=With Context:
 EParameterName.UseStatistics=Use statistics (tStatCatcher)
 StatsAndLogsComposite.StatsLogsSettings=Stats & Logs Settings
 NodesPasteCommand.label=Paste
-ExternalNodeChangeCommand.modifaicationFrom=Modification from 
+ExternalNodeChangeCommand.modifaicationFrom=Modification from
 EmfComponent.Time=Time
 ContextParameterExtractor.ExistedMessages=Some context parameters have be existed in {0}.
 TextController.decoration.description=Value taken from the repository
@@ -229,10 +229,10 @@ ContextParameterPage.title=Context parameter
 NodeReturn.Availability.AFTER=After
 EmfComponent.repository=Repository
 EParameterName.ConnectionFormat=Connection format
-ExecuteSystemCommandCommand.Title=Executed command 
+ExecuteSystemCommandCommand.Title=Executed command
 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
+NewProcessWizard.title=New job
 CheckController.decoration.description=Value taken from the repository
 ContextParameterPage.comment=Comment
 EParameterName.onConsoleFlag=On Console
@@ -268,7 +268,7 @@ ContextParameterPage.nameExists=Parameter name already exists.
 ExecuteSystemCommandCommand.Label=Executes special commands which were set by user or defined in component.
 ContextParameterPage.defaultValue=Default value
 MergeOrderDialog.MoveDown=Move Down
-EParameterName.dbName=Db Name 
+EParameterName.dbName=Db Name
 TalendEditorContextMenuProvider.Row=Row
 EParameterName.catchUserWarning=Catch user warnings
 StatsAndLogsComposite.Save=&Save to preferences
@@ -502,7 +502,7 @@ TraceEnableAction.TraceEnableDesc=Set Trace Enable
 TraceEnableAction.TraceEnableTitle=Trace Enable
 UpdateManagerUtils.updateMOfification=Update manager modification
 WSDL2JAVAController.TOS=Talend Open Studio
-WSDL2JAVAController.generateFileFailed=Generate java files failed \n{0} \:
+WSDL2JAVAController.generateFileFailed=Generate java files failed \n{0} :
 WSDL2JAVAController.generateFileFailedFromWSDL=Generate java files from the wsdl file\: {0} successfully.
 JobSettingProjectSettingPage.implictLabel=Implicit context load
 JobSettingProjectSettingPage.statAndLog=Stats and logs
@@ -673,7 +673,7 @@ ModifyMergeOrderAction.ERROE=Error
 ConnectionDeleteCommand.COLLAPSE=Warning
 ConnectionDeleteCommand.COLLAPSEJOBLET=Can not delete the connections of the expanded Joblet in Job.
 MultiPageTalendEditor.DIRTY=Dirty joblet
-MultiPageTalendEditor.DIRTYMESSAGE=\ is dirty, Please save joblet first, otherwise you will lose the modification in joblet?
+MultiPageTalendEditor.DIRTYMESSAGE= is dirty, Please save joblet first, otherwise you will lose the modification in joblet?
 UpdateDetectionDialog.jobletMessage=Job closed will be updated automatically.
 ImportExportPreferencePage.addClasspathJar=Add classpath jar in exported jobs (not compatible with JobServer)
 DbTableController.dialog.title=Error
@@ -717,7 +717,7 @@ TalendEditorDropTargetListener.updateHadoopCfgDialog.msg=The hadoop configuratio
 CodeView.initMessage=Generation Engine Initialization in progress...
 Connection.paral_queuesize=QUEUE_SIZE
 ModulesInstaller_text1=Component {0} requires the following third party modules;
-ModulesInstaller_title1=List of modules not installed for component 
+ModulesInstaller_title1=List of modules not installed for component
 ModulesInstaller_text2=Selected components require the following third party modules
 ModulesInstaller_title2=List of modules not installed for the selected components
 PropertiesWizardPage.ItemExistsError=This item already exists. Check the Recycle bin and empty it if needed.
@@ -1005,3 +1005,5 @@ PerformancePreferencePage.propagateContext=Propagate contexts added in repositor
 LicenseKeyController.NewLicenseKey=Enter a new license key
 ReconcilerStyledText.illegalArgs=Input args are bigger than text length:{0}, original input <{1}, {2}>, changed to <{3}, {4}>.
 JobLaunchConfigurationDelegate.waitProcessRunning=Waiting for running process...
+StitchDataLoaderConstants.descriptionForIntegrationSource=Extract {0} data and ingest it in the cloud destination of your choice using Stitch Data Loader. Select this option to open your browser and try it for free.
+StitchDataLoaderConstants.descriptionForDataWarehouseDestination=Ingest data from over 100 popular sources to {0} using Stitch Data Loader. Select this option to open your browser and try it for free.

i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_fr.properties

@@ -975,3 +975,29 @@ PerformancePreferencePage.defaultTimeout.read=Valeur du d\u00E9lai avant expirat
 Node.hasMoreThenOneSourceKey=Ce composant n\'a pas de source cl\u00E9 d\u00E9finie.
 DatabaseForm.checkFailure=\u00C9chec de la connexion
 DatabaseForm.checkFailureTip=Vous devez modifier les param\u00E8tres de la base de donn\u00E9es.
+AbstractPreferenceComposite.textContent2=Appliquer aux sous-Jobs
+AbstractPreferenceComposite.tipContent2=Appliquer aux sous-Jobs
+ActivateSubjobAction.ActivateComplete2=Activer le sous-Job complet
+ActivateSubjobAction.ActivatePart2=Activer le sous-Job courant
+ActivateSubjobAction.DeactivateComplete2=D\u00E9sactiver le sous-Job complet
+ActivateSubjobAction.DeactivatePart2=D\u00E9sactiver le sous-Job courant
+ChangeActivateStatusSubjobCommand.Label.ActiveComplete2=Activer le sous-Job complet
+ChangeActivateStatusSubjobCommand.Label.ActivePart2=Activer le sous-Job courant
+ChangeActivateStatusSubjobCommand.Label.DeactiveComplete2=D\u00E9sactiver le sous-Job complet
+ChangeActivateStatusSubjobCommand.Label.DeactivePart2=D\u00E9sactiver le sous-Job courant
+ComponentSettingsView.subjob2=Sous-Job
+ConnectionSetAsMainRef.ConnectionModifyError2=Impossible de modifier la connexion lorsque le composant de d\u00E9but a un lien subJob.
+DisplaySubjobCommand.DisplaySubjob2=Afficher le sous-Job
+DisplaySubjobCommand.HideSubjob2=Masquer le sous-Job
+EParameterName.OverrideEncodingFlag=\u00C9craser l\'encodage
+EParameterName.showSubjob2=Afficher le titre du sous-Job
+ModifyMergeOrderAction.ConnectionModifyError2=Impossible de modifier la connexion lorsque le composant de d\u00E9but a un lien subJob.
+Node.notSubjobStartNode2=Ce composant \"{0}\" n\'est pas un n\u00BDud de d\u00E9but de sous-Job.
+Node.inLoop=Le n\u00BDud ({0}) est dans une boucle r\u00E9cursive.
+ToggleSubjobsAction.LABEL2=D\u00E9velopper/r\u00E9duire les sous-Jobs
+PerformancePreferencePage.propagateContext=Propager les contextes ajout\u00E9s aux groupes de contextes du r\u00E9f\u00E9rentiel
+LicenseKeyController.NewLicenseKey=Saisissez une nouvelle cl\u00E9 de licence
+ReconcilerStyledText.illegalArgs=Les arguments d\'entr\u00E9e sont plus grands que la longueur du texte\u00A0:{0}, entr\u00E9e originale <{1}, {2}>, modifi\u00E9e en <{3}, {4}>.
+JobLaunchConfigurationDelegate.waitProcessRunning=En attente du processus en cours d\'ex\u00E9cution...
+StitchDataLoaderConstants.descriptionForIntegrationSource=Extrait des donn\u00E9es {0} et les ing\u00E8re dans la destination Cloud de votre choix \u00E0 l'aide de Stitch Data Loader. S\u00E9lectionnez cette option pour ouvrir votre navigateur et l'essayer gratuitement.
+StitchDataLoaderConstants.descriptionForDataWarehouseDestination=Ing\u00E8re des donn\u00E9es de plus de 100 sources populaires dans {0} \u00E0 l'aide de Stitch Data Loader. S\u00E9lectionnez cette option pour ouvrir votre navigateur et l'essayer gratuitement.

i18n/plugins/org.talend.designer.core.nl/src/main/java/messages_ja.properties

@@ -84,7 +84,7 @@ SqlMemoController.QueryError.mainMsg=\u30AF\u30A8\u30EA\u30B9\u30C6\u30FC\u30C8\
 ContextRepositoryCommand.modifyContext=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306E\u5909\u66F4
 EParameterName.DisableWarnings=\u8B66\u544A\u306E\u7121\u52B9\u5316
 ChangeConnTextCommand.Label=\u63A5\u7D9A\u30E9\u30D9\u30EB\u306E\u5909\u66F4
-TalendEditorPaletteFactory.Note=\u30CE\u30FC\u30C8
+TalendEditorPaletteFactory.Note=\u6CE8
 EParameterName.tStatCatcherStats=tStatCatcher\u7D71\u8A08\u60C5\u5831
 EParameterName.LoadNewVariableLabel=\u5909\u6570\u3092\u30ED\u30FC\u30C9\u3059\u308B\u5834\u5408\u306F\u3001\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u306B\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093
 EParameterName.startable=\u958B\u59CB\u53EF\u80FD
@@ -1005,3 +1005,5 @@ PerformancePreferencePage.propagateContext=\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\
 LicenseKeyController.NewLicenseKey=\u65B0\u3057\u3044\u30E9\u30A4\u30BB\u30F3\u30B9\u30AD\u30FC\u3092\u5165\u529B
 ReconcilerStyledText.illegalArgs=\u5165\u529B\u5F15\u6570\u304C\u30C6\u30AD\u30B9\u30C8\u9577\u3092\u8D85\u3048\u3066\u3044\u307E\u3059:{0}\u3001\u5143\u306E\u5165\u529B<{1}\u3001{2}>\u3001\u5909\u66F4\u3057\u3066<{3}\u3001{4}>\u3068\u306A\u308A\u307E\u3057\u305F\u3002
 JobLaunchConfigurationDelegate.waitProcessRunning=\u5B9F\u884C\u30D7\u30ED\u30BB\u30B9\u3092\u5F85\u6A5F\u4E2D...
+StitchDataLoaderConstants.descriptionForIntegrationSource=Stitch Data Loader\u3092\u4F7F\u3044\u3001100\u3092\u8D85\u3048\u308B\u4EBA\u6C17\u306E\u30BD\u30FC\u30B9\u304B\u3089\u30C7\u30FC\u30BF\u3092{0}\u306B\u53D6\u308A\u8FBC\u307F\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30D6\u30E9\u30A6\u30B6\u30FC\u3067\u304A\u8A66\u3057\u3044\u305F\u3060\u3051\u307E\u3059\u3002
+StitchDataLoaderConstants.descriptionForDataWarehouseDestination=Stitch Data Loader\u3092\u4F7F\u3044\u3001{0}\u30C7\u30FC\u30BF\u3092\u62BD\u51FA\u3057\u3066\u6307\u5B9A\u306E\u30AF\u30E9\u30A6\u30C9\u30C7\u30B9\u30C6\u30A3\u30CD\u30FC\u30B7\u30E7\u30F3\u306B\u53D6\u308A\u8FBC\u307F\u307E\u3059\u3002\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u30D6\u30E9\u30A6\u30B6\u30FC\u3067\u304A\u8A66\u3057\u3044\u305F\u3060\u3051\u307E\u3059\u3002

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.dbmap.nl</artifactId>

i18n/plugins/org.talend.designer.dbmap.nl/src/main/java/messages_en.properties

@@ -36,7 +36,7 @@ TableEntriesManager.exceptionMessage.caseNotFound=case not found
 ToolbarInputZone.widgetTooltip.addAlias=Add alias
 ToolbarOutputZone.widgetTooltip.removeOutputTable=Remove selected output table
 InputDataMapTableView.columnTitle.ExplicitJoin=Explicit join
-AliasDialog.addNewAlias=Add a new alias 
+AliasDialog.addNewAlias=Add a new alias
 MapperManager.exceptionMessage.useOtherSignature=Use other signature method to add entry
 UIManager.propagateTitle=Propagate
 MapperManager.removeOutputTableTitle=Remove output table
@@ -69,7 +69,7 @@ InputDataMapTableView.columnTitle.Operator=Operator
 ProblemsManager.operatorNotSet=Operator of input entry '{0}' is not set.
 VarsTable.invalidTip=' is invalid.
 UIManager.3= doesn't exist !
-UIManager.2=The zone 
+UIManager.2=The zone
 DbMapComponent.unknowValue=Value of element parameter NAME is unknown :
 UIManager.nameExistOrNull=The name already exists or is null.
 AliasDialog.inputValid=Input is invalid.
@@ -157,3 +157,12 @@ DataMapTableView.buttonTooltip.menu.addOtherClauses=Add an other (GROUP...) clau
 ProblemsAnalyser.needAlias.error1=The '{0}' linked table name '{1}' is too complex ,please use alias to generate sql!
 ToolbarOutputZone.widgetTooltip.delimitedIdentifiers=Active me to add double quotes for schemas to support delimited identifiers.
 ToolbarOutputZone.widgetText.delimitedIdentifiers=Delimited identifiers
+ExpressionComposite.expression=Expression
+ExpressionComposite.clear=Clear
+ExpressionBuilderDialog.message=Close without saving
+ExpressionBuilderDialog.Confirm=Do you want to close the Expression Builder without save and lose your changes?
+ExpressionBuilderDialog.ok.button=Ok
+ExpressionBuilderDialog.cancel.button=Cancel
+ExpressionBuilderDialog.expression.builder=Expression Builder
+ExpressionComposite.Wrap=Wrap
+ExpressionComposite.undo=Undo

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.documentation.nl</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.fileoutputxml.nl</artifactId>

i18n/plugins/org.talend.designer.fileoutputxml.nl/src/main/java/messages_en.properties

@@ -27,11 +27,11 @@ FOXUI.2=Related Column
 FOXUI.1=XML Tree
 FOXUI.0=Link target
 DragAndDrogDialog.AddAttributes=Create as attribute of target node
-FOXUI.19=Linker source
+FOXUI.19=Linker Source
 FOXUI.18=Remove Group Element
 FOXUI.17=Set As Group Element
 FOXUI.16=Set As Loop Element
-FOXUI.15=Guess loop element
+FOXUI.15=Guess Loop Element
 Schema2XMLDragAndDropHandler.IsNotElementWarning=isn't a Element, can not create sub-elements or attributes.
 FOXUI.14=Import XML Tree
 FooterComposite.AutoMap=Auto map!

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.gefabstractmap.nl</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.mapper.nl</artifactId>

i18n/plugins/org.talend.designer.mapper.nl/src/main/java/messages_en.properties

@@ -67,12 +67,12 @@ MapperManager.removeOutputTableTitleMessage=Are you sure you want to remove the
 ToolbarOutputZone.moveupTooltip=Move up selected output table
 DataMapTableView.buttonTooltip.minimize=Minimize
 EntryContentProposal.column=Column:
-Problem.warning.setExpressionKey=Try to set an Expression key if possible in the lookup table '{0}' to improve performance. 
+Problem.warning.setExpressionKey=Try to set an Expression key if possible in the lookup table '{0}' to improve performance.
 ToolbarInputZone.restoreTooltip=Restore all input tables
 VarsTable.invalidTip=' is invalid.
-Problem.warning.unusableReject=As no filter is defined in table(s) {0}, the output rejection cannot be used. 
+Problem.warning.unusableReject=As no filter is defined in table(s) {0}, the output rejection cannot be used.
 UIManager.3= does'nt exist !
-UIManager.2=The zone 
+UIManager.2=The zone
 OutputDataMapTableView.columnTitle.filterCondition=Filters conditions (AND)
 MapperComponent.generationNotInitial=generationManager is not initialized by the perljet/javajet\!
 VarsDataMapTableView.nullable=Nullable
@@ -105,11 +105,11 @@ InputDataMapTableView.removeGlobalMapVar.Title=Remove globalMap variable
 InputDataMapTableView.removeGlobalMapVar.Message=Are you sure to remove the globalMap variable {0}?
 InputDataMapTableView.globalMapKey=globalMap Key
 InputDataMapTableView.invalid=<Invalid>
-InputDataMapTableView.invalidConfiguration=Invalid configuration, choose another lookup mode or set an expression in the lookup key column "{0}\\"
+InputDataMapTableView.invalidConfiguration=Invalid configuration, choose another lookup mode or set an expression in the lookup key column "{0}\"
 FooterComposite.button.APPLY=Apply
 InputDataMapTableView.columnTitle.Operator=Operator
 HTMLDocGenerator_generate_document=Generated documentation
-HTMLDocGenerator.author=AUTHOR
+HTMLDocGenerator.author=Author
 HTMLDocGenerator.author1=Author
 HTMLDocGenerator.column=Column
 HTMLDocGenerator.comment=Comment

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.maven.job.nl</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.rowgenerator.nl</artifactId>

i18n/plugins/org.talend.designer.rowgenerator.nl/src/main/java/messages_en.properties

@@ -2,7 +2,7 @@ RowGenPreivewCodeMain.Process.Generate=Process tRowGenerator generate...
 RowGenPreivewCodeMain.PreviewBtn.Text=Preview
 TabFolderEditors.FunParamTab.TitleText=Function parameters
 MetadataToolbarEditorViewExt.Columns.Text=Columns
-RowGenProcess.ConnectionName.NotValid=The name of the connection is not valid: 
+RowGenProcess.ConnectionName.NotValid=The name of the connection is not valid:
 RowGenProcess.BeseName.BeNull=baseName can't be null
 UIManager.MessageBox.Content=Do you want to close the tRowGenerator without saving the current settings?
 RowGenTableEditor2.Preview.TitleText=Preview

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.runprocess.nl</artifactId>

i18n/plugins/org.talend.designer.runprocess.nl/src/main/java/messages_en.properties

@@ -1,7 +1,7 @@
 ProcessComposite2.statsComposite=Stats && Traces
 ProcessComposite.clearBefore=Clear before run
 ProcessComposite.kill=Kill
-ProcessComposite.confirmText=Do you really want to launch the job with context {0} ? 
+ProcessComposite.confirmText=Do you really want to launch the job with context {0} ?
 Processor.perlModuleNotFound=Perl Module Plugin not found.
 PromptDialog.title=Run Context {0} with parameters:
 ProcessComposite.execTimeHint=Show the time of running this job
@@ -9,7 +9,7 @@ Processor.tempFailed=Failed to generate temporary files.
 ProcessComposite.exec=Run
 ProcessView.subtitleEmpty=No job to run
 ProcessComposite.statHint=Statistics on job execution will be shown
-prefs.clientTracePortBound2=to 
+prefs.clientTracePortBound2=to
 prefs.clientTracePortBound1=Trace port range :
 ProcessComposite.execGroup=Execution
 ProcessView.gainFocusLog=Run process gain focus
@@ -20,7 +20,7 @@ prefs.clientStatInvalidRange=Client stats port must be between 1024 and 65535 in
 Processor.commandLineLog=Command line:
 ProcessView.jobName=Job
 JavaProcessor.notFoundedProjectException=Java project not found.
-prefs.clientStatsPortBound2=to 
+prefs.clientStatsPortBound2=to
 ProcessView.titleEmpty=Run job
 RunProcessContext.PortErrorTraces=Traces
 prefs.clientStatsPortBound1=Stats port range :
@@ -30,7 +30,7 @@ ProcessComposite.trace=Traces
 RunProcessContext.PortErrorTitle={0} Port Error!
 ProcessDebugDialog.title=Debug job {0}
 ProcessComposite.killHint=Stop immediatly the execution of the job
-ProcessComposite.buildTask=Building Job
+ProcessComposite.buildTask=Building job
 ProcessComposite.execFailed=Execution failed : 
 Processor.execFailed=Job execution failed.
 ProcessComposite.stat=Statistics
@@ -55,13 +55,13 @@ prefs.clientConfiguration=Talend client configuration
 ProcessView.title=Run ({0})
 Processor.configurePerl=Perl interpreter not configured.
 JavaProcessor.notFoundedFolderException=Folder within .Java project not found
-ProcessComposite.execHint=Run the job 
+ProcessComposite.execHint=Run the job
 ProcessComposite.valueCol=Value
 ProcessComposite.saveBeforeRunHint=Saves the Job before the execution.
 ProcessDebugDialog.debugBtn=Debug
 prefs.configuration.title=Run process configuration :
 DefaultRunProcessService.methodCalledError=This method should'nt be called here, use it on RunProcessService class.
-ErrorDetailDialog.errorExist=\ \ Warning\! Some errors exist in job. Would you like to continue?
+ErrorDetailDialog.errorExist=  Warning! Some errors exist in job. Would you like to continue?
 ErrorDetailDialog.findError=Error found
 ProcessComposite.hideContext=hide the Context
 ProcessComposite.lineLimited=Line limit
@@ -96,7 +96,7 @@ CamelJobErrorsChecker_compile_errors=Route compile errors
 CamelJobErrorsChecker_compile_error_content=At least Route "{0}" has compile errors, please fix and export again.
 RunProcessPreferencePage.RouteVmArgument=Route Run VM arguments
 ProcessComposite.wrapbutton=Wrap
-JavaProcessorUtilities.msg.missingjar.forProcess=Missing jars: 
+JavaProcessorUtilities.msg.missingjar.forProcess=Missing jars:
 JavaProcessorUtilities.msg.missingjar.note=Note:
 JavaProcessorUtilities.msg.missingjar.onlyforroutine=The following jars are also required by compiler:
 JavaProcessorUtilities.msg.missingjar.warningtitle=Warning!

i18n/plugins/org.talend.designer.runprocess.nl/src/main/java/messages_fr.properties

@@ -1,7 +1,7 @@
 ProcessComposite2.statsComposite=Stats && Traces
 ProcessComposite.clearBefore=Effacer avant l\'ex\u00E9cution
 ProcessComposite.kill=Arr\u00EAter
-ProcessComposite.confirmText=Voulez-vous vraiment lancer le Job avec le contexte {0} ?
+ProcessComposite.confirmText=Voulez-vous lancer le Job avec le contexte {0}\u00A0?
 Processor.perlModuleNotFound=Impossible de trouver le plug-in du module Perl.
 PromptDialog.title=Ex\u00E9cuter le contexte {0} avec les param\u00E8tres \:
 ProcessComposite.execTimeHint=Afficher le temps d'ex\u00E9cution du job
@@ -96,7 +96,7 @@ CamelJobErrorsChecker_compile_errors=Erreurs de compilation de la route
 CamelJobErrorsChecker_compile_error_content=Au moins la route "{0}" a des erreurs de compilation, fixez-les et exportez \u00E0 nouveau.
 RunProcessPreferencePage.RouteVmArgument=Arguments VM d\'ex\u00E9cution des jobs
 ProcessComposite.wrapbutton=Retour automatique \u00E0 la ligne
-JavaProcessorUtilities.msg.missingjar.forProcess=Jars manquants : 
+JavaProcessorUtilities.msg.missingjar.forProcess=Jars manquants\u00A0:
 JavaProcessorUtilities.msg.missingjar.note=Remarque :
 JavaProcessorUtilities.msg.missingjar.onlyforroutine=Les Jar suivants sont aussi requis par le compilateur :
 JavaProcessorUtilities.msg.missingjar.warningtitle=Attention !
@@ -134,3 +134,6 @@ Processor.memoryRun.searchJvmInfo=Recherche de la JVM active du Job actuel.
 Processor.memoryRun.jvmInfo=Le JVM est d\u00E9connect\u00E9e.
 ShellPs1SettingPreferencePage_Title=Scripts ps1
 JobErrorsChecker_compile_error_errormessage=Message d\'erreur
+ProcessComposite.endJobPattern=Job {0} termin\u00E9 \u00E0 {1}.
+ProcessComposite.endExitCode=Code de sortie {0}
+ProcessComposite.startJobPattern=D\u00E9marrage du Job {0} \u00E0 {1}.

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.scd.nl</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.webservice.nl</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.xmlmap.nl</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.expressionbuilder.nl</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.nl</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.presentation.onboarding.resource.tos.nl</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.ftp.nl</artifactId>

i18n/plugins/org.talend.repository.ftp.nl/src/messages_fr.properties

@@ -26,3 +26,6 @@ FTPForm_proxyPortText=Port du proxy
 FTPForm_proxyUsernameText=Utilisateur du proxy
 FTPForm_proxyPasswordText=Mot de passe du proxy
 FTPForm_filepathAlert=Le chemin du fichier doit \u00EAtre sp\u00E9cifi\u00E9
+FTPForm_conn_timeout=Expiration de la connexion
+FTPForm_conn_timeunit=Unit\u00E9\u00A0: millisecondes
+FTPForm_ftpTimeoutText_check=Le d\u00E9lai avant expiration doit \u00EAtre un nombre.

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.json.nl</artifactId>

i18n/plugins/org.talend.repository.nl/plugin_en.properties

@@ -8,7 +8,7 @@ migrationtask.upgradetWarntDiePriority.title=Upgrade tWarn and tDie priority
 migrationtask.renametDbInputToPostgresql.title=Rename tDBxxTotPostgresqlxx
 migrationtask.renametFTPtoFTP.title=Rename tFTP to specialized tFTP
 prefsStatusName=Status
-migrationtask.renametFileZipUnzip.description=Rename tFileZip and tFileUnzip components to tFileArchive and tFileUnarchive 
+migrationtask.renametFileZipUnzip.description=Rename tFileZip and tFileUnzip components to tFileArchive and tFileUnarchive
 migrationtask.renametDbInputToMySQL.description=Migrate database generic components connected to a MySQL database to the corresponding specific MySQL components.
 migrationtask.renameNormalize.description=Rename all components tNormalizer to tNormalize
 migrationtask.updatetRowGenerator.description=Migrate simple interface tRowGenerator components to advanced interface.
@@ -21,7 +21,7 @@ migrationtask.RenametMapPersistentMigrationTask.title=Rename tMapPersistent to t
 migrationtask.renametDbInputToOracle.title=Rename tDBxxTotOraclexx
 migrationtask.UpgradetAdvancedFileOutputXMLMigrationTask.title=Upgrade mapping tAdvancedFileOutputXML
 migrationtask.changetUniqRowLinks.description=Change the link type of all tUniqRow components from "Main" to "Unique".
-migrationtask.AddPerlRefArrayPointer2.desc=Replace this syntax "$xxx[" by "$xxx->[" and "@xxx" by "@$xxx" only for known existing Talend connections and components  
+migrationtask.AddPerlRefArrayPointer2.desc=Replace this syntax "$xxx[" by "$xxx->[" and "@xxx" by "@$xxx" only for known existing Talend connections and components
 migrationtask.renametDbInputToPostgresql.description=Migrate database generic components connected to a PostgreSQL database to the corresponding specific PostgreSQL components.
 migrationtask.AddPerlRefArrayPointer2.title=Add ref array pointers and unreference arrays contained in Table fields
 migrationtask.AddQuotesToModuleList.desc=Add quotes to module list if needed.
@@ -39,12 +39,12 @@ migrationtask.renametDbInputToMssql.title=Rename tDBxxTotMssqlxx
 migrationtask.RenameTheClassnameofTheRoutinesFileMigrationTask.title=Rename the classes named __CLASS_NAME__
 migrationtask.AddPerlRefArrayPointer.title=Add ref array pointers and unreference arrays contained in Text fields
 migrationtask.renametFileZipUnzip.title=Rename tFileZip and tFileUnzip components
-migrationtask.renametDbInputToMySQL.title=Rename tDBxxTotMySQLxx 
+migrationtask.renametDbInputToMySQL.title=Rename tDBxxTotMySQLxx
 deleteProjectsAction.title=Delete projects
 repository.prop.version=Version
 prefsRepositoryName=Repository
 migrationtask.renametDbInputToMssql.description=Migrate database generic components connected to a Microsoft SQL Server database to the corresponding specific Microsoft SQL Server components.
-migrationtask.convertOldPerlTypes.title=Convert the old Perl types to new types. 
+migrationtask.convertOldPerlTypes.title=Convert the old Perl types to new types.
 migrationtask.renameFlowMeter.description=Rename all components tMetter to tFlowMeter
 migrationtask.UpgradetAdvancedFileOutputXMLMigrationTask.description=Upgrade mapping tAdvancedFileOutputXML, change the level architecture to path.
 migrationtask.RenametXMLRPCMigrationTask.description=Rename all components tXMLRPC to tXMLRPCInput in all jobs in repository
@@ -54,7 +54,7 @@ migrationtask.ReplaceMultiFlowBytReplicate.desc=Replace Multi-flow by tReplicate
 migrationtask.upgradetWarntDiePriority.description=Upgrade priority to switch from text field to dialog field.
 migrationtask.renameFlowMeterCatcher.description=Rename all components tMetterCatcher to tFlowMeterCatcher
 providerName=www.example.org
-migrationtask.AddPerlRefArrayPointer.desc=Replace this syntax "$xxx[" by "$xxx->[" and "@xxx" by "@$xxx" only for known existing Talend connections and components  
+migrationtask.AddPerlRefArrayPointer.desc=Replace this syntax "$xxx[" by "$xxx->[" and "@xxx" by "@$xxx" only for known existing Talend connections and components
 projectsetting.General=General
 projectsetting.Designer=Designer
 projectsetting.VersionManagement=Version Management

i18n/plugins/org.talend.repository.nl/plugin_fr.properties

@@ -85,3 +85,4 @@ projectSetting.projectRefSettingPage=Projets de r\u00E9f\u00E9rence
 ProjectSetting.groupId=GroupId du d\u00E9ploiement
 projectSetting.deploymentConfiguration=Configuration du d\u00E9ploiement
 projectsetting.Audit=Audit
+projectSetting.ArtifactProxy=Configuration du proxy d\'artefacts

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.nl</artifactId>

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

@@ -85,7 +85,7 @@ SelectorTableForm.ColumnNumber=Column number
 CommonWizard.persistenceException=Access to the data failure
 JavaJobScriptsExportWSWizardPage.AxisLib=Axis 1.4 Lib
 FileStep2.escapeCharAlert=Escape Char must be specified
-CreateFileXmlAction.action.createTitle=Create file XML
+CreateFileXmlAction.action.createTitle=Create XML file
 FileStep2.fieldPosition=Marker position
 FileStep3.guessIsDone=Guess successful
 FileStep2.fieldSeparatorAlert=The field separator must be specified. To be valid, it must be surrounded by quotation marks.
@@ -153,7 +153,7 @@ LoginComposite.manageProjectPre=Or
 ConfigExternalPerlModulePage.moduleFieldLabel=Module
 ImportDemoProjectAction.actionTooltip=Import demo project
 CreateConnectionAction.action.openTitle=Open connection
-FileStep2.previewIsDone=Preview successful... 
+FileStep2.previewIsDone=Preview successful...
 FileStep3.guessConfirmation=Confirm changes ?
 VersionManagementDialog.Version=Version
 CreateDocumentationAction.createDocActionTipText.addDocItem=Add a new documentation item
@@ -193,7 +193,7 @@ ConfigExternalJarPage.inputJARName=Input a library's name
 FileStep1.serverAlert=Server must be specified
 RefreshAction.toolTipText=Refresh
 ProjectSettingsWizardPage.PaletteSettings=Palette Settings
-PositionalTextTest.println.fieldValue=Field Value 
+PositionalTextTest.println.fieldValue=Field Value
 VersionManagementDialog.EachVersion=Update the version of each item.
 RepositoryPreferencePage.RefreshTitle=Repository Refresh
 DocumentationPage.option=Option
@@ -241,7 +241,7 @@ ImportProjectAsWizardPage.form.browse=Browse
 ImportProjectAsWizardPage.form.selectDirectory=Select root directory
 CreateFileRegexpAction.action.createTitle=Create file regex
 EditPropertiesAction.action.title=Edit properties
-ImportDemoProjectAction.actionTitle=Demos  
+ImportDemoProjectAction.actionTitle=Demos
 FileStep1.formatAlert=Format must be specified
 JobScriptsExportWizardPage.jobPerlScripts=Perl scripts
 DetecteViewImpactAction.Label=Detect dependencies
@@ -279,7 +279,7 @@ ImportExternalJarPage.pageMessage=Configuration of external libraries for routin
 CommonWizard.next=Next
 FileStep2.empty=Empty
 DocumentationPage.LinkLabel= Copy documentation to repository.
-LoginComposite.buttons.importProject=Import   
+LoginComposite.buttons.importProject=Import
 EditContextAction.readContext=Read context group
 NewProjectWizard.failureTitle=Error
 XmlToXPathLinker.exceptionReturn.xPathInvalid=The current XPath expression is invalid
@@ -297,7 +297,7 @@ ConfigExternalJarPage.jarFile.label=Library File:
 DatabaseTableForm.name=Name
 EditContextAction.editContext=Edit context group
 FileStep1.noExist=doesn't exist
-DatabaseTableForm.connectionIsDone=Connection successful. 
+DatabaseTableForm.connectionIsDone=Connection successful.
 ImportProjectsUtilities.task.importingProject=Importing project...
 FileStep2.fieldPositionTip=You must define here the position of each column. The positions must be presented in ascending order.
 FileStep2.headerTip=Header
@@ -308,7 +308,7 @@ connections.form.emptyField.repository=Repository must be selected
 LibraryField.requiredColumn=Required
 SelectDeleteProjectDialog.SelectAll=Select All
 SelectorTableForm.selectAllTables=Select All
-LoginComposite.buttons.deleteProject=Delete   
+LoginComposite.buttons.deleteProject=Delete
 ImportDemoProjectAction.alertDialog.messageTitle=Message
 ConfigExternalJarPage.title=New Module
 FileStep2.rowSeparator=Row Separator
@@ -351,7 +351,7 @@ SelectDeleteProjectDialog.DeselectAll=Deselect All
 LoginComposite.buttons.newProject.desc=Create a new local project
 FileStep1.server=Server
 JavaJobScriptsExportWSWizardPage.WSDLFile=Web Service files
-FileStep2.quoteDelimitedTip=The character " is unusable without escape character. Use: \"
+FileStep2.quoteDelimitedTip=The character " is unusable without escape character. Use: "
 FileStep3.metadataComment=Comment
 FileStep2.settingsIncomplete=The settings must be completed to show the preview
 CreateTableAction.action.editTitle=Edit Schema
@@ -393,8 +393,8 @@ connections.form.emptyField.username=A username is needed.
 FileStep2.escapeCharTip=Escape Char
 ItemsVersionChangedDialog.Title=Confirm the new version of items
 LicenseWizard.windowTitle=License
-FileStep2.fieldPositionNotValidate=Field Position must contain only numbers and comma.  The positions must be presented in the ascending order 
-LoginComposite.buttons.newProject=Create   
+FileStep2.fieldPositionNotValidate=Field Position must contain only numbers and comma.  The positions must be presented in the ascending order
+LoginComposite.buttons.newProject=Create
 ConfigExternalPerlModulePage.required.label=If the module is required
 CommonWizard.cancel=Cancel
 NewProjectWizardPage.comment=Project description
@@ -404,7 +404,7 @@ connections.form.emptyField.connname=A connection name is needed.
 VersionManagementDialog.Revert=Revert
 VersionManagementDialog.ConfirmTitle=Confirm
 LoginComposite.existing=Select
-CommonWizard.nameAlreadyExist=This name already exists 
+CommonWizard.nameAlreadyExist=This name already exists
 FileStep1.groupFileViewer=File Viewer
 GenerateDocAsHTMLWizardPage.generateDocAsHTML=Generate job information to an archive file on the local file system.
 JobPerlScriptsManager.allInterpreter=All
@@ -412,7 +412,7 @@ CreateFilePositionalAction.action.openTitle=Open file positional
 ReplaceRunBeforeAfterWithThenRunMigrationTask.ThenRun=ThenRun
 NewProjectWizardPage.technicalName=Technical Name
 RepositoryPreferencePage.RefreshCreated=Refresh when creating an item
-ConnectionsListButtonsToolBar.copyLabelPrefix=Copy of 
+ConnectionsListButtonsToolBar.copyLabelPrefix=Copy of
 FileStep3.guessProgress=Guess in progress...
 ExtractionFieldsWithXPathEditorView.columnTitle.columnName=Column Name
 NewFolderWizard.label=Label
@@ -596,7 +596,7 @@ CreateSandboxProjectDialog.Settings=Settings
 LoginComposite.DIFFERENT_WORKSPACES=Workspace has been changed. Please restart.
 LoginComposite.PROJECT_NEED=A project is needed...
 LoginComposite.TisWorkspace_welcome=Welcome to {0}!
-VersionManagementDialog.AllDependencies=select all dependencies
+VersionManagementDialog.AllDependencies=Select all dependencies
 VersionManagementDialog.FixVersion=Fix tRunJob versions if Latest
 VersionManagementDialog.FixLastVersion=When update the version, if all tRunJob are setup by default with Latest version, this will fix the version to the previous version.\nFor example : father 1.0 (tRunJob<child, Latest>).\nIf upgrade to version 1.1: \n  - the father version 1.0 will contain : (tRunJob<child, 1.0>). To run the child with version 1.0 also.\n  - the father version 1.1 will contain : (tRunJob<child, Latest>). To keep using the latest version.\n\nNote: this won't do anything if the versions are already fixed, and if doesn't use Latest.
 ImportItemAction.Label=Import items
@@ -704,7 +704,6 @@ GenerateDocAsHTMLWizardPage.OverWrite=Warning:this file already exist,do you wan
 GenerateDocAsHTMLWizardPage.Warning=Warning
 ImportItemUtil.cannotImportMessage=from the project {0} use a more recent version of studio so cannot import it.
 ImportProjectAction.messageDialogContent.projectImportedSuccessfully=Project has been successfully imported in your workspace
-ImportProjectAction.messageDialogTitle.project=Project imported
 StatusDialog.errorMessage.codeLetters1=Code must have 1 to 5 letters.
 JobScriptsExportWizardPage.ApplyContextToChildren=Apply Context to children Jobs
 JobScriptsExportWizardPage.addBuildScripts=Add build script
@@ -883,7 +882,7 @@ VersionManagementDialog.applyVersion=Apply version
 VersionManagementDialog.useJobVersion=Use job versions.
 JavaVersionProjectSettingPage.versionLabel=JDK Compiler compliance level:
 BuildJobManager.mavenErrorMessage=Job was not built successfully, please check the logs for more details available on {0}
-VersionManagementDialog.projectVersion=Project Version
+VersionManagementDialog.projectVersion=Project version
 VersionManagementDialog.useSnapshot=Use snapshot
 VersionManagementDialog.applyDetail=Apply
 VersionManagementDialog.eachMavenVersion=Change the version of each item individually.
@@ -893,7 +892,7 @@ VersionManagementDialog.remove=Remove
 JavaJobScriptsExportWSWizardPage.MSESB=Microservice (Spring Boot) For ESB
 LimitRESTRequestJobChecker.limit_ESBJobForMS=Only ESB Job with "{0}" could build using [Microservice (Spring Boot) For ESB] type.
 LoginProjectPage.project_need.remote.cloud=Can't retrieve any project from Cloud, please ask for help from the administrator.
-NetworkErrorRetryForm.connectTimeout.label=Connection Timeout (seconds)
+NetworkErrorRetryForm.connectTimeout.label=Connection timeout (seconds)
 NetworkErrorRetryForm.connectTimeout.error.bound=Please input an integer between {0} and {1}
 NetworkErrorRetryForm.details=Details
 NetworkErrorRetryForm.toggle.message=Always don't retry before restart
@@ -939,12 +938,12 @@ MavenDeploymentConfigurationProjectSettingPage.removeWarning=Do you want to dele
 MavenDeploymentConfigurationProjectSettingPage.nameExistedWarning={0} is existed!
 FileStep2.fieldSeparatorPositionalTip=You must defined here the position of each column. The positions must be presented in the ascending order
 FileStep2.stop=Stop
-JobScriptsExportWizardPage.requiredTalendPerlModules=Required talend modules
+JobScriptsExportWizardPage.requiredTalendPerlModules=Required Talend modules
 PropertiesWizardPage.Description=Description
 PropertiesWizardPage.Name=Name
 ReferenceProjectSetupPage.ErrorMissingReferencedProject=Missing referenced project [{0}].
 MavenGroupIdProjectSettingPage.skipGroupIdLabel=Skip base groupID if the item has folder
-AuditProjectSettingPage.selectAuditReportFolder=Please select a generate audit report folder\!
+AuditProjectSettingPage.selectAuditReportFolder=Please select a generate audit report folder!
 AuditProjectSettingPage.generateAuditReportProgressBar=Generating Audit Report!
 LimitRESTRequestJobChecker.limit_ESBJobForOSGI=Job without ESB components could not build using [OSGI Bundle For ESB] type.
 AuditProjectSettingPage.generateButtonText=Generate Audit Report
@@ -1008,3 +1007,10 @@ ProjectSettingPage.ArtifactProxySetting.checkConnection=Check Connection
 ProjectSettingPage.ArtifactProxySetting.connectionFailureMsg=Connection failure,please check the proxy configuration
 LoginHelper.connectUserLibraryTitle=Check user libraries connection.
 LoginHelper.connectUserLibraryFailureWarning=Cannot connect to the user libraries artifact repository set in administrator. Do you want to open the project anyway?
+ReferenceProjectSetupPage.ButtonTooltipStrict=Use strict references to find joblets in target project.
+ConnectionsDialog.usernameOrPasswordInvalid=Check your username or password or contact your administrator.
+LoginProjectPage.authorizationErrorMessage=Invalid username or password for the remote connection. Do you want to fix it now?
+LoginProjectPage.errorMessageTitle=Error
+ImportProjectAction.messageDialogTitle.projectFailed=Import failed
+ImportProjectAction.messageDialogContent.projectImportedFailed=Your project cannot be imported because of invalid items.
+ImportProjectAction.messageDialogContent.projectsImportedFailed=Your project(s) <{0}> cannot be imported because of invalid items.

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

@@ -193,7 +193,7 @@ ConfigExternalJarPage.inputJARName=Saisissez un nom de biblioth\u00E8que
 FileStep1.serverAlert=Le serveur doit \u00EAtre sp\u00E9cifi\u00E9
 RefreshAction.toolTipText=Rafra\u00EEchir
 ProjectSettingsWizardPage.PaletteSettings=Param\u00E8tres de la Palette
-PositionalTextTest.println.fieldValue=Valeur du champs
+PositionalTextTest.println.fieldValue=Valeur du champ
 VersionManagementDialog.EachVersion=Mettre \u00E0 jour la version de chaque \u00E9l\u00E9ment.
 RepositoryPreferencePage.RefreshTitle=Rafra\u00EEchir le r\u00E9f\u00E9rentiel
 DocumentationPage.option=Option
@@ -704,7 +704,6 @@ GenerateDocAsHTMLWizardPage.OverWrite=Attention : ce fichier existe d\u00E9j\u00
 GenerateDocAsHTMLWizardPage.Warning=Avertissement
 ImportItemUtil.cannotImportMessage=Impossible d'importer le projet {0} car il utilise une version plus r\u00E9cente du studio.
 ImportProjectAction.messageDialogContent.projectImportedSuccessfully=Le projet a bien \u00E9t\u00E9 import\u00E9 dans votre workspace
-ImportProjectAction.messageDialogTitle.project=Projet import\u00E9
 StatusDialog.errorMessage.codeLetters1=Le code doit contenir entre 1 et 5 lettres.
 JobScriptsExportWizardPage.ApplyContextToChildren=Appliquer le contexte aux Jobs fils
 JobScriptsExportWizardPage.addBuildScripts.ant=Ant
@@ -985,3 +984,25 @@ connections.form.field.token=Jeton
 connections.form.field.token.browse=Ouvrir la page de g\u00E9n\u00E9ration de jetons dans le navigateur
 connections.form.getTokenUrl.failed=V\u00E9rifiez l'URL du serveur.
 ImportProjectAsWizardPage.importDescription=Saisir un nom de projet et sp\u00E9cifer le projet {0} \u00E0 importer.
+LoginProjectPage.cloud.aws_us=AWS - Est des \u00C9tats-Unis
+LoginProjectPage.cloud.aws_eu=AWS - Europe
+LoginProjectPage.cloud.aws_apac=AWS - Asie-Pacifique
+LoginProjectPage.cloud.usa_west=Azure - Ouest des \u00C9tats-Unis
+LoginProjectPage.cloud.cloud_custom=Cloud personnalis\u00E9
+LoginDialog.logonDenyTitle=Informations
+LoginDialog.logonDenyMsg=La version du produit est expir\u00E9e.\\nInstallez d\'abord [{0}].
+VersionManagementDialog.subjob2=S\u00E9lectionner tous les sous-Jobs
+Log4jSettingPage.Log4jVersionChangedWarn=La synchronisation des POM est requise apr\u00E8s modification de la version log4j. Changer maintenant\u00A0?
+Log4jSettingPage.ActivateLog4j2=Activer Log4j2 dans les composants
+Log4jSettingPage.Log4jVersion=Version de Log4j
+ProjectSettingPage.ArtifactProxySetting.groupNameTalendLib=Configuration du proxy des biblioth\u00E8ques Talend
+ProjectSettingPage.ArtifactProxySetting.artifactType=Type\u00A0:
+ProjectSettingPage.ArtifactProxySetting.url=URL\u00A0:
+ProjectSettingPage.ArtifactProxySetting.username=Utilisateur\u00A0:
+ProjectSettingPage.ArtifactProxySetting.password=Mot de passe\u00A0:
+ProjectSettingPage.ArtifactProxySetting.repositoryId=ID du r\u00E9f\u00E9rentiel\u00A0:
+ProjectSettingPage.ArtifactProxySetting.enableProxySetting=Activer les param\u00E8tres de proxy
+ProjectSettingPage.ArtifactProxySetting.checkConnection=V\u00E9rifier la connexion
+ProjectSettingPage.ArtifactProxySetting.connectionFailureMsg=\u00C9chec de la connexion, v\u00E9rifiez la configuration du proxy.
+LoginHelper.connectUserLibraryTitle=V\u00E9rifier la connexion aux biblioth\u00E8ques utilisateurs.
+LoginHelper.connectUserLibraryFailureWarning=Impossible de se connecter au r\u00E9f\u00E9rentiel d\'artefacts contenant les biblioth\u00E8ques utilisateur en mode administrateur. Ouvrir le projet malgr\u00E9 tout\u00A0?

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

@@ -688,7 +688,7 @@ JobScriptsExportWSWizardPage.newJobVersion.Label=\u30B8\u30E7\u30D6\u30D0\u30FC\
 JobScriptsExportWizardPage.newExportJob0=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8 {0}: {1}_{2}
 JobScriptsExportWizardPage.newExportJob1=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8 {0}: {1}_{2}
 JobScriptsExportWizardPage.newExportJobScript={0}\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u4E2D
-JobScriptsExportWizardPage.newExportJobSucessful=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8{0}: {1}_{2}\u304C\u6210\u529F\u3057\u307E\u3057\u305F!
+JobScriptsExportWizardPage.newExportJobSucessful=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8 {0}: {1}_{2}\u304C\u6210\u529F\u3057\u307E\u3057\u305F!
 JobScriptsExportWizardPage.newExportSuccess={0} \u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u306B\u6210\u529F\u3057\u307E\u3057\u305F\uFF01
 LoginComposite.NewCreate=\u4F5C\u6210...
 LoginComposite.NewImport=\u30A4\u30F3\u30DD\u30FC\u30C8...
@@ -704,7 +704,6 @@ GenerateDocAsHTMLWizardPage.OverWrite=\u8B66\u544A\uFF1A\u30D5\u30A1\u30A4\u30EB
 GenerateDocAsHTMLWizardPage.Warning=\u8B66\u544A
 ImportItemUtil.cannotImportMessage={0} \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3067\u304D\u307E\u305B\u3093\u3002\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B\u306B\u306F\u3001\u3088\u308A\u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u306E Studio \u304C\u5FC5\u8981\u3067\u3059\u3002
 ImportProjectAction.messageDialogContent.projectImportedSuccessfully=\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9\u304B\u3089\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u6210\u529F\u3057\u307E\u3057\u305F
-ImportProjectAction.messageDialogTitle.project=\u30A4\u30F3\u30DD\u30FC\u30C8\u6E08\u307F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
 StatusDialog.errorMessage.codeLetters1=\u30B3\u30FC\u30C9\u306F1\uFF5E5\u6587\u5B57\u3067\u3059\u3002
 JobScriptsExportWizardPage.ApplyContextToChildren=\u5B50\u30B8\u30E7\u30D6\u306B\u5909\u6570\u3092\u9069\u7528
 JobScriptsExportWizardPage.addBuildScripts=\u30B9\u30AF\u30EA\u30D7\u30C8\u3092\u8FFD\u52A0
@@ -1007,4 +1006,4 @@ ProjectSettingPage.ArtifactProxySetting.enableProxySetting=\u30D7\u30ED\u30AD\u3
 ProjectSettingPage.ArtifactProxySetting.checkConnection=\u63A5\u7D9A\u3092\u30C1\u30A7\u30C3\u30AF
 ProjectSettingPage.ArtifactProxySetting.connectionFailureMsg=\u63A5\u7D9A\u304C\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u30D7\u30ED\u30AD\u30B7\u8A2D\u5B9A\u3092\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 LoginHelper.connectUserLibraryTitle=\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u63A5\u7D9A\u3092\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-LoginHelper.connectUserLibraryFailureWarning=\u7BA1\u7406\u8005\u306E\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u306E\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u30BB\u30C3\u30C8\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3002\u7D9A\u884C\u3057\u3066\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u958B\u304D\u307E\u3059\u304B?
+LoginHelper.connectUserLibraryFailureWarning=\u7BA1\u7406\u8005\u306E\u30E6\u30FC\u30B6\u30FC\u30E9\u30A4\u30D6\u30E9\u30EA\u30FC\u306E\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u30EA\u30DD\u30B8\u30C8\u30EA\u30FC\u30BB\u30C3\u30C8\u306B\u63A5\u7D9A\u3067\u304D\u307E\u305B\u3093\u3002\u3053\u306E\u307E\u307E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u958B\u304D\u307E\u3059\u304B?

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

@@ -704,7 +704,6 @@ GenerateDocAsHTMLWizardPage.OverWrite=\u8B66\u544A\uFF1A\u6B64\u6587\u4EF6\u5DF2
 GenerateDocAsHTMLWizardPage.Warning=\u8B66\u544A
 ImportItemUtil.cannotImportMessage=\u4ECE\u5DE5\u7A0B {0} \u4F7F\u7528\u4E86\u66F4\u65B0\u7248\u672C\u7684 Studio\uFF0C\u56E0\u6B64\u65E0\u6CD5\u5BFC\u5165\u5B83\u3002
 ImportProjectAction.messageDialogContent.projectImportedSuccessfully=\u5DE5\u7A0B\u5DF2\u7ECF\u88AB\u6210\u529F\u5BFC\u5165\u5230\u60A8\u7684\u5DE5\u4F5C\u533A\u3002
-ImportProjectAction.messageDialogTitle.project=\u5DE5\u7A0B\u5DF2\u5BFC\u5165
 StatusDialog.errorMessage.codeLetters1=\u4EE3\u7801\u5FC5\u987B\u6709 1 \u5230 5 \u4E2A\u5B57\u6BCD\u3002
 JobScriptsExportWizardPage.ApplyContextToChildren=\u5C06\u4E0A\u4E0B\u6587\u5E94\u7528\u4E8E\u5B50\u4F5C\u4E1A
 JobScriptsExportWizardPage.addBuildScripts=\u6DFB\u52A0\u6784\u5EFA\u811A\u672C
@@ -1007,4 +1006,4 @@ ProjectSettingPage.ArtifactProxySetting.enableProxySetting=\u542F\u7528\u4EE3\u7
 ProjectSettingPage.ArtifactProxySetting.checkConnection=\u68C0\u67E5\u8FDE\u63A5
 ProjectSettingPage.ArtifactProxySetting.connectionFailureMsg=\u8FDE\u63A5\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u4EE3\u7406\u914D\u7F6E
 LoginHelper.connectUserLibraryTitle=\u68C0\u67E5\u7528\u6237\u5E93\u8FDE\u63A5\u3002
-LoginHelper.connectUserLibraryFailureWarning=\u65E0\u6CD5\u8FDE\u63A5 Administrator \u4E2D\u7684\u7528\u6237\u5E93\u6784\u4EF6\u5E93\u96C6\uFF0C\u60F3\u8981\u7EE7\u7EED\u6253\u5F00\u5DE5\u7A0B\u5417\uFF1F
+LoginHelper.connectUserLibraryFailureWarning=\u65E0\u6CD5\u8FDE\u63A5\u81F3 Administrator \u4E2D\u7684\u7528\u6237\u5E93\u6784\u4EF6\u5E93\u96C6\u3002\u662F\u5426\u4ECD\u8981\u7EE7\u7EED\u6253\u5F00\u5DE5\u7A0B\uFF1F

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.view.di.nl</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.engines.client.nl</artifactId>

i18n/plugins/org.talend.sbi.engines.client.nl/src/messages_en.properties

@@ -3,14 +3,14 @@ JobScriptsExportWizardPage.contextPerlScripts=Context scripts
 SpagoBiServerEditor.descriptionColumnTitle=Short description
 SpagoBiServerEditor.hostColumnTitle=Host
 SpagoBiServerDialog.host=Host
-SpagoBiServerDialog.shellText.editServer=Edit SpagoBi server
+SpagoBiServerDialog.shellText.editServer=Edit SpagoBI server
 PublishOnSpagoExportWizardPage.publishResourceError=Deploy Resource Error
 PublishOnSpagoExportWizardPage.Settings=Settings
 SpagoBiServerDialog.engineNameText=Engine name
 PublishOnSpagoExportWizardPage.publishJob=Deploy job scripts to SpagoBI.
 PublishOnSpagoExportWizardPage.jobLabel=Label
 SpagoBiServerEditor.engineColumnTitle=Engine name
-SpagoBiServerDialog.shellText.createNewServer=Create new SpagoBi server
+SpagoBiServerDialog.shellText.createNewServer=Create new SpagoBI server
 PublishOnSpagoExportWizardPage.chooseResource=Choose at least one resource to export
 PublishOnSpagoExportWizardPage.jobDescription=Description
 PublishOnSpagoExportWizard.publishJob=Deploy on SpagoBI

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.engines.client.nl</artifactId>

i18n/plugins/org.talend.spagic.engines.client.nl/src/main/java/messages_en.properties

@@ -26,4 +26,4 @@ SpagicServerDialog.shortDescription=Short description
 DataTransferMessages.ZipExport_mustBeFile=Export destination must be a file, not a directory.
 DataTransferMessages.ZipExport_alreadyExists=Target file already exists.  Would you like to overwrite it?
 DataTransferMessages.ZipExport_alreadyExistsError=Export destination already exists and cannot be overwritten.
-SpagicDeployWizardPage.requiredTalendPerlModules=Required talend modules
+SpagicDeployWizardPage.requiredTalendPerlModules=Required Talend modules

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sqlbuilder.nl</artifactId>

i18n/plugins/org.talend.sqlbuilder.nl/src/main/java/messages_de.properties

@@ -5,7 +5,6 @@ AbstractDataSetTab.logMessage1=DataSetTab Exception
 MultiPageSqlBuilderEditor.DesignerTab.Text=Designer
 SQLResultsView.Count.Prefix=Anzahl zur\u00FCckgelieferter Zeilen:
 SQLResultsView.NoResults=F\u00FChren Sie eine Query aus, um deren Ergebnis hier zu sehen...
-GUIModificationQueryAction.ButtonText=\u00C4ndern der Abfrage mit Hilfe des graphischen Editors
 TableNode.logMessage1=Konnte Spaltennamen nicht laden
 EditQueriesAction.textEditQueries=Queries bearbeiten
 BuildInDBStructure.CurrentSchema=Aktuelles Schema
@@ -251,7 +250,6 @@ ConnectionInfoTab.property76=Unterst\u00FCtzt Full Outer Joins
 ConnectionInfoTab.property75=Unterst\u00FCtzt Outer Joins
 ConnectionInfoTab.property73=Unterst\u00FCtzt ANSI92 Full SQL
 ConnectionInfoTab.property72=Unterst\u00FCtzt ANSI92 Intermediate SQL
-GUIModificationQueryAction.Dialog.TitleText=\u00C4ndern der Abfrage mit Hilfe des graphischen Editors
 ConnectionInfoTab.property70=Unterst\u00FCtzt erweiterte SQL Grammatik
 DatabaseDetailView.Tab.Preview.status=Inhaltsvorschau f\u00FCr {0}.
 DatabaseDetailView.Tab.ConnectionInfo.CommitOnClose=Commit beim Schlie\u00DFen
@@ -314,7 +312,6 @@ ConnectionInfoTab.logMessage1=Fehler bei getMaxStatementLength
 ConnectionInfoTab.property29=Max. L\u00E4nge Spaltenname
 ConnectionInfoTab.property28=Max. L\u00E4nge Literale
 ConnectionInfoTab.property27=Max. L\u00E4nge Binary-Literale
-GUIModificationQueryAction.TextDialog.TitleText=Abfrage bearbeiten
 DBStructureComposite.NewEditor=Neuer Ausdruckseditor
 SQLBuilderEditorComposite.titleQuery=Abfrage:
 ConnectionInfoTab.property22=Unterst\u00FCtzt Statement-Pooling

i18n/plugins/org.talend.sqlbuilder.nl/src/main/java/messages_el.properties

@@ -7,7 +7,6 @@ SQLResultsView.Count.Prefix=\u0391\u03C1\u03B9\u03B8\u03BC\u03CC\u03C2 \u03B3\u0
 SQLResultsView.NoResults=\u0395\u03BA\u03C4\u03B5\u03BB\u03AD\u03C3\u03C4\u03B5 \u03AD\u03BD\u03B1 \u03B5\u03C1\u03CE\u03C4\u03B7\u03BC\u03B1 \u03B3\u03B9\u03B1 \u03BD\u03B1 \u03B4\u03B5\u03AF\u03C4\u03B5 \u03C4\u03B1 \u03B1\u03C0\u03BF\u03C4\u03B5\u03BB\u03AD\u03C3\u03BC\u03B1\u03C4\u03B1 \u03B5\u03B4\u03CE...
 TableNode.logMessage4=\u0394\u03B5 \u03BC\u03C0\u03CC\u03C1\u03B5\u03C3\u03B1\u03BD \u03BD\u03B1 \u03B4\u03B7\u03BC\u03B9\u03BF\u03C5\u03C1\u03B3\u03B7\u03B8\u03BF\u03CD\u03BD \u03BA\u03CC\u03BC\u03B2\u03BF\u03B9 \u03C0\u03B1\u03B9\u03B4\u03B9\u03CE\u03BD \u03B3\u03B9\u03B1
 TableNode.logMessage3=\u0394\u03B5 \u03BC\u03C0\u03CC\u03C1\u03B5\u03C3\u03B1\u03BD \u03BD\u03B1 \u03C6\u03BF\u03C1\u03C4\u03C9\u03B8\u03BF\u03CD\u03BD \u03BF\u03BD\u03CC\u03BC\u03B1\u03C4\u03B1 \u03C0\u03C1\u03C9\u03C4\u03B5\u03CD\u03BF\u03BD\u03C4\u03C9\u03BD \u03BA\u03BB\u03B5\u03B9\u03B4\u03B9\u03CE\u03BD
-GUIModificationQueryAction.ButtonText=\u03A4\u03C1\u03BF\u03C0\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03C4\u03BF\u03C5 \u03B5\u03C1\u03C9\u03C4\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03CE\u03BD\u03C4\u03B1\u03C2 \u03C4\u03BF \u03B3\u03C1\u03B1\u03C6\u03B9\u03BA\u03CC \u03BB\u03BF\u03B3\u03B9\u03C3\u03BC\u03B9\u03BA\u03CC \u03B5\u03C0\u03B9\u03BC\u03AD\u03BB\u03B5\u03B9\u03B1\u03C2 \u03AD\u03BA\u03B4\u03BF\u03C3\u03B7\u03C2
 TableNode.logMessage2=\u0394\u03B5 \u03BC\u03C0\u03CC\u03C1\u03B5\u03C3\u03B1\u03BD \u03BD\u03B1 \u03C6\u03BF\u03C1\u03C4\u03C9\u03B8\u03BF\u03CD\u03BD \u03BF\u03BD\u03CC\u03BC\u03B1\u03C4\u03B1 \u03BE\u03AD\u03BD\u03C9\u03BD \u03BA\u03BB\u03B5\u03B9\u03B4\u03B9\u03CE\u03BD
 TableNode.logMessage1=\u0394\u03B5 \u03BC\u03C0\u03CC\u03C1\u03B5\u03C3\u03B1\u03BD \u03BD\u03B1 \u03C6\u03BF\u03C1\u03C4\u03C9\u03B8\u03BF\u03CD\u03BD \u03BF\u03BD\u03CC\u03BC\u03B1\u03C4\u03B1 \u03C3\u03C4\u03B7\u03BB\u03CE\u03BD
 EditQueriesAction.textEditQueries=\u0395\u03C0\u03B5\u03BE\u03B5\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1 \u03B5\u03C1\u03C9\u03C4\u03B7\u03BC\u03AC\u03C4\u03C9\u03BD
@@ -314,7 +313,6 @@ ConnectionInfoTab.property75=\u03A5\u03C0\u03BF\u03C3\u03C4\u03B7\u03C1\u03AF\u0
 ConnectionInfoTab.property73=\u03A5\u03C0\u03BF\u03C3\u03C4\u03B7\u03C1\u03AF\u03B6\u03B5\u03B9 ANSI92 Full SQL
 ConnectionInfoTab.property72=\u03A5\u03C0\u03BF\u03C3\u03C4\u03B7\u03C1\u03AF\u03B6\u03B5\u03B9 ANSI92 Intermediate SQL
 ConnectionInfoTab.property71=\u03A5\u03C0\u03BF\u03C3\u03C4\u03B7\u03C1\u03AF\u03B6\u03B5\u03B9 ANSI92 Entry Level SQL
-GUIModificationQueryAction.Dialog.TitleText=\u03A4\u03C1\u03BF\u03C0\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03C4\u03BF\u03C5 \u03B5\u03C1\u03C9\u03C4\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2 \u03C7\u03C1\u03B7\u03C3\u03B9\u03BC\u03BF\u03C0\u03BF\u03B9\u03CE\u03BD\u03C4\u03B1\u03C2 \u03C4\u03BF \u03B3\u03C1\u03B1\u03C6\u03B9\u03BA\u03CC \u03BB\u03BF\u03B3\u03B9\u03C3\u03BC\u03B9\u03BA\u03CC \u03B5\u03C0\u03B9\u03BC\u03AD\u03BB\u03B5\u03B9\u03B1\u03C2 \u03AD\u03BA\u03B4\u03BF\u03C3\u03B7\u03C2
 ConnectionInfoTab.property70=\u03A5\u03C0\u03BF\u03C3\u03C4\u03B7\u03C1\u03AF\u03B6\u03B5\u03B9 Extended SQL \u0393\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03B9\u03BA\u03AE
 DatabaseDetailView.Tab.Preview.status=\u03A0\u03C1\u03BF\u03B5\u03C0\u03B9\u03C3\u03BA\u03CC\u03C0\u03B7\u03C3\u03B7 \u03C0\u03B5\u03C1\u03B9\u03B5\u03C7\u03BF\u03BC\u03AD\u03BD\u03BF\u03C5 \u03B3\u03B9\u03B1 {0}.
 DatabaseDetailView.Tab.ConnectionInfo.CommitOnClose=\u039F\u03BB\u03BF\u03BA\u03BB\u03AE\u03C1\u03C9\u03C3\u03B7 \u03A3\u03C4\u03BF \u039A\u03BB\u03B5\u03AF\u03C3\u03B9\u03BC\u03BF
@@ -395,7 +393,6 @@ ConnectionInfoTab.logMessage2=\u03A3\u03C6\u03AC\u03BB\u03BC\u03B1 \u03C3\u03C4\
 ConnectionInfoTab.logMessage1=\u03A3\u03C6\u03AC\u03BB\u03BC\u03B1 \u03C3\u03C4\u03BF getMaxStatementLength
 DictionaryLoader.teseedOk=\u03B5\u03BB\u03AD\u03B3\u03B8\u03B7\u03BA\u03B5 \u03BA\u03B1\u03B9 \u03B5\u03AF\u03BD\u03B1\u03B9 ok
 ConnectionInfoTab.property29=\u039C\u03AD\u03B3\u03B9\u03C3\u03C4\u03BF \u039C\u03AE\u03BA\u03BF\u03C2 \u039F\u03BD\u03CC\u03BC\u03B1\u03C4\u03BF\u03C2 \u03A3\u03C4\u03AE\u03BB\u03B7\u03C2
-GUIModificationQueryAction.TextDialog.TitleText=\u03A4\u03C1\u03BF\u03C0\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03C4\u03BF\u03C5 \u03B5\u03C1\u03C9\u03C4\u03AE\u03BC\u03B1\u03C4\u03BF\u03C2
 ConnectionInfoTab.property26=\u03A5\u03C0\u03BF\u03C3\u03C4\u03B7\u03C1\u03AF\u03B6\u03B5\u03B9 \u0386\u03BD\u03BF\u03B9\u03B3\u03BC\u03B1 \u0394\u03B7\u03BB\u03CE\u03C3\u03B5\u03C9\u03BD \u039A\u03B1\u03C4\u03AC \u03A4\u03B7\u03BD \u0391\u03BA\u03CD\u03C1\u03C9\u03C3\u03B7 \u03A3\u03C5\u03BD\u03B1\u03BB\u03BB\u03B1\u03B3\u03AE\u03C2
 ConnectionInfoTab.property25=\u03A5\u03C0\u03BF\u03C3\u03C4\u03B7\u03C1\u03AF\u03B6\u03B5\u03B9 \u0391\u03BD\u03BF\u03B9\u03BA\u03C4\u03AD\u03C2 \u0394\u03B7\u03BB\u03CE\u03C3\u03B5\u03B9\u03C2 \u03A3\u03B5 \u038C\u03BB\u03B7 \u03A4\u03B7\u03BD \u039F\u03BB\u03BF\u03BA\u03BB\u03AE\u03C1\u03C9\u03C3\u03B7
 ConnectionInfoTab.property24=\u03A5\u03C0\u03BF\u03C3\u03C4\u03B7\u03C1\u03AF\u03B6\u03B5\u03B9 \u0386\u03BD\u03BF\u03B9\u03B3\u03BC\u03B1 \u0394\u03C1\u03BF\u03BC\u03AD\u03C9\u03BD \u039A\u03B1\u03C4\u03AC \u03A4\u03B7\u03BD \u0391\u03BA\u03CD\u03C1\u03C9\u03C3\u03B7 \u03A3\u03C5\u03BD\u03B1\u03BB\u03BB\u03B1\u03B3\u03AE\u03C2

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

@@ -4,11 +4,10 @@ AbstractDataSetTab.logMessage2=Error creating ResultSetTab:
 AbstractDataSetTab.logMessage1=DataSetTab Exception
 MultiPageSqlBuilderEditor.DesignerTab.Text=Designer
 SQLResultsView.Count.Prefix=Number of rows returned:
-MultiPageSqlBuilderEditor.ErrorInfo=Parse Sql Statement Error: 
+MultiPageSqlBuilderEditor.ErrorInfo=Parse Sql Statement Error:
 SQLResultsView.NoResults=Execute a query to view the results here...
-TableNode.logMessage4=Could not create child nodes for 
+TableNode.logMessage4=Could not create child nodes for
 TableNode.logMessage3=Could not load primary key names
-GUIModificationQueryAction.ButtonText=Modify the query using graphical editor
 TableNode.logMessage2=Could not load foreign key names
 TableNode.logMessage1=Could not load column names
 EditQueriesAction.textEditQueries=Edit queries
@@ -26,8 +25,8 @@ Images.SqlEditorIcon=icons/edittsk_tsk.gif
 Open_2=Open
 Open_1=Open
 MultiPageSqlBuilderEditor.AddComment.Info=Get the query from the Designer tab?
-ImageUtil.logMessage3=Could not create image for 
-ImageUtil.logMessage2=Missing image path for 
+ImageUtil.logMessage3=Could not create image for
+ImageUtil.logMessage2=Missing image path for
 ImageUtil.logMessage1=Error while disposing images
 OpenDialogJob.Waitdatabase=Waiting for SqlBuilderDialog to open in built-in mode...
 DatabaseDetailView.Tab.ColumnPrefix=, col:
@@ -35,7 +34,7 @@ SessionTreeNodeUtils.logMessage=Database connection closed
 SQLEditor.Actions.ChooseSession.ToolTip=Choose Connection
 DBTreeProvider.logMessage=PersistenceException: 
 DBStructureComposite.exceptionMessage=This repository list should not be empty.
-IndexFolderNode.logMessage2=Could not create child nodes for 
+IndexFolderNode.logMessage2=Could not create child nodes for
 IndexFolderNode.logMessage1=Could not load index names
 Images.PrimaryKeyIcon=icons/pkColumn.gif
 Progress.Dictionary.Cancelled=Operation cancelled by User
@@ -45,10 +44,10 @@ DBTreeProvider.sourceName=Stored Queries
 DatabaseDetailView.Tab.ExportedKeys=Exported Keys
 DatabaseDetailView.Tab.RowCount=Row Count
 AddTablesComposite.textTables=Tables
-SessionTreeNode.logMessage6=Error while getting the alias name 
-SessionTreeNode.logMessage5=Error while rollbacking 
+SessionTreeNode.logMessage6=Error while getting the alias name
+SessionTreeNode.logMessage5=Error while rollbacking
 SessionTreeNode.logMessage4=Could not perform commit/rollback or catalog change.
-SessionTreeNode.logMessage3=Error while committing 
+SessionTreeNode.logMessage3=Error while committing
 SessionTreeNode.logMessage2=Error while closing background database connection
 SessionTreeNode.logMessage1=Error while closing interactive database connection
 DatabaseDetailView.Tab.ColumnInfo.status=Columns for {0}.
@@ -66,7 +65,7 @@ DB2ExplainPlanAction.logMessage1=Get SessionTreeNode failed
 db2.editor.actions.explain=Show DB2 Explain Plan
 SQLBuilderRepositoryNodeManager.exceptionMessage=RepositoryNode with folder info should not call this.
 DatabaseDetailView.Tab.ConnectionInfo=Connection Info
-CopyTableAction.logMessage=Error exporting to clipboard 
+CopyTableAction.logMessage=Error exporting to clipboard
 Images.ForeignKeyIcon=icons/fk_rdbcolumn.gif
 Images.title=icons/sqlbuildertitle.png
 Images.RefreshIcon=icons/update.gif
@@ -106,37 +105,37 @@ DatabaseDetailView.Tab.Unavailable=No detail information available for
 MultiPageSqlBuilderEditor.NoticeTitle.Text=Note
 Clear_2=Clear
 Clear_1=Clear
-TableFolderNode.logMessage=Could not load child nodes for 
+TableFolderNode.logMessage=Could not load child nodes for
 SQLEditor.LimitRows.Error=Invalid row limit, value should be between 0 and 5000.
 Images.ExecSQLIcon=icons/run_exc.gif
 SQLEditor.Actions.Execute=Execute SQL
 SQLBuilderDialog.SaveAllQueries.Title=Save all queries
-ConnectionInfoTab.logMessage99=Error on getting supportsOrderByUnrelated 
-ConnectionInfoTab.logMessage98=Error on getting supportsExpressionsInOrderBy 
-ConnectionInfoTab.logMessage97=Error on getting supportsDifferentTableCorrelationNames 
-ConnectionInfoTab.logMessage96=Error on getting supportsTableCorrelationNames 
-ConnectionInfoTab.logMessage95=Error on getting supportsConvert 
+ConnectionInfoTab.logMessage99=Error on getting supportsOrderByUnrelated
+ConnectionInfoTab.logMessage98=Error on getting supportsExpressionsInOrderBy
+ConnectionInfoTab.logMessage97=Error on getting supportsDifferentTableCorrelationNames
+ConnectionInfoTab.logMessage96=Error on getting supportsTableCorrelationNames
+ConnectionInfoTab.logMessage95=Error on getting supportsConvert
 Images.TableIcon=icons/table.gif
-ConnectionInfoTab.logMessage94=Error on getting nullPlusNonNullIsNull 
+ConnectionInfoTab.logMessage94=Error on getting nullPlusNonNullIsNull
 Preferences=Preferences
-ConnectionInfoTab.logMessage93=Error on getting supportsColumnAliasing 
+ConnectionInfoTab.logMessage93=Error on getting supportsColumnAliasing
 OpenSQLBuilderDialogProgress.exceptionMessage=Opening of SqlBuilderDialog cancelled
-ConnectionInfoTab.logMessage92=Error on getting supportsAlterTableWithDropColumn 
-ConnectionInfoTab.logMessage91=Error on getting supportsAlterTableWithAddColumn 
-ConnectionInfoTab.logMessage90=Error on getExtraNameCharacters 
+ConnectionInfoTab.logMessage92=Error on getting supportsAlterTableWithDropColumn
+ConnectionInfoTab.logMessage91=Error on getting supportsAlterTableWithAddColumn
+ConnectionInfoTab.logMessage90=Error on getExtraNameCharacters
 Images.ExportIcon=icons/ExportData.gif
 DatabaseDetailView.Tab.ConnectionInfo.NullsSortedHigh=Nulls Are Sorted High
 DataSetTableActionGroup.logMessage1=Could not create menu action
-ConnectionInfoTab.logMessage89=Error on getSearchStringEscape 
-ConnectionInfoTab.logMessage88=Error on getIdentifierQuoteString 
-ConnectionInfoTab.logMessage87=Error on getting storesMixedCaseQuotedIdentifiers 
-ConnectionInfoTab.logMessage86=Error on getting storesLowerCaseQuotedIdentifiers 
-ConnectionInfoTab.logMessage85=Error on getting storesUpperCaseQuotedIdentifiers 
-ConnectionInfoTab.logMessage84=Error on getting supportsMixedCaseQuotedIdentifiers 
-ConnectionInfoTab.logMessage83=Error on getting storesMixedCaseIdentifiers 
-ConnectionInfoTab.logMessage82=Error on getCatalogSeparator 
-ConnectionInfoTab.logMessage81=Error on getting isCatalogAtStart 
-ConnectionInfoTab.logMessage80=Error on getCatalogTerm 
+ConnectionInfoTab.logMessage89=Error on getSearchStringEscape
+ConnectionInfoTab.logMessage88=Error on getIdentifierQuoteString
+ConnectionInfoTab.logMessage87=Error on getting storesMixedCaseQuotedIdentifiers
+ConnectionInfoTab.logMessage86=Error on getting storesLowerCaseQuotedIdentifiers
+ConnectionInfoTab.logMessage85=Error on getting storesUpperCaseQuotedIdentifiers
+ConnectionInfoTab.logMessage84=Error on getting supportsMixedCaseQuotedIdentifiers
+ConnectionInfoTab.logMessage83=Error on getting storesMixedCaseIdentifiers
+ConnectionInfoTab.logMessage82=Error on getCatalogSeparator
+ConnectionInfoTab.logMessage81=Error on getting isCatalogAtStart
+ConnectionInfoTab.logMessage80=Error on getCatalogTerm
 OpenFileAction.logTextErrorLoadingDoc=Error while loading document
 ConnectionInfoTab.property108=Stores Lower Case Identifiers
 ConnectionInfoTab.property107=Stores Upper Case Identifiers
@@ -150,30 +149,30 @@ ConnectionInfoTab.property102=Supports Group By Beyond Select
 ConnectionInfoTab.property101=Supports Group By Unrelated
 ConnectionInfoTab.property100=Supports Group By
 SQLEditor.Actions.SaveSQL=Save as
-ConnectionInfoTab.logMessage79=Error on getProcedureTerm 
-ConnectionInfoTab.logMessage78=Error on getSchemaTerm 
-ConnectionInfoTab.logMessage77=Error on getting supportsLimitedOuterJoins 
-ConnectionInfoTab.logMessage76=Error on getting supportsFullOuterJoins 
-ConnectionInfoTab.logMessage75=Error on getting supportsOuterJoins 
-ConnectionInfoTab.logMessage74=Error on getting supportsIntegrityEnhancementFacility 
-ConnectionInfoTab.logMessage73=Error on getting supportsANSI92FullSQL 
-ConnectionInfoTab.logMessage72=Error on getting supportsANSI92IntermediateSQL 
-ConnectionInfoTab.logMessage71=Error on getting supportsANSI92EntryLevelSQL 
-ConnectionInfoTab.logMessage70=Error on getting supportsExtendedSQLGrammar 
+ConnectionInfoTab.logMessage79=Error on getProcedureTerm
+ConnectionInfoTab.logMessage78=Error on getSchemaTerm
+ConnectionInfoTab.logMessage77=Error on getting supportsLimitedOuterJoins
+ConnectionInfoTab.logMessage76=Error on getting supportsFullOuterJoins
+ConnectionInfoTab.logMessage75=Error on getting supportsOuterJoins
+ConnectionInfoTab.logMessage74=Error on getting supportsIntegrityEnhancementFacility
+ConnectionInfoTab.logMessage73=Error on getting supportsANSI92FullSQL
+ConnectionInfoTab.logMessage72=Error on getting supportsANSI92IntermediateSQL
+ConnectionInfoTab.logMessage71=Error on getting supportsANSI92EntryLevelSQL
+ConnectionInfoTab.logMessage70=Error on getting supportsExtendedSQLGrammar
 GUIModificationQueryAction.Error.Notice=Note
 DatabaseDetailView.Tab.ConnectionInfo.AutocommitMode=Autocommit Mode
 IndexNode.logMessage=Could not load column names
-ConnectionInfoTab.logMessage69=Error on getting supportsCoreSQLGrammar 
+ConnectionInfoTab.logMessage69=Error on getting supportsCoreSQLGrammar
 SQLResultsView.Error.Title=Error while executing SQL
-ConnectionInfoTab.logMessage68=Error on getting supportsMinimumSQLGrammar 
-ConnectionInfoTab.logMessage67=Error on getting supportsNonNullableColumns 
-ConnectionInfoTab.logMessage66=Error on getting supportsMultipleTransactions 
-ConnectionInfoTab.logMessage65=Error on getting supportsMultipleOpenResults 
-ConnectionInfoTab.logMessage64=Error on getting supportsMultipleResultSets 
-ConnectionInfoTab.logMessage63=Error on getting supportsLikeEscapeClause 
-ConnectionInfoTab.logMessage62=Error on getting supportsUnionAll 
-ConnectionInfoTab.logMessage61=Error on getting supportsUnion 
-ConnectionInfoTab.logMessage60=Error on getting supportsCorrelatedSubqueries 
+ConnectionInfoTab.logMessage68=Error on getting supportsMinimumSQLGrammar
+ConnectionInfoTab.logMessage67=Error on getting supportsNonNullableColumns
+ConnectionInfoTab.logMessage66=Error on getting supportsMultipleTransactions
+ConnectionInfoTab.logMessage65=Error on getting supportsMultipleOpenResults
+ConnectionInfoTab.logMessage64=Error on getting supportsMultipleResultSets
+ConnectionInfoTab.logMessage63=Error on getting supportsLikeEscapeClause
+ConnectionInfoTab.logMessage62=Error on getting supportsUnionAll
+ConnectionInfoTab.logMessage61=Error on getting supportsUnion
+ConnectionInfoTab.logMessage60=Error on getting supportsCorrelatedSubqueries
 MetadataRefreshAction.textSynchronize=Synchronize
 DatabaseDetailView.Tab.ConnectionInfo.UserName=User Name
 DB2ExplainPlanExecution.tableColumnText2=Cardinality
@@ -183,84 +182,84 @@ Images.CopyIcon=icons/copy_edit.gif
 DBStructureComposite.TakeALongTime=It'll take a long time. Continue?
 Images.IndexIcon=icons/index.gif
 AbstractSQLExecution.Executing.Error=Error Executing SQL
-ConnectionInfoTab.logMessage59=Error on getting supportsSubqueriesInQuantifieds 
-ConnectionInfoTab.logMessage58=Error on getting supportsSubqueriesInIns 
-ConnectionInfoTab.logMessage57=Error on getting supportsSubqueriesInExists 
-ConnectionInfoTab.logMessage56=Error on getting supportsSubqueriesInComparisons 
+ConnectionInfoTab.logMessage59=Error on getting supportsSubqueriesInQuantifieds
+ConnectionInfoTab.logMessage58=Error on getting supportsSubqueriesInIns
+ConnectionInfoTab.logMessage57=Error on getting supportsSubqueriesInExists
+ConnectionInfoTab.logMessage56=Error on getting supportsSubqueriesInComparisons
 DatabaseDetailView.Tab.RowPrefix=row:
-ConnectionInfoTab.logMessage55=Error on getting supportsStoredProcedures 
-ConnectionInfoTab.logMessage54=Error on getting supportsPositionedUpdate 
-ConnectionInfoTab.logMessage53=Error on getting supportsPositionedDelete 
-ConnectionInfoTab.logMessage52=Error on getting supportsCatalogsInPrivilegeDefinitions 
-ConnectionInfoTab.logMessage51=Error on getting supportsCatalogsInIndexDefinitions 
-ConnectionInfoTab.logMessage50=Error on getting supportsCatalogsInTableDefinitions 
+ConnectionInfoTab.logMessage55=Error on getting supportsStoredProcedures
+ConnectionInfoTab.logMessage54=Error on getting supportsPositionedUpdate
+ConnectionInfoTab.logMessage53=Error on getting supportsPositionedDelete
+ConnectionInfoTab.logMessage52=Error on getting supportsCatalogsInPrivilegeDefinitions
+ConnectionInfoTab.logMessage51=Error on getting supportsCatalogsInIndexDefinitions
+ConnectionInfoTab.logMessage50=Error on getting supportsCatalogsInTableDefinitions
 DataSetTable.PopUp.Find=Scroll To Column:   (ENTER: find next)
 SqlBuilderPreferencePage.AddQuotes=add quotes, when you generate sql statement
-ConnectionInfoTab.LogMessage25=Error on getting supportsOpenStatementsAcrossCommit 
+ConnectionInfoTab.LogMessage25=Error on getting supportsOpenStatementsAcrossCommit
 ConnectionInfoTab.property9=Supports Data Manipulation Transactions Only
 ConnectionInfoTab.property8=Supports Data Definition and Data Manipulation Transactions
 ConnectionInfoTab.property7=Supports Transactions
 ConnectionInfoTab.property6=Default Transaction Isolation
 ConnectionInfoTab.property5=Max User Name Length
-ConnectionInfoTab.logMessage49=Error on getting supportsCatalogsInProcedureCalls 
+ConnectionInfoTab.logMessage49=Error on getting supportsCatalogsInProcedureCalls
 ConnectionInfoTab.property4=Max Tables In Select
-ConnectionInfoTab.logMessage48=Error on getting supportsCatalogsInDataManipulation 
+ConnectionInfoTab.logMessage48=Error on getting supportsCatalogsInDataManipulation
 ConnectionInfoTab.property3=Max Table Name Length
-ConnectionInfoTab.logMessage47=Error on getting supportsSchemasInPrivilegeDefinitions 
+ConnectionInfoTab.logMessage47=Error on getting supportsSchemasInPrivilegeDefinitions
 ConnectionInfoTab.property2=Max Statements
-ConnectionInfoTab.logMessage46=Error on getting supportsSchemasInIndexDefinitions 
+ConnectionInfoTab.logMessage46=Error on getting supportsSchemasInIndexDefinitions
 ConnectionInfoTab.property1=Max Statement Length
-ConnectionInfoTab.logMessage45=Error on getting supportsSchemasInTableDefinitions 
-ConnectionInfoTab.logMessage44=Error on getting supportsSchemasInProcedureCalls 
-ConnectionInfoTab.logMessage43=Error on getting supportsSchemasInDataManipulation 
-ConnectionInfoTab.logMessage42=Error on getting doesMaxRowSizeIncludeBlobs 
-CopyCellAction.logMessage=Error exporting cell to clipboard 
-ConnectionInfoTab.logMessage41=Error on getMaxRowSize 
-ConnectionInfoTab.logMessage40=Error on getMaxCatalogNameLength 
+ConnectionInfoTab.logMessage45=Error on getting supportsSchemasInTableDefinitions
+ConnectionInfoTab.logMessage44=Error on getting supportsSchemasInProcedureCalls
+ConnectionInfoTab.logMessage43=Error on getting supportsSchemasInDataManipulation
+ConnectionInfoTab.logMessage42=Error on getting doesMaxRowSizeIncludeBlobs
+CopyCellAction.logMessage=Error exporting cell to clipboard
+ConnectionInfoTab.logMessage41=Error on getMaxRowSize
+ConnectionInfoTab.logMessage40=Error on getMaxCatalogNameLength
 Images.DefaultNodeImage=icons/app_obj.gif
 SqlBuilderPreferencePage.ActivedTimeoutSetting=Activate the timeout for database connection.
 DatabaseDetailView.Tab.RowCount.status=Row Count for {0}.
 SQLResultsView.Time.Postfix=ms.
-ConnectionInfoTab.logMessage39=Error on getMaxProcedureNameLength 
-ConnectionInfoTab.logMessage38=Error on getMaxSchemaNameLength 
+ConnectionInfoTab.logMessage39=Error on getMaxProcedureNameLength
+ConnectionInfoTab.logMessage38=Error on getMaxSchemaNameLength
 UnsignedWordRule.logMessage=Error while getting column names
-ConnectionInfoTab.logMessage37=Error on getMaxIndexLength 
-ConnectionInfoTab.logMessage36=Error on getMaxCursorNameLength 
-ConnectionInfoTab.logMessage35=Error on getMaxConnections 
-ConnectionInfoTab.logMessage34=Error on getMaxColumnsInTable 
+ConnectionInfoTab.logMessage37=Error on getMaxIndexLength
+ConnectionInfoTab.logMessage36=Error on getMaxCursorNameLength
+ConnectionInfoTab.logMessage35=Error on getMaxConnections
+ConnectionInfoTab.logMessage34=Error on getMaxColumnsInTable
 Images.OpenFolder=icons/openFolder.gif
-ConnectionInfoTab.logMessage33=Error on getMaxColumnsInSelect 
-ConnectionInfoTab.logMessage32=Error on getMaxColumnsInOrderBy 
-ConnectionInfoTab.logMessage31=Error on getMaxColumnsInIndex 
-ConnectionInfoTab.logMessage30=Error on getMaxColumnsInGroupBy 
+ConnectionInfoTab.logMessage33=Error on getMaxColumnsInSelect
+ConnectionInfoTab.logMessage32=Error on getMaxColumnsInOrderBy
+ConnectionInfoTab.logMessage31=Error on getMaxColumnsInIndex
+ConnectionInfoTab.logMessage30=Error on getMaxColumnsInGroupBy
 DatabaseDetailView.Tab.ConnectionInfo.NullsSortedLow=Nulls Are Sorted Low
 ErDiagramDialog.textGenerateSelectStatement=Generate Select Statement
 Images.RedIcon=icons/red.gif
 MultiPageSqlBuilderEditor.EditTab.Text=Edit
-ConnectionInfoTab.logMessage29=Error on getMaxColumnNameLength 
-ConnectionInfoTab.logMessage28=Error on getMaxCharLiteralLength 
-ConnectionInfoTab.logMessage27=Error on getMaxBinaryLiteralLength 
-ConnectionInfoTab.logMessage26=Error on getting supportsOpenStatementsAcrossRollback 
-ConnectionInfoTab.logMessage24=Error on getting supportsOpenCursorsAcrossRollback 
-ConnectionInfoTab.logMessage23=Error on getting supportsOpenCursorsAcrossCommit 
-ConnectionInfoTab.logMessage22=Error on getting isReadOnly 
-ConnectionInfoTab.logMessage21=Error on getting supportsStatementPooling 
-ConnectionInfoTab.logMessage20=Error on getting locatorsUpdateCopy 
-CopyColumnNameAction.logMessage=Error exporting cell to clipboard 
+ConnectionInfoTab.logMessage29=Error on getMaxColumnNameLength
+ConnectionInfoTab.logMessage28=Error on getMaxCharLiteralLength
+ConnectionInfoTab.logMessage27=Error on getMaxBinaryLiteralLength
+ConnectionInfoTab.logMessage26=Error on getting supportsOpenStatementsAcrossRollback
+ConnectionInfoTab.logMessage24=Error on getting supportsOpenCursorsAcrossRollback
+ConnectionInfoTab.logMessage23=Error on getting supportsOpenCursorsAcrossCommit
+ConnectionInfoTab.logMessage22=Error on getting isReadOnly
+ConnectionInfoTab.logMessage21=Error on getting supportsStatementPooling
+ConnectionInfoTab.logMessage20=Error on getting locatorsUpdateCopy
+CopyColumnNameAction.logMessage=Error exporting cell to clipboard
 DatabaseNode.logMessage=Error loading children
 Images.OpenFileIcon=icons/open.gif
 AbstractNode.logMessage=Could not load child nodes for {0}.
 EMFRepositoryNodeManager.Notice.title3=Note
-ConnectionInfoTab.logMessage19=Error on getSQLStateType 
-ConnectionInfoTab.logMessage18=Error on getJDBCMajorVersion 
-ConnectionInfoTab.logMessage17=Error on getJDBCMinorVersion 
-ConnectionInfoTab.logMessage16=Error on getDatabaseMinorVersion 
-ConnectionInfoTab.logMessage15=Error on getDatabaseMajorVersion 
-ConnectionInfoTab.logMessage14=Error on getting supportsGetGeneratedKeys 
-ConnectionInfoTab.logMessage13=Error on getting supportsNamedParameters 
-ConnectionInfoTab.logMessage12=Error on getting supportsSavepoints 
-ConnectionInfoTab.logMessage11=Error on getting supportsBatchUpdates 
-ConnectionInfoTab.logMessage10=Error on getting dataDefinitionIgnoredInTransactions 
+ConnectionInfoTab.logMessage19=Error on getSQLStateType
+ConnectionInfoTab.logMessage18=Error on getJDBCMajorVersion
+ConnectionInfoTab.logMessage17=Error on getJDBCMinorVersion
+ConnectionInfoTab.logMessage16=Error on getDatabaseMinorVersion
+ConnectionInfoTab.logMessage15=Error on getDatabaseMajorVersion
+ConnectionInfoTab.logMessage14=Error on getting supportsGetGeneratedKeys
+ConnectionInfoTab.logMessage13=Error on getting supportsNamedParameters
+ConnectionInfoTab.logMessage12=Error on getting supportsSavepoints
+ConnectionInfoTab.logMessage11=Error on getting supportsBatchUpdates
+ConnectionInfoTab.logMessage10=Error on getting dataDefinitionIgnoredInTransactions
 SQLEditor.Actions.SaveAs=Export as
 SqlBuilderPreferencePage.SystemSQL=System SQL Statement
 Images.GrayIcon=icons/gray.gif
@@ -285,7 +284,7 @@ SQLEditor.Actions.DuplicateNameMessage=Item with the same name already exists.
 Images.ExportToClipBoardIcon=icons/copy_edit.gif
 DatabaseDetailView.Tab.ImportedKeys.status=Imported Keys for
 DataSetTableKeyListener.logMessage2=Error refreshing
-DataSetTableKeyListener.logMessage1=Error exporting cell to clipboard 
+DataSetTableKeyListener.logMessage1=Error exporting cell to clipboard
 SQLEditor.Actions.SaveMessage=Save
 Images.Explain=icons/explain.gif
 AbstractSQLSourceTab.logMessage2=Error closing statement
@@ -314,8 +313,8 @@ ConnectionInfoTab.property83=Stores Mixed Case Identifiers
 ConnectionInfoTab.property82=Catalog Separator
 ConnectionInfoTab.property81=Is Catalog at Start
 ConnectionInfoTab.property80=Catalog Term
-SortedList.exceptionMessage=Index is greater than size or below zero for remove 
-ColumnFolderNode.logMessage=Could not create child nodes for 
+SortedList.exceptionMessage=Index is greater than size or below zero for remove
+ColumnFolderNode.logMessage=Could not create child nodes for
 ConnectionInfoTab.property79=Procedure Term
 SqlBuilderPreferencePage.ConnectionTimeout=Connection timeout (seconds)
 ConnectionInfoTab.property78=Schema Term
@@ -326,7 +325,6 @@ ConnectionInfoTab.property74=Supports Integrity Enhancement Facility
 ConnectionInfoTab.property73=Supports ANSI92 Full SQL
 ConnectionInfoTab.property72=Supports ANSI92 Intermediate SQL
 ConnectionInfoTab.property71=Supports ANSI92 Entry Level SQL
-GUIModificationQueryAction.Dialog.TitleText=Modify The Query using graphical editor
 ConnectionInfoTab.property70=Supports Extended SQL Grammar
 DatabaseDetailView.Tab.Preview.status=Content preview for {0}.
 DatabaseDetailView.Tab.ConnectionInfo.CommitOnClose=Commit On Close
@@ -337,7 +335,7 @@ ConnectionInfoTab.property68=Supports Minimum SQL Grammar
 ConnectionInfoTab.property67=Supports Non Nullable Columns
 ConnectionInfoTab.property66=Supports Multiple Transactions
 SQLBuilderEditorComposite.assertMessage=This node cannot be null
-ConnectionInfoTab.property65=Supports Multiple Open Results 
+ConnectionInfoTab.property65=Supports Multiple Open Results
 ConnectionInfoTab.property64=Supports Multiple Result Sets
 ConnectionInfoTab.property63=Supports Like Escape Clause
 ConnectionInfoTab.property62=Supports Union All
@@ -348,7 +346,7 @@ ConnectionInfoTab.property60=Supports Correlated Subqueries
 DBStructureComposite.Property=Property
 Images.DefaultParentNodeIcon=icons/outline.gif
 SQLEditor.SaveAsDialog.Title=Export query as
-DataSetTable.invalidExcepitonMessage=Invalid columnLabel or columnTypes in DataSet 
+DataSetTable.invalidExcepitonMessage=Invalid columnLabel or columnTypes in DataSet
 DataSetTable.Actions.Export.XLS=Export to .xls
 DataSetTable.Actions.Export.CSV=Export to .csv
 ConnectionInfoTab.property59=Supports Subqueries in Quantified Expressions
@@ -381,7 +379,7 @@ ConnectionInfoTab.property40=Max Catalog Name Length
 oracle.editor.actions.explain.notFound.Title=Plan Table not found
 Images.ConnectionIcon=icons/connection.png
 DatabaseDetailView.Tab.ImportedKeys=Imported Keys
-SchemaNode.logMessage4=Could not load child nodes for 
+SchemaNode.logMessage4=Could not load child nodes for
 SchemaNode.logMessage3=Loading all tables at once is not supported
 SchemaNode.logMessage2=Could not create child node
 SchemaNode.logMessage1=Could not create child node
@@ -399,21 +397,20 @@ ConnectionInfoTab.property31=Max Columns In Index
 ConnectionInfoTab.property30=Max Columns In Group By
 SQLEditor.Actions.SaveAsToolTip=Export query as
 DataSetTable.Actions.CopyCell=Copy Cell
-ConnectionInfoTab.logMessage9=Error on getting dataDefinitionCausesTransactionCommit 
-ConnectionInfoTab.logMessage8=Error on getting supportsDataManipulationTransactionsOnly 
-ConnectionInfoTab.logMessage7=Error on getting supportsDataDefinitionAndDataManipulationTransactions 
-ConnectionInfoTab.logMessage6=Error on getting supportsTransactions 
-ConnectionInfoTab.logMessage5=Error on getMaxUserNameLength 
+ConnectionInfoTab.logMessage9=Error on getting dataDefinitionCausesTransactionCommit
+ConnectionInfoTab.logMessage8=Error on getting supportsDataManipulationTransactionsOnly
+ConnectionInfoTab.logMessage7=Error on getting supportsDataDefinitionAndDataManipulationTransactions
+ConnectionInfoTab.logMessage6=Error on getting supportsTransactions
+ConnectionInfoTab.logMessage5=Error on getMaxUserNameLength
 TableNode.exceptionMessage=Only Table will call this.
-ConnectionInfoTab.logMessage4=Error on getMaxTablesInSelect 
-ConnectionInfoTab.logMessage3=Error on getMaxTableNameLength 
-ConnectionInfoTab.logMessage2=Error on getMaxStatements 
-ConnectionInfoTab.logMessage1=Error on getMaxStatementLength 
-DictionaryLoader.teseedOk=tested ok 
+ConnectionInfoTab.logMessage4=Error on getMaxTablesInSelect
+ConnectionInfoTab.logMessage3=Error on getMaxTableNameLength
+ConnectionInfoTab.logMessage2=Error on getMaxStatements
+ConnectionInfoTab.logMessage1=Error on getMaxStatementLength
+DictionaryLoader.teseedOk=tested ok
 ConnectionInfoTab.property29=Max Column Name Length
 ConnectionInfoTab.property28=Max Char Literal Length
 ConnectionInfoTab.property27=Max Binary Literal Length
-GUIModificationQueryAction.TextDialog.TitleText=Modify the query
 ConnectionInfoTab.property26=Supports Open Statements Across Rollback
 ConnectionInfoTab.property25=Supports Open Statements Across Commit
 ConnectionInfoTab.property24=Supports Open Cursors Across Rollback
@@ -469,7 +466,7 @@ Images.CatalogNodeIcon=icons/schema.gif
 db2.editor.actions.explain.notFound.Title=Plan Table not found
 DatabaseDetailView.Tab.ConnectionInfo.DriverName=Driver Name
 DatabaseDetailView.Tab.ConnectionInfo.NullsSortedEnd=Nulls Are Sorted At End
-CloseSQLResultTabAction.logMessageMissingImagePath=Missing image path for 
+CloseSQLResultTabAction.logMessageMissingImagePath=Missing image path for
 DatabaseDetailView.Tab.ConnectionInfo.URL=URL
 DatabaseDetailView.Tab.ConnectionInfo.ProceduresCallable=All Procedures Are Callable
 OracleExplainPlanAction.logMessage5=Error while creating sql execution tab
@@ -478,43 +475,43 @@ oracle.editor.actions.explain=Show Oracle Explain Plan
 OracleExplainPlanAction.logMessage3=Error while closing statement
 EMFRepositoryNodeManager.Notice.info=You must input one Sql Statement!
 OracleExplainPlanAction.logMessage2=Error while creating the plan table
-OracleExplainPlanAction.logMessage1=Failed to get SessionTreeNode 
+OracleExplainPlanAction.logMessage1=Failed to get SessionTreeNode
 Images.ColumnNodeIcon=icons/columns.gif
 SQLBuilderDialog.SaveAllQueries.Info=Are you sure you want to save all queries?
 SQLResultsView.Executing=Executing...
 DBTreeActionGroup.logMessage=Could not create menu action
-ConnectionInfoTab.logMessage123=Error on getting storesLowerCaseIdentifiers 
-ConnectionInfoTab.logMessage122=Error on getting storesUpperCaseIdentifiers 
-ConnectionInfoTab.logMessage121=Error on getting supportsMixedCaseIdentifiers 
-ConnectionInfoTab.logMessage120=Error on getting usesLocalFilePerTable 
+ConnectionInfoTab.logMessage123=Error on getting storesLowerCaseIdentifiers
+ConnectionInfoTab.logMessage122=Error on getting storesUpperCaseIdentifiers
+ConnectionInfoTab.logMessage121=Error on getting supportsMixedCaseIdentifiers
+ConnectionInfoTab.logMessage120=Error on getting usesLocalFilePerTable
 SQLEditor.SQLPropertyDialog.Name=Name
 SqlBuilderPreferencePage.StandardSQL=Standard SQL Statement
 SQLEditor.LimitRows.ConfirmNoLimit.Message=Allowing a large number of rows may result in poor performance. Continue?
-ConnectionInfoTab.logMessage119=Error on getting usesLocalFiles 
-ConnectionInfoTab.logMessage118=Error on getResultSetHoldability 
+ConnectionInfoTab.logMessage119=Error on getting usesLocalFiles
+ConnectionInfoTab.logMessage118=Error on getResultSetHoldability
 DBStructureComposite.Repository=Repository
 ConnectionInfoTab.logMessage117=Error on getting nullsAreSortedAtEnd
-ConnectionInfoTab.logMessage116=Error on getting nullsAreSortedAtStart 
+ConnectionInfoTab.logMessage116=Error on getting nullsAreSortedAtStart
 ConnectionInfoTab.logMessage115=Error on getting nullsAreSortedLow
-ConnectionInfoTab.logMessage114=Error on getting nullsAreSortedHigh 
+ConnectionInfoTab.logMessage114=Error on getting nullsAreSortedHigh
 Images.DefaultNodeIcon=icons/defaultview_misc.gif
-ConnectionInfoTab.logMessage113=Error on getting allTablesAreSelectable 
-ConnectionInfoTab.logMessage112=Error on getting allProceduresAreCallable 
-ConnectionInfoTab.logMessage111=Error on getCommitOnClose 
-ConnectionInfoTab.logMessage110=Error on getAutoCommit 
+ConnectionInfoTab.logMessage113=Error on getting allTablesAreSelectable
+ConnectionInfoTab.logMessage112=Error on getting allProceduresAreCallable
+ConnectionInfoTab.logMessage111=Error on getCommitOnClose
+ConnectionInfoTab.logMessage110=Error on getAutoCommit
 DatabaseDetailView.Tab.Source=Source
 RefreshTable.Refresh_1=Refresh Table
-ConnectionInfoTab.logMessage109=Error on getURL 
-ConnectionInfoTab.logMessage108=Error on getUserName 
-ConnectionInfoTab.logMessage107=Error on getDriverVersion 
-ConnectionInfoTab.logMessage106=Error on getDriverName 
-ConnectionInfoTab.logMessage105=Error on getDriverMinorVersion 
-ConnectionInfoTab.logMessage104=Error on getDriverMajorVersion 
-ConnectionInfoTab.logMessage103=Error on getDatabaseProductName 
+ConnectionInfoTab.logMessage109=Error on getURL
+ConnectionInfoTab.logMessage108=Error on getUserName
+ConnectionInfoTab.logMessage107=Error on getDriverVersion
+ConnectionInfoTab.logMessage106=Error on getDriverName
+ConnectionInfoTab.logMessage105=Error on getDriverMinorVersion
+ConnectionInfoTab.logMessage104=Error on getDriverMajorVersion
+ConnectionInfoTab.logMessage103=Error on getDatabaseProductName
 Progress.Dictionary.Title=Loading content assistant
-ConnectionInfoTab.logMessage102=Error on getting supportsGroupByBeyondSelect 
-ConnectionInfoTab.logMessage101=Error on getting supportsGroupByUnrelated 
-ConnectionInfoTab.logMessage100=Error on getting supportsGroupBy 
+ConnectionInfoTab.logMessage102=Error on getting supportsGroupByBeyondSelect
+ConnectionInfoTab.logMessage101=Error on getting supportsGroupByUnrelated
+ConnectionInfoTab.logMessage100=Error on getting supportsGroupBy
 Image.sqlAliasIcon=icons/sql_alias.gif
 DBStructureComposite.DatabaseStructure=Database Structure
 OracleExplainPlanExecution.tableColumnText2=Cardinality
@@ -543,3 +540,5 @@ SQLResultComposite.Result=Result
 UIUtils.DBConnectionFailure=Connection failure, check the database settings or contact your database administrator.
 SQLEditor.SQLPropertyDialog.ShowQueryProperty.title=Show Query Property
 SQLEditor.SQLPropertyDialog.ShowQueryProperty.message=Show Query Property name and comment.
+GUIModificationQueryAction.GraphicalEditorDialog.TitleText=Modify query using graphical editor
+GUIModificationQueryAction.TextEditorDialog.TitleText=Modify query

i18n/plugins/org.talend.sqlbuilder.nl/src/main/java/messages_fr.properties

@@ -8,7 +8,6 @@ MultiPageSqlBuilderEditor.ErrorInfo=Analyse de l\'erreur de l\'instruction SQL :
 SQLResultsView.NoResults=Visualisez ici le r\u00E9sultat de la requ\u00EAte...
 TableNode.logMessage4=Impossible de cr\u00E9er des n\u0153uds fils pour 
 TableNode.logMessage3=Ne peut pas charger le nom des cl\u00E9s primaires
-GUIModificationQueryAction.ButtonText=Modifier la requ\u00EAte \u00E0 l'aide de l'\u00E9diteur graphique
 TableNode.logMessage2=Ne peut pas charger le nom des cl\u00E9s \u00E9trang\u00E8res
 TableNode.logMessage1=Ne peut pas charger le nom des colonnes
 EditQueriesAction.textEditQueries=\u00C9diter les requ\u00EAtes
@@ -326,7 +325,6 @@ ConnectionInfoTab.property74=Supporte la fonction d'am\u00E9lioration d'int\u00E
 ConnectionInfoTab.property73=Supporte le SQL ANSI92 complet
 ConnectionInfoTab.property72=Supporte le SQL ANSI92 niveau int\u00E9rm\u00E9diaire
 ConnectionInfoTab.property71=Supporte le SQL ANSI92 niveau d'entr\u00E9e
-GUIModificationQueryAction.Dialog.TitleText=Modifier la requ\u00EAte \u00E0 l'aide de l'\u00E9diteur graphique
 ConnectionInfoTab.property70=Supporte la grammaire SQL \u00E9tendue
 DatabaseDetailView.Tab.Preview.status=Pr\u00E9visualisation du contenu de {0}.
 DatabaseDetailView.Tab.ConnectionInfo.CommitOnClose=Commit \u00E0 la fermeture
@@ -413,7 +411,6 @@ DictionaryLoader.teseedOk=test\u00E9 ok
 ConnectionInfoTab.property29=Longueur maximale du nom de colonne
 ConnectionInfoTab.property28=Longueur maximale du caract\u00E8re litt\u00E9ral
 ConnectionInfoTab.property27=Longueur maximale binaire litt\u00E9rale
-GUIModificationQueryAction.TextDialog.TitleText=Modifier la requ\u00EAte
 ConnectionInfoTab.property26=Supporte les instructions ouvertes sur Rollback
 ConnectionInfoTab.property25=Supporte les instructions ouvertes sur Commit
 ConnectionInfoTab.property24=Supporte les curseurs ouverts sur Rollback

i18n/plugins/org.talend.sqlbuilder.nl/src/main/java/messages_ja.properties

@@ -8,7 +8,6 @@ MultiPageSqlBuilderEditor.ErrorInfo=SQL\u6587\u30A8\u30E9\u30FC\u306E\u89E3\u679
 SQLResultsView.NoResults=\u30AF\u30A8\u30EA\u3092\u5B9F\u884C\u3059\u308B\u3068\u7D50\u679C\u304C\u3053\u3053\u306B\u8868\u793A\u3055\u308C\u307E\u3059...
 TableNode.logMessage4=\u5B50\u30CE\u30FC\u30C9\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
 TableNode.logMessage3=\u30D7\u30E9\u30A4\u30DE\u30EA\u30AD\u30FC\u540D\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-GUIModificationQueryAction.ButtonText=SQL\u30A8\u30C7\u30A3\u30BF\u3092\u4F7F\u7528\u3057\u3066\u30AF\u30A8\u30EA\u3092\u7DE8\u96C6
 TableNode.logMessage2=\u5916\u90E8\u30AD\u30FC\u540D\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
 TableNode.logMessage1=\u30AB\u30E9\u30E0\u540D\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
 EditQueriesAction.textEditQueries=\u30AF\u30A8\u30EA\u306E\u7DE8\u96C6
@@ -326,7 +325,6 @@ ConnectionInfoTab.property74=Integrity Enhancement Facility\u306E\u30B5\u30DD\u3
 ConnectionInfoTab.property73=ANSI92 Full SQL\u306E\u30B5\u30DD\u30FC\u30C8
 ConnectionInfoTab.property72=ANSI92 Intermediate SQL\u306E\u30B5\u30DD\u30FC\u30C8
 ConnectionInfoTab.property71=ANSI92\u30A8\u30F3\u30C8\u30EA\u30EC\u30D9\u30EBSQL\u306E\u30B5\u30DD\u30FC\u30C8
-GUIModificationQueryAction.Dialog.TitleText=SQL\u30A8\u30C7\u30A3\u30BF\u3092\u4F7F\u7528\u3057\u3066\u30AF\u30A8\u30EA\u3092\u7DE8\u96C6
 ConnectionInfoTab.property70=\u62E1\u5F35SQL\u6587\u6CD5\u306E\u30B5\u30DD\u30FC\u30C8
 DatabaseDetailView.Tab.Preview.status=\u30B3\u30F3\u30C6\u30F3\u30C4\u30D7\u30EC\u30D3\u30E5\u30FC\uFF5B0\uFF5D
 DatabaseDetailView.Tab.ConnectionInfo.CommitOnClose=\u9589\u3058\u308B\u6642\u306B\u30B3\u30DF\u30C3\u30C8
@@ -413,7 +411,6 @@ DictionaryLoader.teseedOk=\u30C6\u30B9\u30C8\u6210\u529F
 ConnectionInfoTab.property29=\u6700\u5927\u30AB\u30E9\u30E0\u540D\u9577
 ConnectionInfoTab.property28=\u6700\u5927Char\u6587\u5B57\u5217\u9577
 ConnectionInfoTab.property27=\u6700\u5927\u30D0\u30A4\u30CA\u30EA\u6587\u5B57\u5217\u9577
-GUIModificationQueryAction.TextDialog.TitleText=\u30AF\u30A8\u30EA\u3092\u7DE8\u96C6
 ConnectionInfoTab.property26=Open Statements Across Rollback\u306E\u30B5\u30DD\u30FC\u30C8
 ConnectionInfoTab.property25=\u30B3\u30DF\u30C3\u30C8\u51E6\u7406\u4E2D\u306E\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u30AA\u30FC\u30D7\u30F3\u306E\u30B5\u30DD\u30FC\u30C8
 ConnectionInfoTab.property24=\u30ED\u30FC\u30EB\u30D0\u30C3\u30AF\u51E6\u7406\u4E2D\u306E\u30AB\u30FC\u30BD\u30EB\u30AA\u30FC\u30D7\u30F3\u306E\u30B5\u30DD\u30FC\u30C8

i18n/plugins/org.talend.sqlbuilder.nl/src/main/java/messages_pt_BR.properties

@@ -3,7 +3,6 @@ AbstractDataSetTab.logMessage2=Erro ao criar ResultSetTab:
 AbstractDataSetTab.logMessage1=Exce\u00E7\u00E3o DataSetTab
 MultiPageSqlBuilderEditor.DesignerTab.Text=Designer
 MultiPageSqlBuilderEditor.ErrorInfo=Parse Sql argumento erro:
-GUIModificationQueryAction.ButtonText=Modificar a consulta usando editor gr\u00E1fico
 EditQueriesAction.textEditQueries=Editar consultas
 BuildInDBStructure.CurrentSchema=Esquema atual
 oracle.editor.actions.explain.createError.Title=Tabela n\u00E3o criada
@@ -196,7 +195,6 @@ ConnectionInfoTab.property74=Suporta Facilidade de Melhoramento de Integridade
 ConnectionInfoTab.property73=Suporta o SQL ANSI92 Completo
 ConnectionInfoTab.property72=Suporta ANSI92 \u00E0 N\u00EDvel Intermedi\u00E1rio
 ConnectionInfoTab.property71=Suporta SQL ANSI92 \u00E0 N\u00EDvel Entrada
-GUIModificationQueryAction.Dialog.TitleText=Modificar a consulta usando editor gr\u00E1fico
 ConnectionInfoTab.property70=Suporta Gram\u00E1tica Extendida SQL
 DatabaseDetailView.Tab.Preview.status=Contem vizualiza\u00E7\u00E3o para {0}
 DatabaseDetailView.Tab.ConnectionInfo.CommitOnClose=Commit e fecha
@@ -264,7 +262,6 @@ ConnectionInfoTab.logMessage1=Erro ao getMaxStatementLength
 ConnectionInfoTab.property29=Tam. M\u00E1x do nome da Coluna
 ConnectionInfoTab.property28=Tam. M\u00E1x. do Char Literal
 ConnectionInfoTab.property27=Tamanho m\u00E1ximo do Literal bin\u00E1rio
-GUIModificationQueryAction.TextDialog.TitleText=Modificar consulta
 ConnectionInfoTab.property26=Suporta Statement Aberto no Rollback
 ConnectionInfoTab.property25=Suporta Statement Aberto no Commit
 ConnectionInfoTab.property24=Suporta Cursor Aberto no Rollback

i18n/plugins/org.talend.sqlbuilder.nl/src/main/java/messages_ru.properties

@@ -289,7 +289,6 @@ ConnectionInfoTab.logMessage1=\u041E\u0448\u0438\u0431\u043A\u0430 \u0432 getMax
 ConnectionInfoTab.property29=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u0430\u044F \u0434\u043B\u0438\u043D\u0430 \u0438\u043C\u0435\u043D\u0438 \u043A\u043E\u043B\u043E\u043D\u043A\u0438
 ConnectionInfoTab.property28=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u0430\u044F \u0434\u043B\u0438\u043D\u0430 \u043B\u0438\u0442\u0435\u0440\u0430\u043B\u0430 \u0442\u0438\u043F\u0430 Char
 ConnectionInfoTab.property27=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u0430\u044F \u0434\u043B\u0438\u043D\u0430 \u0431\u0438\u043D\u0430\u0440\u043D\u043E\u0433\u043E \u043B\u0438\u0442\u0435\u0440\u0430\u043B\u0430
-GUIModificationQueryAction.TextDialog.TitleText=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0437\u0430\u043F\u0440\u043E\u0441
 ConnectionInfoTab.property26=\u041F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 Statements \u043F\u0440\u0438 Rollback
 ConnectionInfoTab.property25=\u041F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 Statements \u043F\u0440\u0438 Commit
 ConnectionInfoTab.property24=\u041F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 \u043A\u0443\u0440\u0441\u043E\u0440\u044B \u043F\u0440\u0438 Rollback

i18n/plugins/org.talend.sqlbuilder.nl/src/main/java/messages_zh_CN.properties

@@ -8,7 +8,6 @@ MultiPageSqlBuilderEditor.ErrorInfo=\u89E3\u6790SQL\u8BED\u53E5\u51FA\u9519\uFF1
 SQLResultsView.NoResults=\u6267\u884C\u4E00\u4E2A\u67E5\u8BE2\u663E\u793A\u7ED3\u679C...
 TableNode.logMessage4=\u65E0\u6CD5\u4E3A\u4EE5\u4E0B\u9879\u521B\u5EFA\u5B50\u8282\u70B9\uFF1A
 TableNode.logMessage3=\u4E0D\u80FD\u52A0\u8F7D\u4E3B\u952E\u540D
-GUIModificationQueryAction.ButtonText=\u56FE\u5F62\u754C\u9762\u4FEE\u6539\u67E5\u8BE2
 TableNode.logMessage2=\u4E0D\u80FD\u52A0\u8F7D\u5916\u952E\u540D
 TableNode.logMessage1=\u65E0\u6CD5\u52A0\u8F7D\u5217\u540D
 EditQueriesAction.textEditQueries=\u7F16\u8F91\u67E5\u8BE2
@@ -326,7 +325,6 @@ ConnectionInfoTab.property74=\u652F\u6301\u5B8C\u6574\u6027\u589E\u5F3A\u5DE5\u5
 ConnectionInfoTab.property73=\u652F\u6301 ANSI92 \u5168\u90E8 SQL
 ConnectionInfoTab.property72=\u652F\u6301 ANSI92 \u4E2D\u7EA7 SQL
 ConnectionInfoTab.property71=\u652F\u6301 ANSI92 \u5165\u95E8\u7EA7 SQL
-GUIModificationQueryAction.Dialog.TitleText=\u56FE\u5F62\u754C\u9762\u4FEE\u6539\u67E5\u8BE2
 ConnectionInfoTab.property70=\u652F\u6301\u6269\u5C55 SQL \u8BED\u6CD5
 DatabaseDetailView.Tab.Preview.status={0}\u7684\u5185\u5BB9\u9884\u89C8\u3002
 DatabaseDetailView.Tab.ConnectionInfo.CommitOnClose=\u5173\u95ED\u65F6\u63D0\u4EA4
@@ -413,7 +411,6 @@ DictionaryLoader.teseedOk=\u6D4B\u8BD5\u786E\u5B9A
 ConnectionInfoTab.property29=\u6700\u5927\u5217\u540D\u957F\u5EA6
 ConnectionInfoTab.property28=\u6700\u5927\u5B57\u7B26\u6587\u5B57\u957F\u5EA6
 ConnectionInfoTab.property27=\u6700\u5927\u4E8C\u8FDB\u5236\u6587\u5B57\u957F\u5EA6
-GUIModificationQueryAction.TextDialog.TitleText=\u6587\u672C\u4FEE\u6539\u67E5\u8BE2
 ConnectionInfoTab.property26=\u652F\u6301\u6253\u5F00\u8BED\u53E5\u56DE\u6EDA
 ConnectionInfoTab.property25=\u652F\u6301\u6253\u5F00\u8BED\u53E5\u63D0\u4EA4
 ConnectionInfoTab.property24=\u652F\u6301\u6253\u5F00\u9F20\u6807\u56DE\u6EDA

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.feature</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.feature</artifactId>

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>7.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.fragment.jars.di.feature</artifactId>

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

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

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.feature</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.rcp.branding.tos.test.feature</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.repository.feature</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.sbi.feature</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.spagic.feature</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.components.feature</artifactId>

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>7.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.core.feature</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.feature</artifactId>

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

@@ -7,7 +7,7 @@
   <requires>
     <import feature="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature" version="0.0.0" match="greaterOrEqual"/>
     <import feature="org.talend.libraries.jdbc.feature" version="0.0.0" match="greaterOrEqual"/>
-    <import plugin="org.apache.commons.beanutils" version="0.0.0" match="greaterOrEqual"/>
+    <import plugin="org.apache.commons.commons-beanutils" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.commons.httpclient" version="0.0.0" match="greaterOrEqual"/>
     <import plugin="org.apache.commons.logging" version="1.2.0" match="greaterOrEqual"/>
     <import plugin="org.eclipse.nebula.widgets.nattable.core" version="0.0.0" match="greaterOrEqual"/>
@@ -20,11 +20,9 @@
   <plugin id="org.talend.libraries.apache.chemistry" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.apache.common" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.apache.cxf" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.apache.google" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.apache.http" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.apache.lucene" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.apache.xml" download-size="0" install-size="0" version="0.0.0"/>
-  <plugin id="org.talend.libraries.asm" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.crm" download-size="0" install-size="0" version="0.0.0"/>
   <plugin id="org.talend.libraries.css" download-size="0" install-size="0" version="0.0.0"/>
   <plugin download-size="0" install-size="0" version="0.0.0" unpack="false" id="org.talend.libraries.csv"/>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.tos.libraries.feature</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.abstractmap</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.alfrescooutput</artifactId>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.business.diagram</artifactId>

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

@@ -50,8 +50,11 @@ List<IConnection> allSubProcessConnection = codeGenArgument.getAllMainSubTreeCon
 String cid = node.getUniqueName();
 
 List<? extends INode> jobCatcherNodes = process.getNodesOfType("tJobStructureCatcher");
-boolean enableLogStash = jobCatcherNodes != null && !jobCatcherNodes.isEmpty();
-boolean logstashCurrent = !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend") && enableLogStash;
+boolean jobCatcherExists = jobCatcherNodes != null && !jobCatcherNodes.isEmpty();
+INode jobCatcherNode = jobCatcherExists ? jobCatcherNodes.get(0) : null;
+
+boolean enableLogStash = !Boolean.getBoolean("deactivate_extended_component_log") && jobCatcherExists;
+boolean logstashCurrent = enableLogStash && !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend");
 
 if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
 	boolean iterateInVFComp = (node.getVirtualLinkTo() != null && node.getVirtualLinkTo() == EConnectionType.ITERATE);
@@ -86,11 +89,18 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
 			for(IConnection con:connSet){
 		  		INode source = con.getSource();
 				String sourceNodeId = source.getUniqueName();
+				
+				String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+				String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel);
+				
+				String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+				String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel);
+				
 				String sourceNodeComponent = source.getComponent().getName();
 	 			for (INode jobStructureCatcher : jobCatcherNodes) {
 	 			%>
 			 		if(runStat.updateStatAndLog(execStat,enableLogStash,resourceMap,iterateId,"<%=con.getUniqueName()%>",2,0,
-			 			<%=jobStructureCatcher.getUniqueName()%>,"<%=sourceNodeId%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
+			 			"<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
 						<%=jobStructureCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 					}
 				<%
@@ -113,11 +123,18 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
 			  	for(IConnection con:connSet){
 			  		INode source = con.getSource();
 					String sourceNodeId = source.getUniqueName();
+					
+					String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+					String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel);
+					
+					String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+					String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel);
+					
 					String sourceNodeComponent = source.getComponent().getName();
 		 			for (INode jobStructureCatcher : jobCatcherNodes) {
 		 			%>
 				 		if(runStat.log(resourceMap,iterateId,"<%=con.getUniqueName()%>",2,0,
-				 			<%=jobStructureCatcher.getUniqueName()%>,"<%=sourceNodeId%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
+				 			"<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>","<%="REJECT".equals(con.getConnectorName()) ? "reject" : "output"%>")) {
 							<%=jobStructureCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 						}
 					<%
@@ -150,6 +167,7 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
     }
    }
   }
+  
   List<IMetadataTable> metadatas = node.getMetadataList();
   if ((!node.isSubProcessStart())&&(NodeUtil.isDataAutoPropagated(node))) {
    if (inputColName!=null) {
@@ -175,6 +193,117 @@ if((codePart.equals(ECodePart.END))&&(stat || logstashCurrent)){
     }
    }
   }
+  
+  //log runtime lineage
+  boolean enable_runtime_lineage_log = NodeUtil.isJobUsingRuntimeLineage(process) && jobCatcherExists && !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend");
+  if(enable_runtime_lineage_log) {//}
+  
+  List<? extends IConnection> outConns = node.getOutgoingConnections();
+  if(!outConns.isEmpty()) {
+  %>
+  if(tos_count_<%=node.getUniqueName() %> == 0) {
+  <%
+  //}
+  }
+  
+  for (IConnection conn : outConns) {
+      if(!conn.getLineStyle().equals(EConnectionType.FLOW_MAIN) && !conn.getLineStyle().equals(EConnectionType.FLOW_MERGE) && !conn.getLineStyle().equals(EConnectionType.FLOW_REF)) {
+          continue;
+      }
+      
+      IMetadataTable metadata = conn.getMetadataTable();
+      if (metadata==null) {
+          continue;
+      }
+      
+      List<IMetadataColumn> columns = metadata.getListColumns();
+      
+      if(columns == null || columns.isEmpty()) {
+          continue;
+      }
+      
+      %>
+      
+      class SchemaUtil_<%=conn.getUniqueName()%>_<%=conn.getMetadataTable().getTableName()%> {
+          
+          public java.util.List<java.util.Map<String, String>> getSchema(final <%=NodeUtil.getPrivateConnClassName(conn) %>Struct <%=conn.getName()%>) {
+              java.util.List<java.util.Map<String, String>> schema = new java.util.ArrayList<>();
+              if(<%=conn.getName()%> == null) {
+            	  return schema;
+              }
+              java.util.Map<String, String> field = null;
+          <%
+          for(IMetadataColumn column : columns){
+              if("id_Dynamic".equals(column.getTalendType())) {
+              %>
+              routines.system.Dynamic dynamic = <%=conn.getName()%>.<%=column.getLabel()%>;
+              if(dynamic != null) {
+                  for(routines.system.DynamicMetadata metadata :  dynamic.metadatas) {
+                      field = new java.util.HashMap<>();
+                      field.put("name", metadata.getName());
+                      field.put("origin_name", metadata.getDbName());
+                      field.put("iskey", "" + metadata.isKey());
+                      field.put("talend_type", metadata.getType());
+                      field.put("type", metadata.getDbType());
+                      field.put("nullable", "" + metadata.isNullable());
+                      field.put("pattern", metadata.getFormat());
+                      field.put("length", "" + metadata.getLength());
+                      field.put("precision", "" + metadata.getPrecision());
+                      schema.add(field);
+                  }
+              }
+              
+              <%
+                  continue;
+              }
+              
+              String pattern = column.getPattern();
+              if(pattern == null || pattern.isEmpty() || pattern.equals("\"\"")) {
+                  pattern = "\"\"";
+              }
+              %>
+              field = new java.util.HashMap<>();
+              field.put("name", "<%=column.getLabel()%>");
+              field.put("origin_name", "<%=column.getOriginalDbColumnName()%>");
+              field.put("iskey", "<%=column.isKey()%>");
+              field.put("talend_type", "<%=column.getTalendType()%>");
+              field.put("type", "<%=column.getType()%>");
+              field.put("nullable", "<%=column.isNullable()%>");
+              field.put("pattern", <%=pattern%>);
+              field.put("length", "<%=column.getLength()%>");
+              field.put("precision", "<%=column.getPrecision()%>");
+              schema.add(field);
+          <%
+          }
+          %>
+              return schema;
+          }
+          
+      }
+      
+      java.util.List<java.util.Map<String, String>> schema_<%=conn.getUniqueName()%>_<%=conn.getMetadataTable().getTableName()%> = new SchemaUtil_<%=conn.getUniqueName()%>_<%=conn.getMetadataTable().getTableName()%>().getSchema(<%=conn.getName()%>);
+      <%
+      INode target = conn.getTarget();
+      String targetNodeId = target.getUniqueName();
+      String targetNodeComponent = target.getComponent().getName();
+      
+      %>
+      <%=jobCatcherNode.getUniqueName()%>.addConnectionSchemaMessage("<%=node.getUniqueName()%>","<%=node.getComponent().getName()%>", 
+        "<%=targetNodeId%>","<%=targetNodeComponent%>", "<%=conn.getUniqueName()%>" + iterateId, schema_<%=conn.getUniqueName()%>_<%=conn.getMetadataTable().getTableName()%>);
+      <%=jobCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
+      <%
+  }
+  
+  if(!outConns.isEmpty()) {
+  //{
+  %>
+  }
+  <%
+  }
+  
+  //{
+  }
+
 //======================================TDI-17183 end=====================================
   boolean traceCodeGenerated = false;     
   for (IConnection conn : node.getOutgoingConnections()) {

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

@@ -8,6 +8,9 @@
 		org.talend.core.model.metadata.IMetadataColumn 
 		org.talend.core.model.process.EConnectionType 
         org.talend.core.model.process.ElementParameterParser
+        org.talend.core.model.process.EParameterFieldType
+        org.talend.designer.core.model.components.EParameterName
+        org.talend.designer.core.model.components.ElementParameter
 		org.talend.designer.codegen.config.CodeGeneratorArgument
 		org.talend.core.model.utils.NodeUtil
 		org.talend.core.model.process.IConnectionCategory
@@ -140,10 +143,17 @@
 	connSet.addAll(node.getIncomingConnections(EConnectionType.FLOW_MAIN));
 	connSet.addAll(node.getIncomingConnections(EConnectionType.FLOW_MERGE));
 	
-	List<? extends INode> jobCatcherNodes = node.getProcess().getNodesOfType("tJobStructureCatcher");
-	boolean enableLogStash = jobCatcherNodes != null && !jobCatcherNodes.isEmpty();
 	String cid = node.getUniqueName();
-	boolean logstashCurrent = !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend") && enableLogStash;
+	
+	List<? extends INode> jobCatcherNodes = node.getProcess().getNodesOfType("tJobStructureCatcher");
+	boolean jobCatcherExists = jobCatcherNodes != null && !jobCatcherNodes.isEmpty();
+	INode jobCatcherNode = jobCatcherExists ? jobCatcherNodes.get(0) : null;
+	
+	boolean enableLogStash = !Boolean.getBoolean("deactivate_extended_component_log") && jobCatcherExists;
+	boolean logstashCurrent = enableLogStash && !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend");
+	
+	//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 ((codePart.equals(ECodePart.BEGIN))&&(stat || logstashCurrent)&&connSet.size()>0) {
 		if(containsTPartitioner) {
@@ -181,13 +191,35 @@
 		if(!node.getComponent().useMerge()) {
 			if(stat && logstashCurrent) {
 			%>
-			runStat.updateStatAndLog(execStat,enableLogStash,iterateId,1,1<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+			if(runStat.update(execStat,enableLogStash,iterateId,1,1
+				<%for(IConnection con : connSet){
+					INode source = con.getSource();
+					String sourceNodeId = source.getUniqueName();
+					
+					String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+					String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel);
+					
+					String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+					String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel);
+					
+					String sourceNodeComponent = source.getComponent().getName();
+				%>
+					,"<%=con.getUniqueName()%>","<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>"
+				<%}%>
+			)) {
+				<%=subprocessName4Catcher %>Process(globalMap);
+			}
 			<%
 			} else {
 				if(stat) {
 					%>
 					if(execStat){
-						runStat.updateStatOnConnection(iterateId,1,1<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+						runStat.updateStatOnConnection(iterateId,1,1
+						<%for(IConnection con : connSet){
+						%>
+							,"<%=con.getUniqueName()%>"
+						<%}%>
+						);
 					}
 					<%
 				}
@@ -195,7 +227,24 @@
 				if(logstashCurrent) {
 					%>
 					if(enableLogStash) {
-						runStat.log(iterateId,1,1<%for(IConnection con : connSet){%>,"<%=con.getUniqueName()%>"<%}%>);
+						if(runStat.updateLog(iterateId,1,1
+						<%for(IConnection con : connSet){
+							INode source = con.getSource();
+							String sourceNodeId = source.getUniqueName();
+							
+							String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+							String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel);
+							
+							String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+							String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel);
+							
+							String sourceNodeComponent = source.getComponent().getName();
+						%>
+							,"<%=con.getUniqueName()%>","<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>"
+						<%}%>
+						)) {
+							<%=subprocessName4Catcher %>Process(globalMap);
+						}
 					}
 					<%
 				}
@@ -205,18 +254,62 @@
 				if(connection.getUniqueName().equals((String)codeGenArgument.getIncomingName())){
 					if(stat && logstashCurrent) {
 					%>
-					runStat.updateStatAndLog(execStat,enableLogStash,iterateId,1,1<%for(IConnection con : connSet){if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>,"<%=con.getUniqueName()%>"<%}}%>);
+					if(runStat.update(execStat,enableLogStash,iterateId,1,1
+						<%for(IConnection con : connSet){
+							INode source = con.getSource();
+							String sourceNodeId = source.getUniqueName();
+							
+							String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+							String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel);
+							
+							String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+							String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel);
+							
+							String sourceNodeComponent = source.getComponent().getName();
+							
+							if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>
+							,"<%=con.getUniqueName()%>","<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>"
+							<%}
+						}%>
+					)) {
+						<%=subprocessName4Catcher %>Process(globalMap);
+					}
 					<%
 					} else {
 						if(stat) {%>
 						if(execStat){
-							runStat.updateStatOnConnection(iterateId,1,1<%for(IConnection con : connSet){if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>,"<%=con.getUniqueName()%>"<%}}%>);
+							runStat.updateStatOnConnection(iterateId,1,1
+								<%for(IConnection con : connSet){
+									if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>
+									,"<%=con.getUniqueName()%>"
+									<%}
+								}%>
+							);
 						}
 						<%}
 						
 						if(logstashCurrent) {%>
 						if(enableLogStash) {
-							runStat.log(iterateId,1,1<%for(IConnection con : connSet){if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>,"<%=con.getUniqueName()%>"<%}}%>);
+							if(runStat.updateLog(iterateId,1,1
+								<%for(IConnection con : connSet){
+									INode source = con.getSource();
+									String sourceNodeId = source.getUniqueName();
+									
+									String sourceLabel = ElementParameterParser.getValue(source, "__LABEL__");
+									String sourceNodeLabel = ((sourceLabel==null || "__UNIQUE_NAME__".equals(sourceLabel) || sourceLabel.contains("\"")) ? sourceNodeId : sourceLabel);
+									
+									String targetLabel = ElementParameterParser.getValue(node, "__LABEL__");
+									String targetNodeLabel = ((targetLabel==null || "__UNIQUE_NAME__".equals(targetLabel) || targetLabel.contains("\"")) ? node.getUniqueName() : targetLabel);
+							
+									String sourceNodeComponent = source.getComponent().getName();
+							
+									if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){%>
+									,"<%=con.getUniqueName()%>","<%=sourceNodeId%>","<%=sourceNodeLabel%>","<%=sourceNodeComponent%>","<%=node.getUniqueName()%>","<%=targetNodeLabel%>","<%=node.getComponent().getName()%>"
+									<%}
+								}%>
+							)) {
+								<%=subprocessName4Catcher %>Process(globalMap);
+							}
 						}
 						<%}
 					}
@@ -245,12 +338,107 @@
 		<%
 		log.startWork();
 		log.logCompSetting();
+		boolean enable_runtime_lineage_log = NodeUtil.isJobUsingRuntimeLineage(node.getProcess()) && jobCatcherExists && !cid.startsWith("tJobStructureCatcher") && !cid.startsWith("talend");
+		if(enable_runtime_lineage_log) {
+		%>
+		class ParameterUtil_<%=cid%>{
+		
+            public java.util.Map<String, String> getParameter() throws Exception{
+                java.util.Map<String, String> component_parameters = new java.util.HashMap<>();
+                <%
+                java.util.Set<org.talend.core.model.process.EParameterFieldType> ignoredParamsTypes = new java.util.HashSet<org.talend.core.model.process.EParameterFieldType>(); 
+                ignoredParamsTypes.addAll(
+                    java.util.Arrays.asList(
+                        org.talend.core.model.process.EParameterFieldType.SCHEMA_TYPE,
+                        org.talend.core.model.process.EParameterFieldType.SCHEMA_REFERENCE,
+                        org.talend.core.model.process.EParameterFieldType.LABEL,
+                        org.talend.core.model.process.EParameterFieldType.EXTERNAL,
+                        org.talend.core.model.process.EParameterFieldType.MAPPING_TYPE,
+                        org.talend.core.model.process.EParameterFieldType.IMAGE,
+                        org.talend.core.model.process.EParameterFieldType.TNS_EDITOR,
+                        org.talend.core.model.process.EParameterFieldType.WSDL2JAVA,
+                        org.talend.core.model.process.EParameterFieldType.GENERATEGRAMMARCONTROLLER,
+                        org.talend.core.model.process.EParameterFieldType.GENERATE_SURVIVORSHIP_RULES_CONTROLLER,
+                        org.talend.core.model.process.EParameterFieldType.REFRESH_REPORTS,
+                        org.talend.core.model.process.EParameterFieldType.BROWSE_REPORTS,
+                        org.talend.core.model.process.EParameterFieldType.PALO_DIM_SELECTION,
+                        org.talend.core.model.process.EParameterFieldType.GUESS_SCHEMA,
+                        org.talend.core.model.process.EParameterFieldType.MATCH_RULE_IMEX_CONTROLLER,
+                        org.talend.core.model.process.EParameterFieldType.MEMO_PERL,
+                        org.talend.core.model.process.EParameterFieldType.DBTYPE_LIST,
+                        org.talend.core.model.process.EParameterFieldType.VERSION,
+                        org.talend.core.model.process.EParameterFieldType.TECHNICAL,
+                        org.talend.core.model.process.EParameterFieldType.ICON_SELECTION,
+                        org.talend.core.model.process.EParameterFieldType.JAVA_COMMAND,
+                        org.talend.core.model.process.EParameterFieldType.TREE_TABLE,
+                        org.talend.core.model.process.EParameterFieldType.VALIDATION_RULE_TYPE,
+                        org.talend.core.model.process.EParameterFieldType.DCSCHEMA,
+                        org.talend.core.model.process.EParameterFieldType.SURVIVOR_RELATION,
+                        org.talend.core.model.process.EParameterFieldType.REST_RESPONSE_SCHEMA_TYPE,
+                        org.talend.core.model.process.EParameterFieldType.BUTTON
+                        )
+                );
+                for(org.talend.core.model.process.IElementParameter ep : org.talend.core.model.utils.NodeUtil.getDisplayedParameters(node)){
+                    if(!ep.isLog4JEnabled() || ignoredParamsTypes.contains(ep.getFieldType())){
+                        continue;
+                    }
+                    
+                    ElementParameter p = (ElementParameter)ep;
+                    Object pluginValue = p.getTaggedValue("org.talend.sdk.component.source");
+                    if(pluginValue != null && String.class.cast(pluginValue).equalsIgnoreCase("tacokit")) {
+                        try {
+                            if (!(Boolean) org.talend.core.runtime.IAdditionalInfo.class.cast(p).func("isPersisted")) {
+                                continue;
+                            }
+                        } catch (Exception ex) {
+                            //do nothing
+                        }
+                        
+                        %>
+                        <%@ include file="./tacokit_runtime_log.javajet"%>
+                        <%
+                        
+                        continue;
+                    }
+                    
+                    String name = ep.getName();
+                    java.util.Set<String> ignoredParamsNames = new java.util.HashSet<String>();
+                    ignoredParamsNames.add("SQLPATTERN_VALUE");
+                    ignoredParamsNames.add("ADDITIONAL_INSERT_COLUMNS");
+                    ignoredParamsNames.add("ADDITIONAL_UPDATE_COLUMNS");
+                    ignoredParamsNames.add("SELECTION_TABLE");
+                    ignoredParamsNames.add("DIFFER_MESSAGE");
+                    ignoredParamsNames.add("NO_DIFFER_MESSAGE");
+                    
+                    if(ignoredParamsNames.contains(name)) {
+                        //do nothing
+                    } else if(org.talend.core.model.process.EParameterFieldType.PASSWORD.equals(ep.getFieldType())){
+                        //not log password
+                    }else{
+                        String value = org.talend.core.model.utils.NodeUtil.getRuntimeParameterValue(node, ep);
+                        %>
+                        component_parameters.put("<%=name%>", String.valueOf(<%=value%>));
+                    <%
+                    }
+                }
+                %>
+                return component_parameters;
+            }
+        }
+        
+        <%=jobCatcherNode.getUniqueName()%>.addComponentParameterMessage("<%=node.getUniqueName()%>", "<%=node.getComponent().getName()%>",
+          new ParameterUtil_<%=cid%>().getParameter());
+        <%=jobCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
+		<%
+		}
 		
 		if(logstashCurrent) {
 			for (INode jobStructureCatcher : jobCatcherNodes) {
+				String label = ElementParameterParser.getValue(node, "__LABEL__");
+				String nodeLabel = ((label==null || "__UNIQUE_NAME__".equals(label) || label.contains("\"")) ? node.getUniqueName() : label);
 			%>
 			if(enableLogStash) {
-				<%=jobStructureCatcher.getUniqueName() %>.addCM("<%=node.getUniqueName()%>", "<%=node.getComponent().getName()%>");
+				<%=jobStructureCatcher.getUniqueName() %>.addCM("<%=node.getUniqueName()%>", "<%=nodeLabel%>", "<%=node.getComponent().getName()%>");
 				<%=jobStructureCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 			}
 			<%

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

@@ -24,6 +24,7 @@
         org.talend.core.model.process.ProcessUtils
         org.talend.core.model.components.IComponent
         org.talend.core.model.components.EComponentType
+        org.talend.core.model.utils.NodeUtil
     "
     class="Footer"
     skeleton="footer_java.skeleton"
@@ -275,7 +276,7 @@
     }
 %>
 
-    private PropertiesWithType context_param = new PropertiesWithType();
+    protected PropertiesWithType context_param = new PropertiesWithType();
     public java.util.Map<String, Object> parentContextMap = new java.util.HashMap<String, Object>();
 
     public String status= "";
@@ -464,7 +465,7 @@
                 lastStr = "";
             }
         }
-        enableLogStash = "true".equalsIgnoreCase(System.getProperty("monitoring"));
+        enableLogStash = "true".equalsIgnoreCase(System.getProperty("audit.enabled"));
 
         <%if(isLog4jEnabled){%>
 	        if(!"".equals(log4jLevel)){
@@ -518,8 +519,63 @@
 				break;
 			}
 		}
-    	if(jobCatcherNode!=null) {
-    		String location = ElementParameterParser.getValue(jobCatcherNode, "__LOCATION__");
+		
+		boolean enableLogStash = !Boolean.getBoolean("deactivate_extended_component_log") && (jobCatcherNode!=null);
+		boolean enable_runtime_lineage_log = NodeUtil.isJobUsingRuntimeLineage(process) && (jobCatcherNode!=null);
+		if(enable_runtime_lineage_log) {
+		%>
+			java.util.Properties p_<%=jobCatcherNode.getUniqueName()%> = new java.util.Properties();
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("root.logger", "runtime");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("encoding", "UTF-8");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("application.name", "Talend Studio");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("service.name", "Talend Studio Job");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("instance.name", "Talend Studio Job Instance");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("propagate.appender.exceptions", "none");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("log.appender", "file");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("appender.file.path", "runtime.json");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("appender.file.maxsize", "52428800");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("appender.file.maxbackup", "20");
+			p_<%=jobCatcherNode.getUniqueName()%>.setProperty("host", "false");
+			
+			final String runtime_dir_<%=jobCatcherNode.getUniqueName()%> = System.getProperty("runtime.lineage.outputpath");
+			final String runtime_path_<%=jobCatcherNode.getUniqueName()%> = System.getProperty("runtime.lineage.appender.file.path");
+			if(runtime_path_<%=jobCatcherNode.getUniqueName()%>==null || runtime_path_<%=jobCatcherNode.getUniqueName()%>.isEmpty()) {
+				if(runtime_dir_<%=jobCatcherNode.getUniqueName()%>!=null && !runtime_dir_<%=jobCatcherNode.getUniqueName()%>.isEmpty()) {
+					System.setProperty("runtime.lineage.appender.file.path", 
+						new StringBuilder().append(runtime_dir_<%=jobCatcherNode.getUniqueName()%>)
+						.append((runtime_dir_<%=jobCatcherNode.getUniqueName()%>.endsWith("/") || runtime_dir_<%=jobCatcherNode.getUniqueName()%>.endsWith("\\")) ? "" : java.io.File.separator)
+						.append(projectName)
+						.append(java.io.File.separatorChar)
+						.append(jobName)
+						.append(java.io.File.separatorChar)
+						.append(jobVersion)
+						.append(java.io.File.separatorChar)
+						.append("runtime_log_")
+						.append(new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(new java.util.Date()))
+						.append(".json")
+						.toString()
+					);
+				}
+			}
+			
+			System.getProperties().stringPropertyNames().stream()
+					.filter(it -> it.startsWith("runtime.lineage.") && !"runtime.lineage.outputpath".equals(it))
+					.forEach(key -> p_<%=jobCatcherNode.getUniqueName()%>.setProperty(key.substring("runtime.lineage.".length()), System.getProperty(key)));
+			
+			<%if(isLog4j1Enabled) {%>
+			org.apache.log4j.Logger.getLogger(p_<%=jobCatcherNode.getUniqueName()%>.getProperty("root.logger")).setLevel(org.apache.log4j.Level.DEBUG);
+			<%}%>
+			
+			<%if(isLog4j2Enabled) {%>
+			org.apache.logging.log4j.core.config.Configurator.setLevel(p_<%=jobCatcherNode.getUniqueName()%>.getProperty("root.logger"), org.apache.logging.log4j.Level.DEBUG);
+			<%}%>
+			
+			runtime_lineage_logger_<%=jobCatcherNode.getUniqueName()%> = org.talend.job.audit.JobEventAuditLoggerFactory.createJobAuditLogger(p_<%=jobCatcherNode.getUniqueName()%>);
+		<%
+		}
+		
+		if(enableLogStash) {
+			String location = ElementParameterParser.getValue(jobCatcherNode, "__LOCATION__");
 		%>
 			if(enableLogStash) {
 				java.util.Properties properties_<%=jobCatcherNode.getUniqueName()%> = new java.util.Properties();
@@ -536,21 +592,21 @@
 				properties_<%=jobCatcherNode.getUniqueName()%>.setProperty("host", "false");
 
 				System.getProperties().stringPropertyNames().stream()
-					.filter(it -> it.startsWith("monitoring.audit.logger.properties."))
-					.forEach(key -> properties_<%=jobCatcherNode.getUniqueName()%>.setProperty(key.substring("monitoring.audit.logger.properties.".length()), System.getProperty(key)));
+					.filter(it -> it.startsWith("audit.logger."))
+					.forEach(key -> properties_<%=jobCatcherNode.getUniqueName()%>.setProperty(key.substring("audit.logger.".length()), System.getProperty(key)));
 
 				<%if(isLog4j1Enabled) {%>
-				org.apache.log4j.Logger.getLogger("audit").setLevel(org.apache.log4j.Level.DEBUG);
+				org.apache.log4j.Logger.getLogger(properties_<%=jobCatcherNode.getUniqueName()%>.getProperty("root.logger")).setLevel(org.apache.log4j.Level.DEBUG);
 				<%}%>
 				
 				<%if(isLog4j2Enabled) {%>
-				org.apache.logging.log4j.core.config.Configurator.setLevel("audit", org.apache.logging.log4j.Level.DEBUG);
+				org.apache.logging.log4j.core.config.Configurator.setLevel(properties_<%=jobCatcherNode.getUniqueName()%>.getProperty("root.logger"), org.apache.logging.log4j.Level.DEBUG);
 				<%}%>
 				auditLogger_<%=jobCatcherNode.getUniqueName()%> = org.talend.job.audit.JobEventAuditLoggerFactory.createJobAuditLogger(properties_<%=jobCatcherNode.getUniqueName()%>);
 			}
 		<%
 		}
-    	%>
+		%>
 
         if(clientHost == null) {
             clientHost = defaultClientHost;
@@ -660,39 +716,47 @@
                                     } catch (java.lang.RuntimeException e) {
                                         //do nothing
                                     }
+                                } else {
+                                    context.<%=ctxParam.getName()%> = pwd_<%=ctxParam.getName()%>_value;
+                                    context.put("<%=ctxParam.getName()%>",context.<%=ctxParam.getName()%>);
                                 }
                             }
 <%
                         } else if(typeToGenerate.equals("java.util.Date")) {
 %>
-                        try{
                             String context_<%=ctxParam.getName()%>_value = context.getProperty("<%=ctxParam.getName()%>");
-                            if (context_<%=ctxParam.getName()%>_value == null){
-                                context_<%=ctxParam.getName()%>_value = "";
-                            }
-                            int context_<%=ctxParam.getName()%>_pos = context_<%=ctxParam.getName()%>_value.indexOf(";");
-                            String context_<%=ctxParam.getName()%>_pattern =  "yyyy-MM-dd HH:mm:ss";
-                            if(context_<%=ctxParam.getName()%>_pos > -1){
-                                context_<%=ctxParam.getName()%>_pattern = context_<%=ctxParam.getName()%>_value.substring(0, context_<%=ctxParam.getName()%>_pos);
-                                context_<%=ctxParam.getName()%>_value = context_<%=ctxParam.getName()%>_value.substring(context_<%=ctxParam.getName()%>_pos + 1);
-                            }
+                            try{
+                                if (context_<%=ctxParam.getName()%>_value == null){
+                                    context_<%=ctxParam.getName()%>_value = "";
+                                }
+                                int context_<%=ctxParam.getName()%>_pos = context_<%=ctxParam.getName()%>_value.indexOf(";");
+                                String context_<%=ctxParam.getName()%>_pattern =  "yyyy-MM-dd HH:mm:ss";
+                                if(context_<%=ctxParam.getName()%>_pos > -1){
+                                    context_<%=ctxParam.getName()%>_pattern = context_<%=ctxParam.getName()%>_value.substring(0, context_<%=ctxParam.getName()%>_pos);
+                                    context_<%=ctxParam.getName()%>_value = context_<%=ctxParam.getName()%>_value.substring(context_<%=ctxParam.getName()%>_pos + 1);
+                                }
 
-                            context.<%=ctxParam.getName()%>=(java.util.Date)(new java.text.SimpleDateFormat(context_<%=ctxParam.getName()%>_pattern).parse(context_<%=ctxParam.getName()%>_value));
+                                context.<%=ctxParam.getName()%>=(java.util.Date)(new java.text.SimpleDateFormat(context_<%=ctxParam.getName()%>_pattern).parse(context_<%=ctxParam.getName()%>_value));
 
-                        } catch(ParseException e) {
+                            } catch(ParseException e) {
+                                try { <% /*try to check if date passed as long also*/ %>
+                                    long context_<%=ctxParam.getName()%>_longValue = Long.valueOf(context_<%=ctxParam.getName()%>_value);
+                                    context.<%=ctxParam.getName()%> = new java.util.Date(context_<%=ctxParam.getName()%>_longValue);
+                                } catch (NumberFormatException cantParseToLongException) {
 <%
-                            if (isLog4jEnabled) {
+                                    if (isLog4jEnabled) {
 %>
-                                log.warn(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
+                                        log.warn(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", "Can't parse date string: " + e.getMessage() + " and long: " + cantParseToLongException.getMessage()));
 <%
-                            } else {
+                                    } else {
 %>
-                                System.err.println(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", e.getMessage()));
+                                        System.err.println(String.format("<%=warningMessageFormat %>", "<%=ctxParam.getName() %>", "Can't parse date string: " + e.getMessage() + " and long: " + cantParseToLongException.getMessage()));
 <%
+                                    }
+%>
+                                    context.<%=ctxParam.getName()%>=null;
+                                }
                             }
-%>
-                            context.<%=ctxParam.getName()%>=null;
-                        }
 <%
                         } else if(typeToGenerate.equals("Object")||typeToGenerate.equals("String")||typeToGenerate.equals("java.lang.String")) {
 %>
@@ -926,10 +990,12 @@ this.globalResumeTicket = true;//to run tPreJob
 // run tHadoopConfManager component if there is it.
  if(!hadoopConfNodes.isEmpty()) {
     INode hadoopConfNode = hadoopConfNodes.get(0);
+    if (hadoopConfNode.isStart()) {
 %>
 <%=createCallProcess(hadoopConfNode, className, false) %>
 <%
  }
+ }
 %>
 
 <%
@@ -944,7 +1010,7 @@ this.globalResumeTicket = true;//to run tPreJob
 <%
         }
         
-        if(jobCatcherNode!=null) {
+        if(enableLogStash) {
 %>
 		if(enableLogStash) {
 	        <%=jobCatcherNode.getUniqueName() %>.addJobStartMessage();
@@ -1097,7 +1163,7 @@ this.globalResumeTicket = true;//to run tPostJob
 <%
     }
     
-    if(jobCatcherNode!=null) {
+    if(enableLogStash) {
 %>
 		if(enableLogStash) {
 	        <%=jobCatcherNode.getUniqueName() %>.addJobEndMessage(startTime, end, status);
@@ -1136,6 +1202,24 @@ if (execStat) {
     }
 %>
     int returnCode = 0;
+
+<%
+    if (isRunInMultiThread) {
+%>
+        Integer localErrorCode = (Integer)(((java.util.Map)threadLocal.get()).get("errorCode"));
+        String localStatus = (String)(((java.util.Map)threadLocal.get()).get("status"));
+        if (localErrorCode != null) {
+            if (errorCode == null || localErrorCode.compareTo(errorCode) > 0) {
+                   errorCode = localErrorCode;
+            }
+        }
+        if (localStatus != null && !status.equals("failure")){
+            status = localStatus;
+        }
+<%
+    }
+%>
+
     if(errorCode == null) {
          returnCode = status != null && status.equals("failure") ? 1 : 0;
     } else {
@@ -1343,13 +1427,11 @@ if (execStat) {
             } else {
                 type = "ftp";
             }
-            if ("ftp".equals(type)) { %>
-                ((com.enterprisedt.net.ftp.FTPClient) obj_conn).quit();
-        <%} else if ("sftp".equals(type)) { %>
+            if ("sftp".equals(type)) { %>
                 ((com.jcraft.jsch.ChannelSftp) obj_conn).quit();
-        <%} else { %>
-                ((org.apache.commons.net.ftp.FTPSClient) obj_conn).disconnect();
-        <%}%>
+            <%} else { %>
+                ((org.apache.commons.net.ftp.FTPClient) obj_conn).disconnect();
+            <%}%>
             }
 <%  } %>
         } catch (java.lang.Exception e) {
@@ -1439,11 +1521,24 @@ if (execStat) {
     private void closeGSConnections() {
         try {
 <%    for (INode gsComponent : gsComponentsList) { %>
-		org.jets3t.service.impl.rest.httpclient.GoogleStorageService service_<%=gsComponent.getUniqueName()%> =
-				(org.jets3t.service.impl.rest.httpclient.GoogleStorageService)globalMap.get("service_<%=gsComponent.getUniqueName()%>");
-		if(service_<%=gsComponent.getUniqueName()%> !=null){
-				service_<%=gsComponent.getUniqueName()%>.shutdown();
-	    }
+
+    <%
+    String authType = ElementParameterParser.getValue(gsComponent, "__AUTH_TYPE__");
+    if (authType.equals("USER_ACCOUNT_HMAC")){
+    %>
+
+    org.jets3t.service.impl.rest.httpclient.GoogleStorageService service_<%=gsComponent.getUniqueName()%> =
+            (org.jets3t.service.impl.rest.httpclient.GoogleStorageService)globalMap.get("service_<%=gsComponent.getUniqueName()%>");
+    if(service_<%=gsComponent.getUniqueName()%> !=null){
+            service_<%=gsComponent.getUniqueName()%>.shutdown();
+    }
+    <%
+    } else if (authType.equals("SERVICE_ACCOUNT")) {
+    %>
+        //Don't need to close storage when use google storage api
+    <%
+    }
+    %>
 
 <%    } %>
         } catch (java.lang.Exception e) {
@@ -1595,7 +1690,7 @@ if (execStat) {
             }
         } else if (arg.startsWith("--log4jLevel=")) {
             log4jLevel = arg.substring(13);
-		} else if (arg.startsWith("--monitoring") && arg.contains("=")) {//for trunjob call
+		} else if (arg.startsWith("--audit.enabled") && arg.contains("=")) {//for trunjob call
 		    final int equal = arg.indexOf('=');
 			final String key = arg.substring("--".length(), equal);
 			System.setProperty(key, arg.substring(equal + 1));

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

@@ -116,7 +116,11 @@ class IndexedRecordToRowStructGenerator {
                     routines.system.DynamicMetadata dynamicMetadata_<%=cid%> = new routines.system.DynamicMetadata();
                     org.apache.avro.Schema dynamicFieldSchema_<%=cid%> = dynamicField_<%=cid%>.schema();
                     // set name
-                    dynamicMetadata_<%=cid%>.setName(dynamicField_<%=cid%>.name());
+                    					if("true".equals(dynamicField_<%=cid%>.getProp("ENABLE_SPECIAL_TABLENAME"))){
+					    dynamicMetadata_<%=cid%>.setName(dynamicField_<%=cid%>.getProp("talend.field.dbColumnName"));
+					}else{
+					    dynamicMetadata_<%=cid%>.setName(dynamicField_<%=cid%>.name());
+					}
                     // set db name
                     dynamicMetadata_<%=cid%>.setDbName(dynamicField_<%=cid%>.name());
                     // set nullable
@@ -166,6 +170,14 @@ 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%>.setColumnValue(<%=codeVarDynamic%>.getIndex(dynamicValueEntry_<%=cid%>.getKey()), dynamicValueEntry_<%=cid%>.getValue());
                 }

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

@@ -389,8 +389,28 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
 			break;
 		}
 	}
-	boolean enableLogStash = jobCatcherNode != null;
-	if (stats || enableLogStash) {
+	
+	boolean enableLogStash = !Boolean.getBoolean("deactivate_extended_component_log") && (jobCatcherNode!=null);
+	boolean enable_runtime_lineage_log = NodeUtil.isJobUsingRuntimeLineage(process) && (jobCatcherNode!=null);
+	
+	if(jobCatcherNode!=null) {
+%>
+private final JobStructureCatcherUtils <%=jobCatcherNode.getUniqueName() %> = new JobStructureCatcherUtils(jobName, "<%=process.getId() %>", "<%=process.getVersion() %>");
+<%
+	}
+	if(enable_runtime_lineage_log) {
+%>
+private org.talend.job.audit.JobAuditLogger runtime_lineage_logger_<%=jobCatcherNode.getUniqueName()%> = null;
+<%
+	}
+	
+	if (enableLogStash) {
+%>
+private org.talend.job.audit.JobAuditLogger auditLogger_<%=jobCatcherNode.getUniqueName()%> = null;
+
+private RunStat runStat = new RunStat(<%=jobCatcherNode.getUniqueName() %>, System.getProperty("audit.interval"));
+<%
+	} else if(stats) {
 %>
 private RunStat runStat = new RunStat();
 <%
@@ -431,13 +451,6 @@ private RunTrace runTrace = new RunTrace();
 <%
 	}
 	
-	if(enableLogStash) {
-%>
-	JobStructureCatcherUtils <%=jobCatcherNode.getUniqueName() %> = new JobStructureCatcherUtils(jobName, "<%=process.getId() %>", "<%=process.getVersion() %>");
-	org.talend.job.audit.JobAuditLogger auditLogger_<%=jobCatcherNode.getUniqueName()%> = null;
-<%
-	}
-
 	for (INode metterCatcher : process.getNodesOfType("tFlowMeterCatcher")) {
 %>
 	MetterCatcherUtils <%=metterCatcher.getUniqueName() %> = new MetterCatcherUtils("<%=process.getId() %>", "<%=process.getVersion() %>");

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

@@ -12,6 +12,7 @@
   org.talend.designer.codegen.config.CodeGeneratorArgument
   org.talend.designer.codegen.config.NodesSubTree
   org.talend.core.model.process.IProcess
+  org.talend.core.model.process.ProcessUtils
   org.talend.core.model.utils.NodeUtil
   org.talend.core.model.process.IContextParameter  
   java.util.List
@@ -28,7 +29,13 @@ INode node = (INode)codeGenArgument.getArgument();
 boolean containsTPartitioner = node.getProcess().getNodesOfType("tPartitioner").size() > 0 ? true : false;
 boolean isRunJob = "tRunJob".equals(node.getComponent().getName());
 IProcess process = node.getProcess();
- 
+
+boolean isTestContainer=ProcessUtils.isTestContainer(process);
+String className = process.getName();
+if (isTestContainer) {
+	className = className + "Test";
+}
+
 NodesSubTree subTree = (NodesSubTree) codeGenArgument.getSubTree();
 ECodePart codePart = codeGenArgument.getCodePart();
 //boolean trace = codeGenArgument.isTrace();
@@ -78,10 +85,10 @@ for (IConnection iterateConn : iterateConnSet) { //1
 					@Override
 					public Object put(String key, Object value) {
 						<%if(!isRunInMultiThread){%>
-						synchronized (<%=process.getName()%>.this.obj) {
+						synchronized (<%=className%>.this.obj) {
 						<%}%>
 							super.put(key, value);
-							return <%=process.getName()%>.this.globalMap.put(key, value);
+							return <%=className%>.this.globalMap.put(key, value);
 						<%if(!isRunInMultiThread){%>
 						}
 						<%}%>
@@ -158,7 +165,7 @@ for (IConnection iterateConn : iterateConnSet) { //1
 						synchronized (globalMap) {
 							this.globalMap = java.util.Collections.synchronizedMap(new ThreadedMap(globalMap));
 					<%}else{%>
-						synchronized (<%=process.getName()%>.this.obj) {
+						synchronized (<%=className%>.this.obj) {
 							this.globalMap = new ThreadedMap(globalMap);
 					<%}%>
 						}

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

@@ -0,0 +1,121 @@
+<%
+//copy from configuration.javajet for tacokit
+%>
+
+<%
+            //TODO: modify this part for Maps and nested lists.
+            if (p.getFieldType() == EParameterFieldType.TABLE || p.getFieldType() == EParameterFieldType.TACOKIT_SUGGESTABLE_TABLE) {
+                java.util.List<java.util.Map<String, String>> tableValues = ElementParameterParser.createTableValues((java.util.List<java.util.Map<String, Object>>) p.getValue(), p);
+                String[] items = p.getListItemsDisplayCodeName();
+                String tableName = p.getName().replace('$', '.');
+                boolean primitiveTable = items.length == 1 && items[0].equals(tableName + "[]");
+                String tableNamePrefix = tableName + "[]";
+                for (int i = 0; i < tableValues.size(); i++) {
+                    java.util.Map<String, String> lineValues = tableValues.get(i);
+                    for (int j = 0; j < items.length; j++) {
+                        String key = tableName + "[" + i + "]";
+                        if (!primitiveTable) {
+                            final String columnName = items[j].substring(tableNamePrefix.length(), items[j].length());
+                            key = key + columnName;
+                        }
+                        String value = lineValues.get(items[j]);
+                        if (!org.talend.core.model.utils.ContextParameterUtils.isDynamic(value)) {
+                            value = org.talend.core.model.utils.TalendTextUtils.removeQuotes(value);
+                            value = org.talend.core.model.utils.TalendTextUtils.addQuotes(value);
+                        }
+                        
+                        if(value==null || "null".equals(value.trim())) {
+                            value = "(Object)null";
+                        }
+%>
+                        component_parameters.put("<%=key%>",String.valueOf(<%=value%>));
+<%
+                    }
+                }
+            } else if(p.getFieldType() == EParameterFieldType.SCHEMA_TYPE) {
+                final String parameterName = p.getName();
+                IConnection connection = null;
+                final List<? extends IConnection> connections = NodeUtil.getOutgoingConnections(node, p.getContext());
+                if(connections != null && !connections.isEmpty()) {
+                    connection = connections.get(0);
+                }
+                if(connection != null) {
+                    IMetadataTable metaTable = connection.getMetadataTable();
+                    List<IMetadataColumn> columns = metaTable.getListColumns();
+                    for(int i = 0; i < columns.size(); i++) {
+                        IMetadataColumn column = columns.get(i);
+                    %>
+                        component_parameters.put("<%=parameterName%>[<%=i%>]", "<%=column.getLabel()%>");
+                    <%
+                    }
+                }
+            } else if (p.getFieldType() == EParameterFieldType.TACOKIT_INPUT_SCHEMA) {
+                final String parameterName = p.getName();
+                IConnection connection = null;
+                final List<? extends IConnection> connections = NodeUtil.getIncomingConnections(node, p.getContext());
+                if(connections != null && !connections.isEmpty()) {
+                    connection = connections.get(0);
+                }
+                if(connection != null) {
+                    IMetadataTable metaTable = connection.getMetadataTable();
+                    List<IMetadataColumn> columns = metaTable.getListColumns();
+                    for(int i = 0; i < columns.size(); i++) {
+                        IMetadataColumn column = columns.get(i);
+                    %>
+                        component_parameters.put("<%=parameterName%>[<%=i%>]", "<%=column.getLabel()%>");
+                    <%
+                    }
+                }
+            } else {
+                final String key;
+                if(!p.getName().contains("$")){
+                    key = p.getName();
+                }else{
+                    final StringBuilder keyBuilder = new StringBuilder();
+                    for (String part : p.getName().split("\\.")) {
+                        if (keyBuilder.length() != 0) {
+                            keyBuilder.append(".");
+                        }
+                        if (part.contains("$") && !part.startsWith("$")) {
+                            keyBuilder.append(part.replace("$", "."));
+                        } else {
+                            keyBuilder.append(part);
+                        }
+                    }
+                    key = keyBuilder.toString();
+                }
+                String value = null;
+                if(p.getFieldType() == EParameterFieldType.PASSWORD) {
+                    continue;
+                } else {
+                    value = ElementParameterParser.getStringElementParameterValue(p);
+                    if (!org.talend.core.model.utils.ContextParameterUtils.isDynamic(value)) {
+                        value = org.talend.core.model.utils.TalendTextUtils.removeQuotes(value);
+                        value = org.talend.core.model.utils.TalendTextUtils.addQuotes(value);
+                    }
+                }
+                if (value != null) {
+                 if(key.endsWith("$maxBatchSize")){
+                  %>
+                  
+                  <%
+                 } else if(p.getFieldType() == EParameterFieldType.CLOSED_LIST) {
+                   String valueTemp = org.talend.core.model.utils.TalendTextUtils.removeQuotes(value);
+                    if ("".equals(valueTemp)) {
+                       String[] listItemsDisplayCodeValue = p.getListItemsDisplayCodeName();
+                       if(listItemsDisplayCodeValue != null && listItemsDisplayCodeValue.length > 0){
+                          valueTemp = listItemsDisplayCodeValue[0];
+                          value = org.talend.core.model.utils.TalendTextUtils.addQuotes(valueTemp);
+                       }
+                    }
+                }
+                
+                if(value==null || "null".equals(value.trim())) {
+                    value = "(Object)null";
+                }
+%>
+                    component_parameters.put("<%=key%>", String.valueOf(<%=value%>));
+<%
+                } // else do not put value in configuration
+            }
+%>

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.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.codegen</artifactId>

main/plugins/org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/config/EInternalTemplate.java

@@ -60,6 +60,7 @@ public enum EInternalTemplate {
     // just to have compiled templates
     FOOTER_ROUTE("footer_route", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
     HEADER_ROUTE("header_route", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
+    MICROSERVICE_APP_SECURITY("microservice_app_security","0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
     CAMEL_RUNIF("camel_run_if", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
     CAMEL_SPECIALLINKS("camel_speciallinks", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
     MICROSERVICE_APP("microservice_app", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$

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

@@ -402,13 +402,7 @@ public final class CodeGeneratorEmittersPoolFactory {
     private static JetBean initializeUtilTemplate(TemplateUtil template, ECodeLanguage codeLanguage) {
         JetBean jetBean = new JetBean(template.getJetPluginRepository(), template.getTemplateRelativeUri(),
                 template.getResourceName(), template.getVersion(), codeLanguage.getName(), ""); //$NON-NLS-1$
-        jetBean.addClassPath("EMF_ECORE", "org.eclipse.emf.ecore"); //$NON-NLS-1$ //$NON-NLS-2$
-        jetBean.addClassPath("EMF_COMMON", "org.eclipse.emf.common"); //$NON-NLS-1$ //$NON-NLS-2$
-        jetBean.addClassPath("CORERUNTIME_LIBRARIES", "org.talend.core.runtime"); //$NON-NLS-1$ //$NON-NLS-2$
-        jetBean.addClassPath("MANAGEMENT_LIBRARIES", "org.talend.metadata.managment"); //$NON-NLS-1$ //$NON-NLS-2$
-        jetBean.addClassPath("CORE_LIBRARIES", CorePlugin.PLUGIN_ID); //$NON-NLS-1$
-        jetBean.addClassPath("CODEGEN_LIBRARIES", CodeGeneratorActivator.PLUGIN_ID); //$NON-NLS-1$
-        jetBean.addClassPath("COMMON_LIBRARIES", CommonsPlugin.PLUGIN_ID); //$NON-NLS-1$
+        addCommonLibs(jetBean);
         jetBean.addClassPath("COMPONENT_FRAMEWORK", "org.talend.components.api"); //$NON-NLS-1$ //$NON-NLS-2$
         jetBean.addClassPath("TALEND_MODEL", "org.talend.model"); //$NON-NLS-1$ //$NON-NLS-2$
         jetBean.addClassPath("DAIKON", "org.talend.daikon"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -453,13 +447,7 @@ public final class CodeGeneratorEmittersPoolFactory {
             }
             JetBean jetBean = new JetBean(componentsPath, templateURI, component.getName(), component.getVersion(),
                     codeLanguage.getName(), codePart.getName());
-            jetBean.addClassPath("EMF_ECORE", "org.eclipse.emf.ecore"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("EMF_COMMON", "org.eclipse.emf.common"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("CORERUNTIME_LIBRARIES", "org.talend.core.runtime"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("MANAGEMENT_LIBRARIES", "org.talend.metadata.managment"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("CORE_LIBRARIES", CorePlugin.PLUGIN_ID); //$NON-NLS-1$
-            jetBean.addClassPath("CODEGEN_LIBRARIES", CodeGeneratorActivator.PLUGIN_ID); //$NON-NLS-1$
-            jetBean.addClassPath("COMMON_LIBRARIES", CommonsPlugin.PLUGIN_ID); //$NON-NLS-1$
+            addCommonLibs(jetBean);
             jetBean.addClassPath("COMPONENT_FRAMEWORK", "org.talend.components.api"); //$NON-NLS-1$ //$NON-NLS-2$
             jetBean.addClassPath("DAIKON", "org.talend.daikon"); //$NON-NLS-1$ //$NON-NLS-2$
             jetBean.addClassPath("COMPONENT_CORE", "org.talend.designer.core.generic"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -549,13 +537,7 @@ public final class CodeGeneratorEmittersPoolFactory {
             // TODO
             JetBean jetBean = new JetBean(componentsPath, templateURI, "component", component.getVersion(), //$NON-NLS-1$
                     "", codePart.getName());//$NON-NLS-1$
-            jetBean.addClassPath("EMF_ECORE", "org.eclipse.emf.ecore"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("EMF_COMMON", "org.eclipse.emf.common"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("CORERUNTIME_LIBRARIES", "org.talend.core.runtime"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("MANAGEMENT_LIBRARIES", "org.talend.metadata.managment"); //$NON-NLS-1$ //$NON-NLS-2$
-            jetBean.addClassPath("CORE_LIBRARIES", CorePlugin.PLUGIN_ID); //$NON-NLS-1$
-            jetBean.addClassPath("CODEGEN_LIBRARIES", CodeGeneratorActivator.PLUGIN_ID); //$NON-NLS-1$
-            jetBean.addClassPath("COMMON_LIBRARIES", CommonsPlugin.PLUGIN_ID); //$NON-NLS-1$
+            addCommonLibs(jetBean);
             jetBean.addClassPath("AVRO", "org.apache.servicemix.bundles.avro"); //$NON-NLS-1$ //$NON-NLS-2$
 
             for (String pluginDependency : component.getPluginDependencies()) {
@@ -856,6 +838,17 @@ public final class CodeGeneratorEmittersPoolFactory {
         CodeGeneratorEmittersPoolFactory.initialized = initialized;
     }
 
+    public static void addCommonLibs(JetBean jetBean) {
+        jetBean.addClassPath("EMF_ECORE", "org.eclipse.emf.ecore"); //$NON-NLS-1$ //$NON-NLS-2$
+        jetBean.addClassPath("EMF_COMMON", "org.eclipse.emf.common"); //$NON-NLS-1$ //$NON-NLS-2$
+        jetBean.addClassPath("CORERUNTIME_LIBRARIES", "org.talend.core.runtime"); //$NON-NLS-1$ //$NON-NLS-2$
+        jetBean.addClassPath("MANAGEMENT_LIBRARIES", "org.talend.metadata.managment"); //$NON-NLS-1$ //$NON-NLS-2$
+        jetBean.addClassPath("CORE_LIBRARIES", CorePlugin.PLUGIN_ID); //$NON-NLS-1$
+        jetBean.addClassPath("CODEGEN_LIBRARIES", CodeGeneratorActivator.PLUGIN_ID); //$NON-NLS-1$
+        jetBean.addClassPath("COMMON_LIBRARIES", CommonsPlugin.PLUGIN_ID); //$NON-NLS-1$
+        jetBean.addClassPath("COMMON_LIBRARIES_STUDIO_UTILS", "org.talend.studio.studio-utils"); //$NON-NLS-1$
+    }
+
     /***/
     private static class DelegateProgressMonitor implements IProgressMonitor {
 

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

@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.apache.log4j,
  org.apache.commons.collections,
  org.apache.commons.logging,
- org.apache.commons.beanutils,
+ org.apache.commons.commons-beanutils,
  org.apache.commons.io,
  org.apache.commons.lang,
  org.apache.commons.httpclient,

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>7.4.1-SNAPSHOT</version>
+    <version>7.4.1-M3</version>
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.talend.designer.components.exchange</artifactId>

main/plugins/org.talend.designer.components.libs/libs_src/StewardshipTask/build.xml

@@ -11,7 +11,7 @@
 	
 	<!-- modification 2: compile classpath -->
 		<path id="compile.classpath">
-			<pathelement location="../../../../../../tcommon-studio-se/main/plugins/org.talend.libraries.dom4j-jaxen/lib/dom4j-1.6.1.jar" /> 
+			<pathelement location="../../../../../../tcommon-studio-se/main/plugins/org.talend.libraries.dom4j-jaxen/lib/dom4j-2.1.3.jar" /> 
 			<pathelement location="../../../../../../tcommon-studio-se/main/plugins/org.talend.libraries.apache.common/lib/commons-lang-2.6.jar" /> 
 		</path>
 

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-20200211</version>
+	<version>1.6.4-20200824</version>
 	<packaging>jar</packaging>
 	<name>adal4j</name>
 	<description>
@@ -109,12 +109,12 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.11</version>
+			<version>1.14</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.5</version>
+			<version>3.9</version>
 		</dependency>
 
 		<!-- test dependencies -->

main/plugins/org.talend.designer.components.libs/libs_src/buildall.xml

@@ -2,7 +2,6 @@
 <project name="org.talend.designer.components.libs" default="buildall" basedir=".">
 
 	<target name="buildall">
-		<ant antfile="talend_file_enhanced_20070724/build.xml" target="process" inheritall="no" />
 		<ant antfile="sugarCRMManagement/build.xml" target="process" inheritall="no" />
 		<ant antfile="TalendSAX/build.xml" target="process" inheritall="no" />
 	</target>

main/plugins/org.talend.designer.components.libs/libs_src/commons-net-ftps-proxy/pom.xml

@@ -3,11 +3,32 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.talend.components.lib</groupId>
     <artifactId>commons-net-ftps-proxy</artifactId>
-    <version>3.6.1-talend-20190819</version>
+    <version>3.6.1-talend-20200902</version>
 
     <name>commons-net-talend</name>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
+        <slf4.version>1.7.25</slf4.version>
+        <lombok.version>1.18.12</lombok.version>
+    </properties>
+
     <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
@@ -15,10 +36,6 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
-    </properties>
-
     <distributionManagement>
         <snapshotRepository>
             <id>talend_nexus_deployment</id>

main/plugins/org.talend.designer.components.libs/libs_src/commons-net-ftps-proxy/src/main/java/org/talend/ftp/SSLSessionReuseFTPSClient.java

@@ -11,8 +11,10 @@ import javax.net.ssl.SSLSession;
 import javax.net.ssl.SSLSessionContext;
 import javax.net.ssl.SSLSocket;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.net.ftp.FTPSClient;
 
+@Slf4j
 public class SSLSessionReuseFTPSClient extends FTPSClient {
 
     public SSLSessionReuseFTPSClient(boolean isImplicit, SSLContext context) {
@@ -24,6 +26,12 @@ public class SSLSessionReuseFTPSClient extends FTPSClient {
         if (socket instanceof SSLSocket) {
             final SSLSession session = ((SSLSocket) _socket_).getSession();
             final SSLSessionContext context = session.getSessionContext();
+            if (context == null) {
+                // TDI-44654 (may be reproduced with Syncplify server)
+                log.info("SSL Session Context is null. SSL Session was re-initialized.");
+                return;
+            }
+
             try {
                 final Field sessionHostPortCache = context.getClass().getDeclaredField("sessionHostPortCache");
                 sessionHostPortCache.setAccessible(true);
@@ -32,10 +40,10 @@ public class SSLSessionReuseFTPSClient extends FTPSClient {
                 putMethod.setAccessible(true);
                 InetAddress address = socket.getInetAddress();
                 int port = socket.getPort();
-                
+
                 String key = String.format("%s:%s", address.getHostName(), String.valueOf(port)).toLowerCase(Locale.ROOT);
                 putMethod.invoke(cache, key, session);
-                
+
                 key = String.format("%s:%s", address.getHostAddress(), String.valueOf(port)).toLowerCase(Locale.ROOT);
                 putMethod.invoke(cache, key, session);
             } catch (Exception e) {

main/plugins/org.talend.designer.components.libs/libs_src/google-storage-utils/pom.xml

@@ -22,7 +22,7 @@
 
     <groupId>org.talend.components</groupId>
     <artifactId>google-storage-utils</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <talend.nexus.url>https://artifacts-oss.talend.com</talend.nexus.url>
@@ -46,6 +46,12 @@
             <artifactId>jets3t</artifactId>
             <version>0.9.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.6.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <distributionManagement>
         <snapshotRepository>
@@ -64,8 +70,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
             <plugin>

main/plugins/org.talend.designer.components.libs/libs_src/google-storage-utils/src/main/java/org/talend/gs/util/GSObjectUtil.java

@@ -3,10 +3,13 @@ package org.talend.gs.util;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.FileSystems;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.jets3t.service.model.GSObject;
@@ -44,6 +47,50 @@ public class GSObjectUtil {
         return objects;
     }
 
+    public Map<String, File> generateFileMap(File rootFile, String directory, Map<String, String> filter){
+        Map<String, File> allFiles = generateFileMap(rootFile, directory);
+        Map<String, File> resultMap = new HashMap<>();
+        for (Map.Entry<String, String> entry : filter.entrySet()) {
+            //key is path to file on local machine
+            //value is new path in GS
+            File currentFile = new File(entry.getKey());
+            if (allFiles.containsValue(currentFile)){
+                resultMap.put(entry.getValue(), currentFile);
+            }
+        }
+        return resultMap;
+    }
+
+    public Map<String, File> generateFileMap(File rootFile, String directory){
+        if (rootFile == null){
+            throw new IllegalArgumentException("File can't be null");
+        }
+        if (directory == null){
+            throw new IllegalArgumentException("Directory name can't be null");
+        }
+
+        if (!directory.isEmpty() && !"/".equals(directory.substring(directory.length()-1))){
+            directory = directory + "/";
+        }
+
+        Map<String,File> fileMap = new HashMap<>();
+
+        if (!rootFile.isDirectory()){
+            fileMap.put(directory + rootFile.getName(), rootFile);
+            return fileMap;
+        }
+
+        String pathToDirectory = rootFile.getAbsolutePath();
+        List<File> allFiles = listAllFiles(pathToDirectory);
+
+        for (File currentFile : allFiles){
+            if (!currentFile.isDirectory()){
+                fileMap.put(combineTwoNames(pathToDirectory, directory, currentFile), currentFile);
+            }
+        }
+        return fileMap;
+    }
+
     public java.util.Map<String, String> genFileFilterList(java.util.List<java.util.Map<String, String>> list,
             String localdir, String remotedir) {
         if (remotedir != null && !"".equals(remotedir)) {
@@ -120,4 +167,23 @@ public class GSObjectUtil {
         InputStream mimetypesFile = this.getClass().getResourceAsStream("/resource/mime.types");
         Mimetypes.getInstance().loadAndReplaceMimetypes(mimetypesFile);
     }
+
+    private List<File> listAllFiles(String directoryName) {
+        File directory = new File(directoryName);
+        List<File> resultList = new ArrayList<>();
+        File[] fList = directory.listFiles();
+        resultList.addAll(Arrays.asList(fList));
+        for (File file : fList) {
+            if (file.isDirectory()) {
+                resultList.addAll(listAllFiles(file.getAbsolutePath()));
+            }
+        }
+        return resultList;
+    }
+
+    private String combineTwoNames(String coreDir, String targetDir, File file){
+        String filePath = file.getAbsolutePath();
+        String relativePath =  targetDir + filePath.replace(coreDir + FileSystems.getDefault().getSeparator(), "");
+        return relativePath.replaceAll("\\\\","/");
+    }
 }

main/plugins/org.talend.designer.components.libs/libs_src/google-storage-utils/src/test/java/util/GSObjectUtilTest.java

@@ -0,0 +1,131 @@
+package util;
+
+import org.junit.jupiter.api.Test;
+import org.talend.gs.util.GSObjectUtil;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class GSObjectUtilTest {
+
+    @Test
+    void checkSizeOfFilesInFolderTest() {
+        Path pathToDirectory = Paths.get("src", "test", "resources", "dirWithThreeFiles");
+        Path pathToFile1 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "1.csv");
+        Path pathToFile2 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "2.csv");
+        Path pathToFile3 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "3.csv");
+        Path pathToFile4 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "inner", "1.csv");
+
+        String expectedRelativePathToFile1 = "/1.csv";
+        String expectedRelativePathToFile2 = "/2.csv";
+        String expectedRelativePathToFile3 = "/3.csv";
+        String expectedRelativePathToFile4 = "/inner/1.csv";
+
+        File rootFile = new File(pathToDirectory.toUri());
+        GSObjectUtil gsObjectUtil = new GSObjectUtil();
+        Map<String, File> files = gsObjectUtil.generateFileMap(rootFile, "/");
+        assertEquals(4, files.size());
+
+        File expectedFile1 = new File(pathToFile1.toUri());
+        File expectedFile2 = new File(pathToFile2.toUri());
+        File expectedFile3 = new File(pathToFile3.toUri());
+        File expectedFile4 = new File(pathToFile4.toUri());
+
+        assertTrue(files.containsKey(expectedRelativePathToFile1));
+        assertTrue(files.containsKey(expectedRelativePathToFile2));
+        assertTrue(files.containsKey(expectedRelativePathToFile3));
+        assertTrue(files.containsKey(expectedRelativePathToFile4));
+
+        assertEquals(expectedFile1.getAbsoluteFile(), files.get(expectedRelativePathToFile1).getAbsoluteFile());
+        assertEquals(expectedFile2.getAbsoluteFile(), files.get(expectedRelativePathToFile2).getAbsoluteFile());
+        assertEquals(expectedFile3.getAbsoluteFile(), files.get(expectedRelativePathToFile3).getAbsoluteFile());
+        assertEquals(expectedFile4.getAbsoluteFile(), files.get(expectedRelativePathToFile4).getAbsoluteFile());
+    }
+
+    @Test
+    void checkSizeOfFilesInFolder2Test() {
+        Path pathToDirectory = Paths.get("src", "test", "resources", "dirWithThreeFiles");
+        Path pathToFile1 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "1.csv");
+        Path pathToFile2 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "2.csv");
+        Path pathToFile3 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "3.csv");
+        Path pathToFile4 = Paths.get("src", "test", "resources", "dirWithThreeFiles", "inner", "1.csv");
+
+        String expectedRelativePathToFile1 = "1.csv";
+        String expectedRelativePathToFile2 = "2.csv";
+        String expectedRelativePathToFile3 = "3.csv";
+        String expectedRelativePathToFile4 = "inner/1.csv";
+
+        File rootFile = new File(pathToDirectory.toUri());
+        GSObjectUtil gsObjectUtil = new GSObjectUtil();
+        Map<String, File> files = gsObjectUtil.generateFileMap(rootFile, "");
+        assertEquals(4, files.size());
+
+        File expectedFile1 = new File(pathToFile1.toUri());
+        File expectedFile2 = new File(pathToFile2.toUri());
+        File expectedFile3 = new File(pathToFile3.toUri());
+        File expectedFile4 = new File(pathToFile4.toUri());
+
+        assertTrue(files.containsKey(expectedRelativePathToFile1));
+        assertTrue(files.containsKey(expectedRelativePathToFile2));
+        assertTrue(files.containsKey(expectedRelativePathToFile3));
+        assertTrue(files.containsKey(expectedRelativePathToFile4));
+
+        assertEquals(expectedFile1.getAbsoluteFile(), files.get(expectedRelativePathToFile1).getAbsoluteFile());
+        assertEquals(expectedFile2.getAbsoluteFile(), files.get(expectedRelativePathToFile2).getAbsoluteFile());
+        assertEquals(expectedFile3.getAbsoluteFile(), files.get(expectedRelativePathToFile3).getAbsoluteFile());
+        assertEquals(expectedFile4.getAbsoluteFile(), files.get(expectedRelativePathToFile4).getAbsoluteFile());
+    }
+
+    @Test
+    void oneFileWithCustomPathTest(){
+        Path pathToFile = Paths.get("src","test", "resources", "empty.csv");
+        String pathToFolder = "/folder/folder";
+        File expectedFile = new File(pathToFile.toUri());
+        GSObjectUtil gsObjectUtil = new GSObjectUtil();
+
+        Map<String, File> files = gsObjectUtil.generateFileMap(expectedFile, pathToFolder);
+
+        String expectedRelativePathToFile = "/folder/folder/empty.csv";
+
+        assertEquals(1, files.size());
+        assertTrue(files.containsKey(expectedRelativePathToFile));
+        assertEquals(expectedFile.getAbsoluteFile(), files.get(expectedRelativePathToFile).getAbsoluteFile());
+    }
+
+    @Test
+    void oneFileWithOtherCustomPathTest(){
+        Path pathToFile = Paths.get("src","test", "resources", "empty.csv");
+        String pathToFolder = "folder/folder";
+        File expectedFile = new File(pathToFile.toUri());
+        GSObjectUtil gsObjectUtil = new GSObjectUtil();
+
+        Map<String, File> files = gsObjectUtil.generateFileMap(expectedFile, pathToFolder);
+
+        String expectedRelativePathToFile = "folder/folder/empty.csv";
+
+        assertEquals(1, files.size());
+        assertTrue(files.containsKey(expectedRelativePathToFile));
+        assertEquals(expectedFile.getAbsoluteFile(), files.get(expectedRelativePathToFile).getAbsoluteFile());
+    }
+
+    @Test
+    void folderWithOtherCustomPathTest(){
+        Path pathToFolder = Paths.get("src", "test", "resources", "dirWithThreeFiles", "inner");
+        String pathToGSFolder = "folder";
+        File folder = new File(pathToFolder.toUri());
+        GSObjectUtil gsObjectUtil = new GSObjectUtil();
+
+        Map<String, File> files = gsObjectUtil.generateFileMap(folder, pathToGSFolder);
+
+        String expectedRelativePathToFile = "folder/1.csv";
+        File expectedFile = new File(pathToFolder + "/1.csv");
+
+        assertEquals(1, files.size());
+        assertTrue(files.containsKey(expectedRelativePathToFile));
+        assertEquals(expectedFile.getAbsoluteFile(), files.get(expectedRelativePathToFile).getAbsoluteFile());
+    }
+}