- fixed TDI-24848 for branch 52

git-svn-id: http://talendforge.org/svn/tos/branches/branch-5_2@98977 f6f1c999-d317-4740-80b0-e6d1abc6f99e

org.talend.componentdesigner.nl/src/messages_nl.properties

@@ -3,6 +3,11 @@ PushToPaletteActionProvider.Error=Fout
 NewActionProvider.New=Nieuw
 NewActionProvider.NewComponent=Nieuw Component
 AbstractXMLConfigPage.Delete=Verwijderen
+WizardJetFilesChoosePage.Directory=Directory:
 CreateComponentWizard.NewComponent=Nieuw Component
 WizardComponentFolderPage.Name=Naam
+WizardComponentFolderPage.Perl=Perl
+WizardJetFilesChoosePage.UseDefaultIcon=Gebruik default icon
+WizardJetFilesChoosePage.ChoseAIcon=Kies een icon
 AbstractXMLConfigPage.New=Nieuw
+WizardComponentFolderPage.Java=Java

org.talend.componentdesigner.nl/src/messages_zh_CN.properties

@@ -0,0 +1,87 @@
+FileCopy.ExceptionMSG=\u6E90\u6587\u4EF6"
+EditComponentActionProvider.Edit=\u7F16\u8F91\u7EC4\u4EF6
+ImportComponentDialog.ErrorMSG4=\u6CA1\u6709\u9009\u62E9\u7EC4\u4EF6\u5BFC\u5165
+AbstractXMLConfigPage.TYPETip=%u8CC7%u6599%u578B%u614B.
+PushToPaletteActionProvider.Error2=\u9519\u8BEF
+CopyFromPaletteActionProvider.Label2=\u4ECEpalette\u5BFC\u5165\u7EC4\u4EF6
+AbstractXMLConfigPage.MAXOUTPUTTip=\u6574\u6570\u503C.\u8FDE\u63A5\u6700\u5927\u503C\u8F93\u51FA
+ImportComponentDialog.Browser=\u6D4F\u89C8..
+ComponentProjectPreferencePage.WarningMSG=\u8B66\u544A,\u8FD9\u79CD\u4FEE\u6539\u4EC5\u4EC5\u5F71\u54CD\u7EC4\u4EF6\u8BBE\u8BA1\u5668\uFF0C\u4E0D\u5F71\u54CDPalette.
+AbstractXMLConfigPage.MAXINPUTTip=\u6574\u6570\u503C.\u8FDE\u63A5\u6700\u5927\u503C\u8F93\u5165.
+PushToPaletteActionProvider.ErrorMSG2=\u7528\u6237\u7EC4\u4EF6\u6587\u4EF6\u5939\u4E0D\u5B58\u5728\u3002
+ComponentProjectManager.CreationProblems=\u95ee\u9898\u521b\u5efa
+CopyComponentActionProvider.InputName=\u8F93\u5165\u65B0\u7684\u7EC4\u4EF6\u540D
+CreateComponentWizard.SpecifyRes=\u6307\u5B9A\u8D44\u6E90
+AbstractXMLConfigPage.REPOSITORYVALUETip=%u9078%u64C7 Metadata %u5132%u85CF%u5EAB.
+PushToPaletteActionProvider.ErrorMSG=\u7528\u6237\u7EC4\u4EF6\u6587\u4EF6\u5939\u672A\u8BBE\u7F6E\u3002
+AbstractXMLConfigPage.NUMROWTip=\u6574\u6570\u503C.\u6B64\u53C2\u6570\u5217\u4F4D\u7F6E\u5728\u7EC4\u4EF6\u89C6\u56FE
+PushToPaletteActionProvider.Error=\u9519\u8BEF
+ComponentProjectManager.InternalErrorMsg=\u5185\u90E8\u9519\u8BEF\uFF1A{0}
+AbstractXMLConfigPage.IntValue=%u6574%u6578%u503C
+ImportComponentDialog.ImportCanceled=\u5BFC\u5165\u7EC4\u4EF6\u5DF2\u53D6\u6D88
+PushToPaletteActionProvider.OK=\u786E\u5B9A
+WizardJetFilesChoosePage.BeginFile=\u5F00\u59CB\u6587\u4EF6
+AbstractXMLConfigPage.COLORTip=RGB\u5341\u516D\u8FDB\u5236.\u4F8B\u5982:"00FF00"
+CreateComponentWizard.CreateXMLPerl=\u521B\u5EFAPERL\u7EC4\u4EF6\u7684XML\u914D\u7F6E\u6587\u4EF6
+ImportComponentDialog.SelectDirectoryLabel=\u9009\u62E9\u4E00\u4E2A\u8DEF\u5F84\uFF1A
+PushToPaletteActionProvider.Information=\u4FE1\u606F
+PluginConstant.Borwser=\u6D4F\u89C8..
+NewActionProvider.New=\u65b0
+AbstractXMLConfigPage.EXTENSIONTip=\u63D2\u4EF6\u540D\u79F0\u5B57\u7B26\u4E32\u503C.\u6B64\u9009\u9879\u7528\u4E8E\u5916\u90E8\u7EC4\u4EF6.
+ImportComponentDialog.ShowPaletteComponents=\u663E\u793A\u7EC4\u4EF6\u8C03\u8272\u677F
+ComponentProjectPreferencePage.ChooseProject=\u9009\u62E9\u7EC4\u4EF6\u8BBE\u8BA1\u5DE5\u7A0B\u6587\u4EF6\u5939
+WizardComponentFolderPage.ErrMSG5=\u7EC4\u4EF6\u65CF\u65E0\u5185\u5BB9
+AbstractXMLConfigPage.BooleanTip=Boolean\u503C(\u771F\u6216\u5047).
+AbstractXMLConfigPage.Delete=\u5220\u9664
+WizardComponentFolderPage.ErrMSG3=\u7EC4\u4EF6\u5DF2\u5B58\u5728
+WizardComponentFolderPage.ErrMSG2=\u7EC4\u4EF6\u540D\u4E3A\u7A7A
+WizardComponentFolderPage.ErrMSG1=\u6CA1\u6709\u9009\u62E9\u7EC4\u4EF6\u7684\u8BED\u8A00
+CreateComponentWizard.FillIn=\u586B\u5199\u7EC4\u4EF6\u5C5E\u6027
+ImportComponentDialog.ImportCanceledMSG=\u5DF2\u53D6\u6D88\u4ECEPalette\u4E0A\u5BFC\u5165\u7EC4\u4EF6
+ComponentProjectPreferencePage.Warning=\u8B66\u544A
+AbstractXMLConfigPage.VERSIONTip=%u8ACB%u7528%u4E00%u500B%u5341%u9032%u4F4D%u6578%u503C%u4F86%u6A19%u8A18%u60A8%u7684%u65B0%u5143%u4EF6%u7248%u672C.
+WizardJetFilesChoosePage.Directory=\u76EE\u5F55
+WizardComponentFolderPage.Name=\u8fde\u63a5\u540d
+RemoveResourceAction.Remove=\u5220\u9664
+WizardJetFilesChoosePage.UseIconFrom=\u9009\u62E9\u56FE\u6807\uFF1A
+ImportComponentDialog.ImportFinished=\u5BFC\u5165\u7EC4\u4EF6\u5B8C\u6210
+AbstractXMLConfigPage.SetProperties=\u8BBE\u7F6E\u9009\u62E9\u5143\u7D20\u5C5E\u6027
+ProjectSelectionDialog.ChooseFolder=\u5728\u6B64\u4F1A\u8BDD\u4E2D\u9009\u62E9\u4E00\u4E2A\u5DE5\u7A0B\u6587\u4EF6\u5939
+ComponentProjectPreferencePage.ComponentProject=\u7EC4\u4EF6\u5DE5\u7A0B
+ImportComponentDialog.ImportFinishedMSG=\u7EC4\u4EF6\u5BFC\u5165\u6210\u529F
+AddExternalResourceAction.ErrorTitle=\u5916\u90E8\u6863\u6848\u9519\u8BEF
+AbstractXMLConfigPage.MININPUTTip=\u6574\u6570\u503C.\u8FDE\u63A5\u6700\u5C0F\u503C\u8F93\u51FA
+WizardJetFilesChoosePage.MainFile=\u4E3B\u6587\u4EF6
+CreateComponentWizard.CreateXMLJava=\u521B\u5EFAJava\u7EC4\u4EF6\u7684XML\u914D\u7F6E\u6587\u4EF6
+WizardJetFilesChoosePage.UseDefaultIcon=\u4F7F\u7528\u9ED8\u8BA4\u7684\u56FE\u6807
+CopyComponentActionProvider.CopyComponent=\u590D\u5236\u8FD9\u4E2A\u7EC4\u4EF6
+ImportComponentDialog.ChooseComponentsLabel=\u9009\u62E9\u8981\u5BFC\u5165\u7684\u7EC4\u4EF6\uFF1A
+AddExternalResourceAction.ErrorMsg=\u9009\u5B9A\u7684\u5916\u90E8\u6863\u6848\u662F\u4E0D\u53EF\u7528\u6216\u4E0D\u5B58\u5728.
+ComponentProjectManager.NewProject=\u65B0\u7EC4\u4EF6\u9879\u76EE
+CopyFromPaletteActionProvider.Label=\u4ECEPalette\u590D\u5236\u7EC4\u4EF6
+WizardJetFilesChoosePage.ChoseAIcon=\u9009\u62E9\u6309\u94AE
+ComponentProjectPreferencePage.SelectPath=\u9009\u62E9\u7EC4\u4EF6\u5DE5\u7A0B\u8DEF\u5F84
+AbstractXMLConfigPage.LINESTYLETip=\u6574\u6570\u503C.\u8FDE\u63A5\u7EBF\u98CE\u683C(1: Solid, 2: Dash, 3: Dot, 4: Dashdot)
+WizardJetFilesChoosePage.EndFile=\u7ED3\u675F\u6587\u4EF6
+PushToPaletteActionProvider.InformationMSG=\u7EC4\u4EF6\u5DF2\u53D1\u5E03\uFF0Cpalette\u5C06\u5237\u65B0\u3002
+ProjectSelectionDialog.ComponentProject=\u7EC4\u4EF6\u5DE5\u7A0B
+ComponentProjectPreferencePage.ButtonLabel0=\u786E\u5B9A
+AbstractXMLConfigPage.New=\u65b0
+CopyComponentValidator.ComponentExist=\u6B64\u7EC4\u4EF6\u5DF2\u5B58\u5728
+ImportComponentDialog.WarningMSG=\u64CD\u4F5C\u5C06\u8986\u76D6\u5DE5\u4F5C\u533A\u5DF2\u5B58\u5728\u7684\u7EC4\u4EF6\u3002\u60A8\u771F\u7684\u8981\u5BFC\u5165\u5DF2\u9009\u62E9\u7684\u7EC4\u4EF6\u5417\uFF1F
+CreateComponentWizard.MainProperties=\u4E3B\u8981\u5C5E\u6027
+ComponentProjectManager.WarningMsg=\u5E95\u5C42\u6587\u4EF6\u7CFB\u7EDF\u4E0D\u533A\u5206\u5927\u5C0F\u5199\u3002\u5DF2\u7ECF\u5B58\u5728\u4E00\u4E2A\u9879\u76EE\u4E0E{0}\u51B2\u7A81
+WizardComponentFolderPage.Family=\u65cf
+PushToPaletteActionProvider.OK3=\u786E\u5B9A
+PushToPaletteActionProvider.OK2=\u786E\u5B9A
+CopyComponentActionProvider.CopyComponent2=\u590D\u5236\u7EC4\u4EF6
+AbstractXMLConfigPage.CTYPETip=\u8FDE\u7ED3\u5668\u7C7B\u578B
+AddResourceAction.ChooseResource=&\u9009\u62E9\u6DFB\u52A0jars\u548Czips:
+ImportComponentDialog.WarningTitle=\u8B66\u544A
+AddExternalResourceAction.AddELibs=\u6DFB\u52A0\u5916\u90E8\u5E93...
+ImportComponentDialog.NoComponentsAvailable=\u6CA1\u6709\u53EF\u7528\u7684\u7EC4\u4EF6
+AbstractXMLConfigPage.MINOUTPUTTip=\u6574\u6570\u503C\u3002\u8FDE\u63A5\u6700\u5C0F\u503C\u8F93\u51FA
+ValidateComponentXMLActionProvider.ok=\u786E\u8BA4
+ValidateComponentXMLActionProvider.result=\u9A8C\u8BC1\u7ED3\u679C
+ValidateComponentXMLActionProvider.valid=\u7EC4\u4EF6XML\u6587\u4EF6\u5408\u6CD5\uFF01
+ValidateComponentXMLActionProvider.validate=\u9A8C\u8BC1\u7EC4\u4EF6XML\u6587\u4EF6

org.talend.componentdesigner.rcp.nl/src/messages_zh_CN.properties

@@ -0,0 +1,6 @@
+FileWizard.0=\u6587\u4EF6\u5411\u5BFC
+\n
+ApplicationActionBarAdvisor.helpMenu=\u5E2E\u52A9(&H)
+ApplicationActionBarAdvisor.fileMenu=\u6587\u4EF6(&F)
+ShowViewAction.actionLabel=\u663E\u793A\u89C6\u56FE...(&v)
+ApplicationActionBarAdvisor.windowMenu=\u7A97\u53E3(&W)

org.talend.componentdesigner/src/org/talend/componentdesigner/ComponentDesigenerPlugin.java

@@ -12,10 +12,6 @@
 // ============================================================================
 package org.talend.componentdesigner;
 
-import java.io.IOException;
-import java.util.Properties;
-
-import org.apache.log4j.PropertyConfigurator;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.widgets.Shell;
@@ -46,18 +42,10 @@ public class ComponentDesigenerPlugin extends AbstractUIPlugin {
      * 
      * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
      */
+    @Override
     public void start(BundleContext context) throws Exception {
         super.start(context);
         plugin = this;
-        Properties prop = new Properties();
-        try {
-            prop.load(ComponentDesigenerPlugin.class.getResourceAsStream("log4j.properties")); //$NON-NLS-1$
-        } catch (IOException e) {
-            // e.printStackTrace();
-            org.talend.componentdesigner.exception.ExceptionHandler.process(e);
-        }
-
-        PropertyConfigurator.configure(prop);
     }
 
     /*
@@ -65,6 +53,7 @@ public class ComponentDesigenerPlugin extends AbstractUIPlugin {
      * 
      * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
      */
+    @Override
     public void stop(BundleContext context) throws Exception {
         plugin = null;
         super.stop(context);

org.talend.componentdesigner/src/org/talend/componentdesigner/log4j.properties

@@ -1,47 +0,0 @@
-### direct log messages to stdout ###
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-### direct messages to file hibernate.log ###
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-### set log levels - for more verbose logging change 'info' to 'debug' ###
-
-log4j.rootLogger=warn, stdout
-
-#log4j.logger.org.hibernate=info
-log4j.logger.org.hibernate=debug
-
-### log HQL query parser activity
-#log4j.logger.org.hibernate.hql.ast.AST=debug
-
-### log just the SQL
-#log4j.logger.org.hibernate.SQL=debug
-
-### log JDBC bind parameters ###
-log4j.logger.org.hibernate.type=info
-#log4j.logger.org.hibernate.type=debug
-
-### log schema export/update ###
-log4j.logger.org.hibernate.tool.hbm2ddl=debug
-
-### log HQL parse trees
-#log4j.logger.org.hibernate.hql=debug
-
-### log cache activity ###
-#log4j.logger.org.hibernate.cache=debug
-
-### log transaction activity
-#log4j.logger.org.hibernate.transaction=debug
-
-### log JDBC resource acquisition
-#log4j.logger.org.hibernate.jdbc=debug
-
-### enable the following line if you want to track down connection ###
-### leakages when using DriverManagerConnectionProvider ###
-#log4j.logger.org.hibernate.connection.DriverManagerConnectionProvider=trace

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

@@ -0,0 +1,3 @@
+prefs.configuration.LINK_STYLE.AUTO=\u81EA\u52A8
+prefs.configuration.title=\u8fd0\u884c\u6b65\u9aa4\u914d\u7f6e
+prefs.configuration.LINK_STYLE=\u9ED8\u8BA4\u94FE\u63A5\u663E\u793A\u4E3A\uFF1A

org.talend.designer.abstractmap/src/java/main/org/talend/designer/abstractmap/AbstractMapComponent.java

@@ -12,6 +12,9 @@
 // ============================================================================
 package org.talend.designer.abstractmap;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.PatternCompiler;
@@ -109,21 +112,34 @@ public abstract class AbstractMapComponent extends AbstractExternalNode {
         hasOrRenameData(oldName, newName, true);
 
     }
+    
+    private static Map<String, Pattern> patternsCache = new HashMap<String, Pattern>();
 
     protected final Pattern getRenamePattern(String oldName) {
+    	if (patternsCache.containsKey(oldName)) {
+            return patternsCache.get(oldName);
+        }
         PatternCompiler compiler = new Perl5Compiler();
         Pattern pattern = null;
         try {
             pattern = compiler.compile("\\b(" + UpdateContextVariablesHelper.replaceSpecialChar(oldName) + ")(\\b|\\_)"); //$NON-NLS-1$ //$NON-NLS-2$
+            patternsCache.put(oldName, pattern);
             return pattern;
         } catch (MalformedPatternException e) {
             ExceptionHandler.process(e);
             return null;
         }
     }
+    
+    private static Map<String, Perl5Substitution> substitutionsCache = new HashMap<String, Perl5Substitution>();
 
     protected final Perl5Substitution getRenameSubstitution(String newName) {
-        return new Perl5Substitution(newName + "$2", Perl5Substitution.INTERPOLATE_ALL); //$NON-NLS-1$
+        if (substitutionsCache.containsKey(newName)) {
+            return substitutionsCache.get(newName);
+        }
+        Perl5Substitution ps = new Perl5Substitution(newName + "$2", Perl5Substitution.INTERPOLATE_ALL); //$NON-NLS-1$
+        substitutionsCache.put(newName, ps);
+        return ps;
     }
 
     /**

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

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

org.talend.designer.business.diagram.nl/plugin_zh_CN.properties

@@ -0,0 +1 @@
+pluginName=\u7EC4\u4EF6\u6A21\u5757

org.talend.designer.business.diagram.nl/src/messages_zh_CN.properties

@@ -0,0 +1,80 @@
+BusinessInitDiagramFileAction.DiagramFile=\u56FE\u8868\u6587\u4EF6
+BusinessAbstractParser.ValueOfLongIsExpected=\u503C\u7684\u7C7B\u578B\u5E94\u8BE5\u4E3ALong
+BusinessAbstractParser.ValueOfFloatIsExpected=\u503C\u7684\u7C7B\u578B\u5E94\u8BE5\u4E3AFloat
+BusinessPaletteFactory.DataComment=\u521B\u5EFA\u65B0\u7684\u6570\u636E
+CreateDiagramAction.CreateBusinessModel=\u521B\u5EFA\u4E1A\u52A1\u6A21\u578B
+BusinessCreationWizardPage.CreatenewBusinessDiagram=\u521B\u5EFA\u65B0\u7684\u903B\u8F91\u56FE\u3002
+BusinessAbstractParser.StringIntegerConvertError=String\u7C7B\u578B\u7684\u503C\u4E0D\u80FD\u8F6C\u6362\u4E3AInteger\u7C7B\u578B
+BusinessPaletteFactory.CreateGear=\u521B\u5EFA\u9F7F\u8F6E
+SimpleBusinessCreationWizardPage.Title=\u65B0\u7684\u4E1A\u52A1\u6A21\u578B
+BusinessNewDiagramFileWizard.CreateNewDiagram=\u521B\u5EFA\u65B0\u7684\u56FE\u8868
+BusinessAbstractParser.UnknownLiteral=\u65E0\u6548\u7684\u6587\u5B57
+BusinessAbstractParser.StringLongConverError=String\u7C7B\u578B\u7684\u503C\u4E0D\u80FD\u8F6C\u6362\u4E3ALong\u7C7B\u578B
+AssignmentPropertySection.DeleteAssignment=\u5220\u9664\u8D4B\u503C
+AssignmentPropertySection.Type=\u7C7B\u578B
+BusinessModelingAssistantProvider.AvaiableDomainModelElements=\u65E0\u6548\u7684\u57DF\u6A21\u578B\u5143\u7D20
+BusinessPaletteFactory.BidirectionalRelationShip=\u53CC\u5411\u5173\u8054
+BusinessPaletteFactory.CreateDirectionalRelationShip=\u521B\u5EFA\u65B9\u5411\u5173\u8054
+BusinessPaletteFactory.CreateBidirectionalRelationShip=\u521B\u5EFA\u53CC\u5411\u5173\u8054
+AssignmentPropertySection.Name=\u540D\u79F0
+CreateAssignmentCommand.CannotAssign=\u4E0D\u80FD\u5206\u914D\u3002
+BusinessNewDiagramFileWizard.DiagramRootElement=\u56FE\u8868\u6839\u5143\u7D20
+BusinessNewDiagramFileWizard.NoDiagramRootElementSelectedError=\u6CA1\u6709\u56FE\u8868\u6839\u5143\u7D20\u88AB\u9009\u4E2D
+BusinessVisualIDRegistry.ParseError=\u4E0D\u80FD\u628A\u89C6\u56FE\u7C7B\u578B\u5F53\u4F5CvisialID\u6570\u5B57\u6765\u8F6C\u6362
+OpenDiagramAction.EditBusinessModel=\u7F16\u8F91\u4E1A\u52A1\u6A21\u578B
+BusinessAbstractParser.ValueOfTypeByteIsExpected=\u503C\u7684\u7C7B\u578B\u5E94\u8BE5\u4E3AByte
+BusinessAbstractParser.ValueOfTypeCharacterIsExpected=\u503C\u7684\u7C7B\u578B\u5E94\u8BE5\u4E3ACharacter
+BusinessPaletteFactory.ActionComment=\u521B\u5EFA\u65B0\u7684\u52A8\u4F5C
+BusinessAbstractParser.ValueOfTypeStringIsExpected=\u503C\u7684\u7C7B\u578B\u5E94\u8BE5\u4E3AString
+BusinessInitDiagramFileAction.Error=\u9519\u8BEF
+BusinessNewDiagramFileWizard.SelectRootElement=\u9009\u62E9\u56FE\u8868\u6839\u5143\u7D20
+RepositoryFactoryProxyLabelProvider.Deleted=\uFF08\u5220\u9664\uFF09
+BusinessPaletteFactory.TerminalComment=\u521B\u5EFA\u65B0\u7684\u4E2D\u65AD\u70B9
+BusinessAbstractParser.ValueOfShortIsExpected=\u503C\u7684\u7C7B\u578B\u5E94\u8BE5\u4E3AShort
+BusinessPaletteFactory.DatabaseComment=\u521B\u5EFA\u65B0\u7684\u6570\u636E\u5E93
+AssignmentPropertySection.Comment=\u6CE8\u91CA
+SimpleBusinessCreationWizard.NewBusinessModel=\u65B0\u7684\u4E1A\u52A1\u578B
+BusinessNewDiagramFileWizard.InvalidDiagramRootElementSelected=\u9009\u4E2D\u4E86\u65E0\u6548\u7684\u56FE\u8868\u6839\u5143\u7D20
+BusinessInitDiagramFileAction.IntialNew=\u521D\u59CB\u5316\u65B0\u7684
+FindAssignmentAction.FindAssignments=\u67E5\u627E\u5206\u914D\u4EFB\u52A1
+RepositoryFactoryProxyLabelProvider.NotFound=\uFF08\u672A\u53D1\u73B0\uFF09
+BusinessPaletteFactory.Terminal=\u4E2D\u65AD\u70B9
+BusinessAbstractParser.InvalidInputAt=\u65E0\u6548\u7684\u8F93\u5165\u5728
+BusinessPaletteFactory.Gear=\u9F7F\u8F6E
+BusinessPaletteFactory.InputComment=\u521B\u5EFA\u65B0\u7684\u8F93\u5165
+BusinessPaletteFactory.Data=\u6570\u636E
+BusinessPaletteFactory.Ellipse=\u692D\u5706
+BusinessPaletteFactory.Input=\u8F93\u5165
+BusinessPaletteFactory.List=\u5217\u8868
+BusinessPaletteFactory.Relationshop=\u5173\u7CFB
+BusinessAbstractParser.ValueOfBooleanIsExpected=\u503C\u7684\u7C7B\u578B\u5E94\u8BE5\u4E3ABoolean
+BusinessPaletteFactory.decision=\u51B3\u7B56
+BusinessPaletteFactory.Document=\u6587\u6863
+BusinessModelingAssistantProvider.SelectDomainModelElement=\u9009\u62E9\u57DF\u6A21\u578B\u5143\u7D20
+BusinessPaletteFactory.CreateActor=\u521B\u5EFA\u89D2\u8272
+BusinessAbstractParser.StringDoubleConvertError=String\u7C7B\u578B\u7684\u503C\u4E0D\u80FD\u8F6C\u6362\u4E3ADoule\u7C7B\u578B
+BusinessPaletteFactory.Actor=\u89D2\u8272
+EditAction.Edit=\u7F16\u8F91\u5206\u914D\u4EFB\u52A1
+BusinessCreationWizardPage.CreateBusinessDiagram=\u521B\u5EFA\u903B\u8F91\u56FE
+BusinessPaletteFactory.Database=\u6570\u636E\u6E90
+BusinessPaletteFactory.ListComment=\u521B\u5EFA\u65B0\u7684\u5217\u8868
+BusinessPaletteFactory.DirectionalRelationShip=\u65B9\u5411\u5173\u8054
+BusinessPaletteFactory.Action=\u52A8\u4F5C
+BusinessPaletteFactory.RelationshopComment=\u521B\u5EFA\u65B0\u7684\u5173\u7CFB
+BusinessInitDiagramFileAction.LoadFaild=\u6A21\u578B\u6587\u4EF6\u88C5\u8F7D\u5931\u8D25
+BusinessPaletteFactory.DecisionComment=\u521B\u5EFA\u65B0\u7684\u51B3\u7B56
+BusinessAbstractParser.ValueOfDoubleIsExpected=\u503C\u7684\u7C7B\u578B\u5E94\u8BE5\u4E3ADouble
+OpenDiagramAction.ReadBusinessModel=\u8BFB\u53D6\u4E1A\u52A1\u6A21\u578B
+BusinessInitDiagramFileAction.UnableToLoadResource=\u4E0D\u80FD\u53BB\u88C5\u8F7D\u8D44\u6E90:
+BusinessPaletteFactory.CreateEllipse=\u521B\u5EFA\u692D\u5706
+BusinessNewDiagramFileWizard.DiagramFile=\u56FE\u8868\u6587\u4EF6
+BusinessAbstractParser.StringShortConverError=String\u7C7B\u578B\u7684\u503C\u4E0D\u80FD\u8F6C\u6362\u4E3AShort\u7C7B\u578B
+BusinessPaletteFactory.DocuemntComment=\u521B\u5EFA\u65B0\u7684\u6587\u6863
+BusinessAbstractParser.ValueOfIntegerIsExpected=\u503C\u7684\u7C7B\u578B\u5E94\u8BE5\u4E3AInteger
+BusinessNewDiagramFileWizard.SelectDiagramRootElement=\u9009\u62E9\u56FE\u8868\u6839\u5143\u7D20\uFF1A
+BusinessNewDiagramFileWizard.SelectSemanticModelElement=\u9009\u62E9\u8981\u5728\u56FE\u8868\u4E0A\u63CF\u8FF0\u7684\u8BED\u4E49\u6A21\u578B\u5143\u7D20
+BusinessAbstractParser.StringFloatConvertError=String\u7C7B\u578B\u7684\u503C\u4E0D\u80FD\u8F6C\u6362\u4E3AFloat\u7C7B\u578B
+BusinessAbstractParser.StringValueDoesNotConvertToByteValue=String\u7C7B\u578B\u7684\u503C\u4E0D\u80FD\u8F6C\u6362\u4E3AByte\u7C7B\u578B
+BusinessNewDiagramFileWizard.IntialNewEcoreDiagramFile=\u521D\u59CB\u5316\u65B0\u7684Ecore\u56FE\u8868\u6587\u4EF6
+BusinessTooltipFigure.assignedMeta={0}\u5206\u914D\u5143\u6570\u636E
+DeleteAssignmentAction.DeleteAssignment=\u5220\u9664\u8D4B\u503C

org.talend.designer.business.diagram/src/messages.properties

@@ -82,3 +82,5 @@ RepositoryFactoryProxyLabelProvider.Deleted=\ (Deleted)
 AssignmentPropertySection.Type=Type
 AssignmentPropertySection.Name=Name
 AssignmentPropertySection.Comment=Comment
+BusinessDiagramEditor.canNotSaveTitle=Warning
+BusinessDiagramEditor.canNotSaveMessage=Business Model is not locked by user, can not save.

org.talend.designer.business.diagram/src/org/talend/designer/business/diagram/custom/actions/SaveAsBusinessModelWizard.java

@@ -13,14 +13,25 @@
 package org.talend.designer.business.diagram.custom.actions;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.EditorPart;
+import org.osgi.framework.FrameworkUtil;
+import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
+import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
 import org.talend.commons.ui.runtime.image.ECoreImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
 import org.talend.core.CorePlugin;
@@ -73,8 +84,8 @@ public class SaveAsBusinessModelWizard extends Wizard {
         RepositoryNode repositoryNode = repositoryEditorInput.getRepositoryNode();
         // see: RepositoryEditorInput.setRepositoryNode(IRepositoryNode repositoryNode)
         if (repositoryNode == null) {
-            repositoryNode = (RepositoryNode) CorePlugin.getDefault().getRepositoryService().getRepositoryNode(
-                    repositoryEditorInput.getItem().getProperty().getId(), false);
+            repositoryNode = (RepositoryNode) CorePlugin.getDefault().getRepositoryService()
+                    .getRepositoryNode(repositoryEditorInput.getItem().getProperty().getId(), false);
         }
 
         IRepositoryService service = DesignerPlugin.getDefault().getRepositoryService();
@@ -120,13 +131,7 @@ public class SaveAsBusinessModelWizard extends Wizard {
             isUpdate = isUpdate();
 
             if (isUpdate) {
-                assginVlaues(oldProperty, property);
-
-                repositoryFactory.save(oldBusinessProcessItem);
-
-                // assign value
-                businessProcessItem = oldBusinessProcessItem;
-
+                update();
             } else {
                 property.setId(repositoryFactory.getNextId());
 
@@ -152,6 +157,34 @@ public class SaveAsBusinessModelWizard extends Wizard {
         return ok;
     }
 
+    private void update() {
+        IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+
+            @Override
+            public void run(IProgressMonitor monitor) throws CoreException {
+                try {
+                    assginVlaues(oldProperty, property);
+
+                    repositoryFactory.save(oldBusinessProcessItem);
+                    // assign value
+                    businessProcessItem = oldBusinessProcessItem;
+                } catch (PersistenceException pe) {
+                    throw new CoreException(new Status(IStatus.ERROR, FrameworkUtil.getBundle(this.getClass()).getSymbolicName(),
+                            "persistance error", pe)); //$NON-NLS-1$
+                }
+            }
+        };
+        IWorkspace workspace = ResourcesPlugin.getWorkspace();
+        try {
+            ISchedulingRule schedulingRule = workspace.getRoot();
+            // the update the project files need to be done in the workspace runnable to avoid all notification
+            // of changes before the end of the modifications.
+            workspace.run(runnable, schedulingRule, IWorkspace.AVOID_UPDATE, null);
+        } catch (CoreException e) {
+            MessageBoxExceptionHandler.process(e.getCause());
+        }
+    }
+
     public BusinessProcessItem getBusinessProcessItem() {
         return this.businessProcessItem;
     }

org.talend.designer.business.diagram/src/org/talend/designer/business/model/business/diagram/part/BusinessDiagramEditor.java

@@ -24,6 +24,7 @@ import org.eclipse.gmf.runtime.diagram.ui.internal.editparts.NoteAttachmentEditP
 import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
 import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.document.StorageDiagramDocumentProvider;
 import org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.editor.FileDiagramEditor;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IEditorInput;
@@ -57,13 +58,16 @@ import org.talend.designer.business.diagram.custom.dnd.BusinessDiagramDropTarget
 import org.talend.designer.business.diagram.custom.edit.parts.BaseBusinessItemRelationShipEditPart;
 import org.talend.designer.business.diagram.custom.edit.parts.BusinessItemShapeEditPart;
 import org.talend.designer.business.diagram.custom.figures.BusinessItemShapeFigure;
+import org.talend.designer.business.diagram.i18n.Messages;
 import org.talend.designer.business.model.business.diagram.edit.parts.BusinessEditPartFactory;
 import org.talend.designer.business.model.business.diagram.edit.parts.BusinessProcessEditPart;
 import org.talend.designer.business.model.business.diagram.providers.BusinessDiagramActionProvider;
 import org.talend.designer.core.ui.ActiveProcessTracker;
 import org.talend.designer.core.ui.views.jobsettings.JobSettingsView;
 import org.talend.repository.editor.RepositoryEditorInput;
+import org.talend.repository.model.ERepositoryStatus;
 import org.talend.repository.model.IProxyRepositoryFactory;
+import org.talend.repository.model.IRepositoryService;
 import org.talend.repository.model.RepositoryNode;
 
 /**
@@ -171,10 +175,29 @@ public class BusinessDiagramEditor extends FileDiagramEditor implements IGotoMar
 
     @Override
     public void doSave(IProgressMonitor progressMonitor) {
-        super.doSave(progressMonitor);
         if (repositoryEditorInput != null) {
-            DiagramResourceManager diagramResourceManager = new DiagramResourceManager();
             BusinessProcessItem businessProcessItem = (BusinessProcessItem) repositoryEditorInput.getItem();
+            IRepositoryService service = CorePlugin.getDefault().getRepositoryService();
+            IProxyRepositoryFactory repFactory = service.getProxyRepositoryFactory();
+            try {
+                repFactory.updateLockStatus();
+                // For TDI-23825, if not lock by user try to lock again.
+                boolean locked = repFactory.getStatus(businessProcessItem) == ERepositoryStatus.LOCK_BY_USER;
+                if (!locked) {
+                    repFactory.lock(businessProcessItem);
+                }
+            } catch (Exception e) {
+                ExceptionHandler.process(e);
+            }
+            ERepositoryStatus status = repFactory.getStatus(businessProcessItem);
+            if (!status.equals(ERepositoryStatus.LOCK_BY_USER) && !repFactory.getRepositoryContext().isEditableAsReadOnly()) {
+                MessageDialog.openWarning(getEditorSite().getShell(),
+                        Messages.getString("BusinessDiagramEditor.canNotSaveTitle"), //$NON-NLS-1$
+                        Messages.getString("BusinessDiagramEditor.canNotSaveMessage")); //$NON-NLS-1$
+                return;
+            }
+            super.doSave(progressMonitor);
+            DiagramResourceManager diagramResourceManager = new DiagramResourceManager();
             diagramResourceManager.updateFromResource(businessProcessItem, repositoryEditorInput.getFile());
             // remove the function of sve SVG file because the imported business model can't save SVG file.
             // saveSVG(businessProcessItem);

org.talend.designer.codegen.nl/plugin_zh_CN.properties

@@ -0,0 +1,2 @@
+pluginName=\u7EC4\u4EF6\u6A21\u5757
+format=\u683C\u5F0F

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

@@ -0,0 +1,45 @@
+CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=JETEmitters\u5DE5\u7A0B\u4E0D\u5B58\u5728\uFF0C\u9700\u8981\u91CD\u65B0\u5B8C\u6574\u521D\u59CB\u5316\u3002
+CodeGeneratorEmittersPoolFactory.Class.NotFound=\u6A21\u677F\u4F9D\u7136\u5B58\u5728\uFF0C\u4F46\u662F\u7C7B{0}
+CodeGeneratorEmittersPoolFactory.PersitentData.Error=\u6301\u4E45\u5316\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58\uFF1A
+CodeGeneratorEmittersPoolFactory.initMessage=\u521D\u59CB\u5316\u4EE3\u7801\u751F\u6210\u5F15\u64CE...
+EmfEmittersPersistence.CodeGen.DataMissing=\u4EE3\u7801\u751F\u6210\u6570\u636E\u6D41\u5931\uFF0C\u5F00\u59CB\u91CD\u65B0\u751F\u6210\u4EE3\u7801\u3002
+CodeGenerator.JET.TimeOut=JET\u521D\u59CB\u5316\u8D85\u65F6\uFF01
+generatedcode.copyright.body4=\u4F60\u53EF\u4EE5\u5728\u5728GNU LGPL \u8BB8\u53EF\u8BC1\u4E0B\u652F\u914D\u8FD9\u4E9B\u4EE3\u7801
+CodeGenerator.Node.NotFound=\u5728\u5F53\u524D
+generatedcode.copyright.body3=\u4F60\u53EF\u4EE5\u5728www.talend.com\u53D1\u73B0\u66F4\u591A\u5173\u4E8ETalend\u4EA7\u54C1\u4FE1\u606F
+generatedcode.copyright.body2=/ \u4F5C\u4E1A\u8BBE\u8BA1 (CodeGenerator version {0}).
+generatedcode.copyright.body1=\u6E90\u4EE3\u7801\u88AB{0}\u81EA\u52A8\u751F\u6210
+JetSkeletonManager.updateProblem=\u5F53\u66F4\u65B0\u6301\u4E45\u6570\u636E\u65F6\u51FA\u73B0\u9519\u8BEF
+CodeGeneratorEmittersPoolFactory.codeThread=\u4EE3\u7801\u751F\u6210\u540E\u53F0\u7EBF\u7A0B
+CodeGeneratorEmittersPoolFactory.componentCompiled=\u7EC4\u4EF6\u7F16\u8BD1{0}\u6BEB\u79D2
+CodeGeneratorEmittersPoolFactory.failCompail=\u7EC4\u4EF6\u7F16\u8BD1\u5931\u8D25: \r\n
+CodeGeneratorEmittersPoolFactory.initialException=\u521D\u59CB\u5316\u5F02\u5E38
+CodeGeneratorEmittersPoolFactory.jetEmitterInitialException=\u521D\u59CB\u5316JetEmitter\u51FA\u9519
+CodeGeneratorService.invalidLanguage1=\u65E0\u6548\u7684\u8BED\u8A00\u7C7B\u578B.
+CodeGeneratorService.invalidLanguage2=\u65E0\u6548\u7684\u8BED\u8A00\u7C7B\u578B.
+CodeGenInit.addMarkers=\u5DE5\u4F5C\u533A\u4E2D\u6DFB\u52A0\u6807\u8BB0
+CodeGenInit.createProject=\u521B\u5EFA{0} \u5DE5\u7A0B
+CodeGenInit.deleteProject=\u5220\u9664{0} \u5DE5\u7A0B
+CodeGenInit.initTemplate=\u521D\u59CB\u5316\u6A21\u677F
+CodeGenInit.removeLink=\u5220\u9664\u94FE\u63A5\u8D44\u6E90
+CodeGenInit.saveWorkspace=\u4FDD\u5B58\u5DE5\u4F5C\u533A
+DocumentRootImpl.mixed=\ (\u6DF7\u5408:
+ComponentsFactory.afterSystemComponent=\u5728\u7CFB\u7EDF\u7EC4\u4EF6
+ComponentsLocalProviderService.componentLoadError=\u7EC4\u4EF6\u52A0\u8F7D\u9519\u8BEF
+ComponentsLocalProviderService.talendExchangeError=Talend Exchange\u9519\u8BEF
+ComponentsPreferencePage.ButtonLabel0=\u786E\u5B9A
+ComponentsPreferencePage.configuration.LINK_STYLE=\u9ED8\u8BA4\u94FE\u63A5\u663E\u793A\u4E3A\uFF1A
+ComponentsPreferencePage.rowLimit=\u884c\u9650\u5236
+ComponentsPreferencePage.WarningTitle=\u8B66\u544A
+ComponenttRunJobPreferencePage.label=\u53CC\u51FBtRunJob\u7EC4\u4EF6\u540E\u4E0D\u663E\u793A\u5BF9\u5E94\u7684JOB
+ComponenttRunJobPreferencePage.showCorrespondingJob=\u53CC\u51FBtRunJob\u7EC4\u4EF6\u540E\u663E\u793A\u5BF9\u5E94JOB
+XsdValidationCacheManager.unableLoadxsd=\u52A0\u8F7Dxsd\u9A8C\u8BC1\u7F13\u5B58\u6587\u4EF6\u5931\u8D25
+XsdValidationCacheManager.unableSavexsd=\u4FDD\u5B58xsd\u9A8C\u8BC1\u7F13\u5B58\u6587\u4EF6\u5931\u8D25
+prefs.configuration.LINK_STYLE.AUTO=\u81EA\u52A8
+FAMILY.Access=Access
+FAMILY.Business=\u4E1A\u52A1
+FAMILY.Business_Intelligence=\u5546\u4E1A\u667A\u80FD
+FAMILY.File=\u6587\u4ef6
+FAMILY.Input=\u8F93\u5165
+FAMILY.Output=\u6807\u51c6\u8f93\u51fa
+FAMILY.System=\u7CFB\u7EDF

org.talend.designer.codegen/resources/camel_header.javajet

@@ -43,7 +43,7 @@
 	List< ? extends INode> processNodes = (List< ? extends INode>)process.getGeneratingNodes();
 %>
 		return new RouteBuilder() {
-			public void configure() throws Exception {
+			public void configure() throws java.lang.Exception {
 <%
 	for (INode node : processNodes) {
 		if (node.getComponent().getName().equals("cCXF")) {

org.talend.designer.codegen/resources/context.javajet

@@ -21,7 +21,7 @@
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     try {
         context.store(baos, "");
-    } catch (Exception e) {
+    } catch (java.lang.Exception e) {
         e.printStackTrace();
     }
 %>

org.talend.designer.codegen/resources/footer.javajet

@@ -387,7 +387,7 @@ this.globalResumeTicket = true;//to run tPreJob
 %>
         try {
             <%=statCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
-        } catch (Exception e) {
+        } catch (java.lang.Exception e) {
             e.printStackTrace();
         }
 <%
@@ -449,7 +449,7 @@ this.globalResumeTicket = false;//to run others jobs
     while (runningThreadCount.getCount() > 0) {
         try {
             Thread.sleep(10);
-        } catch (Exception e) {
+        } catch (java.lang.Exception e) {
             e.printStackTrace();
         }
     }
@@ -512,7 +512,7 @@ this.globalResumeTicket = true;//to run tPostJob
         <%=statCatcherNode.getUniqueName() %>.addMessage(status==""?"end":status, (end-startTime));
         try {
             <%=statCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
-        } catch (Exception e) {
+        } catch (java.lang.Exception e) {
             e.printStackTrace();
         }
 <%
@@ -573,13 +573,26 @@ if (execStat) {
 <%
             }
 %>
-        } catch (Exception e) {
+        } catch (java.lang.Exception e) {
         }
     }
 <%
     }
 %>
 
+    private java.util.Map<String, Object> getJmsConnections() {
+        java.util.Map<String, Object> jmsConnections = new java.util.HashMap<String, Object>();
+<%
+        for (INode momNode : momComponentsList) {
+%>
+            jmsConnections.put("connection_<%=momNode.getUniqueName() %>", globalMap.get("connection_<%=momNode.getUniqueName() %>"));
+            jmsConnections.put("session_<%=momNode.getUniqueName() %>", globalMap.get("session_<%=momNode.getUniqueName() %>"));
+<%
+        }
+%>
+        return jmsConnections;
+    }
+
     private void evalParam(String arg) {
         if (arg.startsWith("--resuming_logs_dir_path")) {
             resuming_logs_dir_path = arg.substring(25);

org.talend.designer.codegen/resources/footer_route.javajet

@@ -29,7 +29,7 @@
 	
 %>
 
-protected void doStart() throws Exception {
+protected void doStart() throws java.lang.Exception {
 		// init uriMap first
 		initUriMap();
 		
@@ -102,7 +102,7 @@ if(librariesSb.length()>0){
 
 	}
 
-	protected void doStop() throws Exception {
+	protected void doStop() throws java.lang.Exception {
 		super.doStop();
 		getCamelContexts().get(0).stop();
 	}
@@ -111,11 +111,11 @@ if(librariesSb.length()>0){
 		return getCamelContexts().get(0).createProducerTemplate();
 	}
 		
-	public void stop() throws Exception {
+	public void stop() throws java.lang.Exception {
 		super.stop();
 	}
 
-	public void shutdown() throws Exception {
+	public void shutdown() throws java.lang.Exception {
 		super.shutdown();
 	}
 	
@@ -149,7 +149,7 @@ if(librariesSb.length()>0){
 		}
 %>
 					Thread.sleep(1000);
-				} catch (Exception e) {
+				} catch (java.lang.Exception e) {
 					e.printStackTrace();
 				}
 			}
@@ -312,7 +312,7 @@ for (IContextParameter ctxParam : params) {
 		
 		try {
 			run();
-		} catch (Exception e) {
+		} catch (java.lang.Exception e) {
 			System.err.println(e.getMessage());
 			e.printStackTrace();
 			return 1;

org.talend.designer.codegen/resources/header.javajet

@@ -307,30 +307,30 @@ public String getExceptionStackTrace() {
 	return null;
 }
 
-private Exception exception = null;
+private java.lang.Exception exception = null;
 
-public Exception getException() {
+public java.lang.Exception getException() {
 	if ("failure".equals(this.getStatus())) {
 		return this.exception;
 	}
 	return null;
 }
 
-private class TalendException extends Exception {
+private class TalendException extends java.lang.Exception {
 
 	private static final long serialVersionUID = 1L;
 
 	private java.util.Map<String, Object> globalMap = null;
-	private Exception e = null;
+	private java.lang.Exception e = null;
 	private String currentComponent = null;
 
-	private TalendException(Exception e, String errorComponent, final java.util.Map<String, Object> globalMap) {
+	private TalendException(java.lang.Exception e, String errorComponent, final java.util.Map<String, Object> globalMap) {
 		this.currentComponent= errorComponent;
 		this.globalMap = globalMap;
 		this.e = e;
 	}
 	
-	public Exception getException() {
+	public java.lang.Exception getException() {
 		return this.e;
 	}
 	
@@ -477,7 +477,7 @@ private class TalendException extends Exception {
 	for (INode node : processNodes) {
 		if (node.isActivate()) {
 			%>
-			public void <%=node.getUniqueName() %>_error(Exception exception, String errorComponent, final java.util.Map<String, Object> globalMap) throws TalendException {
+			public void <%=node.getUniqueName() %>_error(java.lang.Exception exception, String errorComponent, final java.util.Map<String, Object> globalMap) throws TalendException {
 				end_Hash.put("<%=node.getUniqueName() %>", System.currentTimeMillis());
 				<%
 				boolean ifBeforRunError = NodeUtil.checkComponentErrorConnectionAfterNode(node);
@@ -540,7 +540,7 @@ private class TalendException extends Exception {
 							}
 							%>
 
-						} catch (Exception e) {
+						} catch (java.lang.Exception e) {
 							e.printStackTrace();
 						}
 						<%
@@ -611,7 +611,7 @@ private class TalendException extends Exception {
 	for (INode node : processNodes) {
 		if (node.isDesignSubjobStartNode()) {
 %>
-			public void <%=node.getUniqueName() %>_onSubJobError(Exception exception, String errorComponent, final java.util.Map<String, Object> globalMap) throws TalendException {
+			public void <%=node.getUniqueName() %>_onSubJobError(java.lang.Exception exception, String errorComponent, final java.util.Map<String, Object> globalMap) throws TalendException {
 <%
 			List< ? extends IConnection> conns = node.getOutgoingConnections();
 			int count = 0;
@@ -661,7 +661,7 @@ resumeUtil.addLog("SYSTEM_LOG", "NODE:"+ errorComponent, "", Thread.currentThrea
 <%
 					}
 %>
-				} catch (Exception e) {
+				} catch (java.lang.Exception e) {
 					e.printStackTrace();
 				}
 <%

org.talend.designer.codegen/resources/iterate_subprocess_footer.javajet

@@ -58,7 +58,7 @@ if(execStat){
 <%
 				}
 %>
-			} catch (Exception e) {
+			} catch (java.lang.Exception e) {
 					this.status = "failure";
 					Integer localErrorCode = (Integer) (((java.util.Map) threadLocal.get()).get("errorCode"));
 					if (localErrorCode != null) {

org.talend.designer.codegen/resources/iterate_subprocess_header.javajet

@@ -203,7 +203,7 @@ if(execStat){
 				for (IConnection inLineConn : allInLineJobConns) {
 %>
 if(execStat){				
-           			runStat.updateStatOnConnection("<%=inLineConn.getUniqueName() %>", 3, "exec" + NB_ITERATE_<%=iterateNodeName %>);
+           			runStat.updateStatOnConnection("<%=inLineConn.getUniqueName() %>", 3, 0);
 }           			
 <%        		
 				}

org.talend.designer.codegen/resources/subprocess_footer.javajet

@@ -36,7 +36,7 @@
 	if(isParallelize){
 %>
 
-					} catch (Exception e) {
+					} catch (java.lang.Exception e) {
 						this.status = "failure";
 						Integer localErrorCode = (Integer) (((java.util.Map) threadLocal.get()).get("errorCode"));
 						if (localErrorCode != null) {
@@ -84,7 +84,7 @@
 			}
 		} catch (InterruptedException e) {
 			e.printStackTrace();
-		} catch (Exception te) {
+		} catch (java.lang.Exception te) {
 			throw new TalendException(te, currentComponent, globalMap);
 		}
 <%
@@ -204,7 +204,7 @@
 %>
 
 	
-	} catch(Exception e) {	
+	} catch(java.lang.Exception e) {	
 
 		throw new TalendException(e, currentComponent, globalMap);
 	

org.talend.designer.codegen/resources/subprocess_header.javajet

@@ -134,8 +134,12 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		if (metadata !=null) {
 			for (IMetadataColumn column: metadata.getListColumns()) {
    				JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
+   				String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
+   				if("id_Document".equals(javaType.getId())) {
+   					typeToGenerate = javaType.getNullableClass().getCanonicalName();
+   				}
 			    %>
-			    public <%= JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable()) %> <%=column.getLabel() %><%
+			    public <%= typeToGenerate %> <%=column.getLabel() %><%
 			    	
 			    	if(javaType == JavaTypesManager.CHARACTER && !column.isNullable()) {
 			    		%> = ' '<%
@@ -143,11 +147,11 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 			    	
 			    	%>;
 
-				public <%= JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable()) %> get<%=column.getLabel().substring(0, 1).toUpperCase()%><%=column.getLabel().substring(1)%> () {
+				public <%= typeToGenerate %> get<%=column.getLabel().substring(0, 1).toUpperCase()%><%=column.getLabel().substring(1)%> () {
 					return this.<%=column.getLabel()%>;
 				}
 				<%
-				if("id_Document".equals(javaType.getId())) {
+				if((conn.getLineStyle() == EConnectionType.FLOW_REF) && conn.getTarget().getUniqueName().startsWith("tXMLMap") && "id_Document".equals(javaType.getId())) {
 				%>
 				public java.util.Map<String,Object> documentLookupResult =  new java.util.HashMap<String,Object>();
 				<%
@@ -560,6 +564,9 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 					<%
 				} else if(javaType.isObjectBased() || typeToGenerate.equals("Geometry") || typeToGenerate.equals("Dynamic")) {
 			 		hasAtLeastOneObjectType = true;
+			 		if("id_Document".equals(javaType.getId())) {
+			 			typeToGenerate = javaType.getNullableClass().getCanonicalName();
+			 		}
 					%>
 						this.<%=column.getLabel() %> = (<%= typeToGenerate %>) dis.readObject();
 					<%
@@ -733,6 +740,9 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 					<%
 				} else if(typeToGenerate.equals("Object") || typeToGenerate.equals("Geometry") || typeToGenerate.equals("BigDecimal") || typeToGenerate.equals("List") || typeToGenerate.equals("Dynamic") || typeToGenerate.equals("Document")) {
 			 		hasAtLeastOneObjectType = true;
+			 		if("id_Document".equals(javaType.getId())) {
+			 			typeToGenerate = javaType.getNullableClass().getCanonicalName();
+			 		}
 					%>
        			    	this.<%=column.getLabel() %> = (<%= typeToGenerate %>) ois.readObject();
 					<%
@@ -1005,7 +1015,7 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
 				
 	try {
 	
-			String currentMethodName = new Exception().getStackTrace()[0].getMethodName();
+			String currentMethodName = new java.lang.Exception().getStackTrace()[0].getMethodName();
 			boolean resumeIt = currentMethodName.equals(resumeEntryMethodName);
 			if( resumeEntryMethodName == null || resumeIt || globalResumeTicket){//start the resume
 				globalResumeTicket = true;

org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/components/model/UserComponentsProvider.java

@@ -16,6 +16,8 @@ import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
 import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.FileLocator;
@@ -97,9 +99,11 @@ public class UserComponentsProvider extends AbstractComponentsProvider {
 
         // synchroniz shared custom component
         if (PluginChecker.isSVNProviderPluginLoaded()) {
-            Project currentProject = ProjectManager.getInstance().getCurrentProject();
-            if (currentProject != null) {
-                String projectLabel = currentProject.getTechnicalLabel();
+            Set<Project> allProjects = new HashSet<Project>();
+            allProjects.add(ProjectManager.getInstance().getCurrentProject());
+            allProjects.addAll(ProjectManager.getInstance().getReferencedProjects());
+            for (Project project : allProjects) {
+                String projectLabel = project.getTechnicalLabel();
                 String sourcePath = new Path(Platform.getInstanceLocation().getURL().getPath()).toFile().getPath()
                         + File.separatorChar + projectLabel + File.separatorChar
                         + ERepositoryObjectType.getFolderName(ERepositoryObjectType.COMPONENTS);

org.talend.designer.components.exchange.nl/plugin_zh_CN.properties

@@ -0,0 +1,2 @@
+DownloadComponenentsAction.Label=\u4E0B\u8F7D\u9009\u62E9\u7684\u7EC4\u4EF6
+RefreshComponenentsAction.Label=\u5237\u65B0\u7EC4\u4EF6\u6E05\u5355

org.talend.designer.components.exchange.nl/src/main/java/messages_nl.properties

@@ -1,7 +1,13 @@
+AvailableExtensionsComposite.Version=Versie
 DownloadedExtensionsComposite.updateOperateStatus=Update
+MyExtensionsComposite.Version=Versie
 MyExtensionsComposite.UpdateOperateStatus=Update
 MyExtensionsComposite.ModifyOperateStatus=Wijzigen
 MyExtensionsComposite.DeleteOperateStatus=Verwijderen
+MyExtensionsComposite.Form.Compatibility.Version=Versie
 MyExtensionsComposite.Form.Upload.Browse=Blader...
 RefreshJob.FindExtensions.Title=Beschikbare extensies zoeken
 RefreshJob.FindExtensions.Message=Extensies zoeken op Exchange...
+UploadRevisionJob.Title=Upload Revisie...
+UploadRevisionJob.Message=Upload Revisie...
+UploadRevisionAction.InstalledFailure=Upload Revisie gefaald.

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

@@ -0,0 +1,25 @@
+AvailableExtensionsComposite.ExtensionName=\u6269\u5C55\u540D
+AvailableExtensionsComposite.Version=\u7248\u672C
+AvailableExtensionsComposite.Author=\u4F5C\u8005
+AvailableExtensionsComposite.FilterTitle=\u8FC7\u6EE4
+DownloadedExtensionsComposite.ExtensionName=\u6269\u5C55\u540D
+DownloadedExtensionsComposite.installedOperateStatus=\u5DF2\u88C5\u8F7D
+DownloadedExtensionsComposite.updateOperateStatus=\u66F4\u65B0
+MyExtensionsComposite.ExtensionName=\u6269\u5C55\u540D
+MyExtensionsComposite.Version=\u7248\u672C
+MyExtensionsComposite.UpdateOperateStatus=\u66F4\u65B0
+MyExtensionsComposite.DeleteOperateStatus=\u5220\u9664
+MyExtensionsComposite.Form.Compatibility.Version=\u7248\u672C
+MyExtensionsComposite.Form.Description=\u5FC5\u8981\u7684
+MyExtensionsComposite.Form.Upload.Browse=\u6D4F\u89C8...
+DownloadComponenentsAction.DownloadTaskName=\u4ECEURL\u4E0B\u8F7D\u6587\u4EF6
+ImportExchangeDialog.dialogTitle=\u4ECETalend Exchange\u9009\u62E9\u4E00\u4E2A\u9879\u76EE
+ImportExchangeDialog.WARNING=\u8B66\u544A
+ImportExchangeDialog.EXTENSION_NAME=\u6269\u5C55\u540D
+ImportExchangeDialog.LATEST_REVISION=\u6700\u65B0\u7248\u672C
+ImportExchangeDialog.JOB_BUTTON=\u4F5C\u4E1A\u8BBE\u8BA1
+ImportExchangeDialog.DOWNLOAD_JOB=\u4E0B\u8F7D\u4F5C\u4E1A\u8BBE\u8BA1
+ImportExchangeDialog.ROUTINES_BUTTON=\u5E38\u89C4
+ImportExchangeDialog.TEMPLATES_PROGRESSBAR=\u4E0B\u8F7DSQL\u6A21\u677F......
+ImportExchangeDialog.REFRESH_BUTTON=\u5237\u65B0
+ImportExchangeDialog.OPERATION_CANCELLED=\u64CD\u4F5C\u5DF2\u53D6\u6D88

org.talend.designer.components.exchange/src/main/java/org/talend/designer/components/exchange/ui/htmlcontent/DownloadExtensionProvider.java

@@ -234,7 +234,7 @@ public class DownloadExtensionProvider implements IIntroXHTMLContentProvider {
                             String url = "http://org.eclipse.ui.intro/runAction?pluginId=org.talend.designer.components.exchange&"
                                     + "class=org.talend.designer.components.exchange.ui.actions.UpdateAction&"
                                     + "id=org.talend.designer.components.exchange.ui.actions.UpdateAction&"
-                                    + AvailableCompositeProvider.NUMBER + count;
+                                    + AvailableCompositeProvider.NUMBER + "=" + count;
                             ;
                             hyperlink.setAttribute("href", url);
                             Text view = dom.createTextNode(Messages

org.talend.designer.components.libs/libs_src/talend_file_enhanced_20070724/org/talend/fileprocess/TOSDelimitedReader.java

@@ -2,7 +2,7 @@
 //
 // Talend Community Edition
 //
-// Copyright (C) 2006-2012 Talend - www.talend.com
+// Copyright (C) 2006-2013 Talend - www.talend.com
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -565,6 +565,14 @@ public class TOSDelimitedReader {
             if (readCount < maxReadLength) {
                 if (readCount == -1) {
                     streamEndMeet = true;
+                } else {
+                    if(inputStream.markSupported()) {
+                        inputStream.mark(1);
+                        if(inputStream.read() == -1) {
+                            streamEndMeet = true;
+                        }
+                        inputStream.reset();
+                    }
                 }
             }
 

org.talend.designer.components.localprovider/components/tAS400Close/tAS400Close_messages_zh_CN.properties

@@ -0,0 +1 @@
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAS400Commit/tAS400Commit_messages_zh_CN.properties

@@ -0,0 +1,3 @@
+CLOSE.NAME=\u5173\u95ed\u8fde\u63a5
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAS400Connection/tAS400Connection_messages_zh_CN.properties

@@ -0,0 +1,14 @@
+DBNAME.NAME=\u6570\u636e\u5e93
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+NB_LINE.NAME=\u884c\u6570
+NULL_CHAR.NAME=Null\u5b57\u7b26
+PASS.NAME=\u5bc6\u7801
+PORT.NAME=\u7aef\u53e3
+USER.NAME=\u7528\u6237\u540D
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+SHARED_CONNECTION_NAME.NAME=\u5171\u4EAB\u6570\u636E\u5E93\u8FDE\u63A5\u540D
+AUTO_COMMIT.NAME=\u81EA\u52A8\u63D0\u4EA4
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b

org.talend.designer.components.localprovider/components/tAS400Input/tAS400Input_messages_zh_CN.properties

@@ -0,0 +1,19 @@
+DBNAME.NAME=\u6570\u636e\u5e93
+HOST.NAME=\u4e3b\u673a
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+PASS.NAME=\u5bc6\u7801
+QUERY.NAME=\u67e5\u8be2
+QUERYSTORE.NAME=\u67e5\u8be2\u7c7b\u578b
+SCHEMA_DB.NAME=\u67B6\u6784
+USER.NAME=\u7528\u6237\u540D
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+TRIM_COLUMN.ITEM.TRIM=\u6574\u7406\u7A7A\u683C
+TABLE.NAME=\u8868
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+GUESS_SCHEMA.NAME=\u8BA1\u7B97schema
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+SCHEMA.NAME=\u67B6\u6784
+ENCODING.NAME=\u7f16\u7801
+MAPPING.NAME=\u6620\u5c04

org.talend.designer.components.localprovider/components/tAS400LastInsertId/tAS400LastInsertId_messages_zh_CN.properties

@@ -0,0 +1,2 @@
+SCHEMA.NAME=\u67B6\u6784
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAS400Output/tAS400Output_messages_zh_CN.properties

@@ -0,0 +1,46 @@
+ADD_COLS.ITEM.DATATYPE=\u6570\u636e\u7c7b\u578b
+ADD_COLS.ITEM.NAME=\u540d\u79f0
+ADD_COLS.ITEM.OPERATOR=\u64cd\u4f5c
+ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=>=
+ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=>=
+ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=>=
+ADD_COLS.ITEM.POS=\u4f4d\u7f6e
+ADD_COLS.ITEM.POS.ITEM.AFTER=\u4e4b\u540e
+ADD_COLS.ITEM.POS.ITEM.BEFORE=\u4e4b\u524d
+ADD_COLS.ITEM.POS.ITEM.REPLACE=\u66ff\u4ee3
+ADD_COLS.ITEM.REFCOL=\u76f8\u5173\u7684\u5217
+ADD_COLS.ITEM.SQL=SQL\u8868\u8fbe\u5f0f
+ADD_COLS.NAME=\u9644\u52a0\u5217
+CLEAR_TABLE.NAME=\u6e05\u9664\u8868\u4e2d\u7684\u6570\u636e
+COMMIT_EVERY.NAME=\u63d0\u4ea4\u95f4\u9694
+DATA_ACTION.ITEM.DELETE=\u5220\u9664
+DATA_ACTION.ITEM.INSERT=\u63D2\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u63d2\u5165\u6216\u66f4\u65b0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66f4\u65b0\u6216\u63d2\u5165
+DATA_ACTION.NAME=\u6570\u636E\u64CD\u4F5C
+DBNAME.NAME=\u6570\u636e\u5e93
+DIE_ON_ERROR.NAME=\u9519\u8bef\u65f6\u7ec8\u6b62
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+NB_LINE.NAME=\u884c\u6570
+PASS.NAME=\u5bc6\u7801
+QUERY.NAME=\u67e5\u8be2
+SCHEMA_FLOW.NAME=\u67B6\u6784
+TABLE.NAME=\u8868
+TABLE_ACTION.ITEM.CLEAR=\u6E05\u9664\u8868\u4E2D\u6570\u636E
+TABLE_ACTION.ITEM.CREATE=\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5982\u679C\u8868\u4E0D\u5B58\u5728\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.DROP_CREATE=\u5220\u9664\u5E76\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5982\u679c\u8868\u5b58\u5728\u5220\u9664\u7136\u540e\u521b\u5efa
+TABLE_ACTION.ITEM.NONE=\u65E0
+TABLE_ACTION.NAME=\u8868\u64CD\u4F5C
+USER.NAME=\u7528\u6237\u540D
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+ENABLE_DEBUG_MODE.NAME=\u542F\u7528\u8C03\u8BD5\u6A21\u5F0F
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+MAPPING.NAME=\u6620\u5c04
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAS400Rollback/tAS400Rollback_messages_zh_CN.properties

@@ -0,0 +1,3 @@
+CLOSE.NAME=\u5173\u95ed\u8fde\u63a5
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAS400Row/tAS400Row_java.xml

@@ -25,7 +25,7 @@
 
   <CONNECTORS>
     <CONNECTOR CTYPE="FLOW" MAX_INPUT="1" MAX_OUTPUT="1"/>
-    <CONNECTOR NAME="REJECT" CTYPE="FLOW" MAX_INPUT="0" MAX_OUTPUT="1" LINE_STYLE="2" COLOR="FF0000" BASE_SCHEMA="FLOW" />
+    <CONNECTOR NAME="REJECT" NOT_SHOW_IF="(DIE_ON_ERROR == 'true')" CTYPE="FLOW" MAX_INPUT="0" MAX_OUTPUT="1" LINE_STYLE="2" COLOR="FF0000" BASE_SCHEMA="FLOW" />
     <CONNECTOR CTYPE="ITERATE" MAX_OUTPUT="1" MAX_INPUT="1"/>
     <CONNECTOR CTYPE="SUBJOB_OK" MAX_INPUT="1" />
     <CONNECTOR CTYPE="SUBJOB_ERROR" MAX_INPUT="1" />

org.talend.designer.components.localprovider/components/tAS400Row/tAS400Row_main.javajet

@@ -131,7 +131,7 @@ try {
 		}
 	}
 %>
-    } catch (Exception e) {
+    } catch (java.lang.Exception e) {
         whetherReject_<%=cid%> = true;
         <%
         if (("true").equals(dieOnError)) {

org.talend.designer.components.localprovider/components/tAS400Row/tAS400Row_messages_zh_CN.properties

@@ -0,0 +1,21 @@
+COMMIT_EVERY.NAME=\u63d0\u4ea4\u95f4\u9694
+DBD-DB2.INFO=\u5fc5\u987b\u7684
+DBNAME.NAME=\u6570\u636e\u5e93
+DIE_ON_ERROR.NAME=\u9519\u8bef\u65f6\u7ec8\u6b62
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+NB_LINE.NAME=\u884c\u6570
+PASS.NAME=\u5bc6\u7801
+QUERY.NAME=\u67e5\u8be2
+SCHEMA_DB.NAME=\u67B6\u6784
+USER.NAME=\u7528\u6237\u540D
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+TABLE.NAME=\u8868
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868
+SCHEMA_FLOW.NAME=\u67B6\u6784
+QUERYSTORE.NAME=\u67e5\u8be2\u7c7b\u578b
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u65f6\u95f4

org.talend.designer.components.localprovider/components/tAccessBulkExec/tAccessBulkExec_messages_zh_CN.properties

@@ -0,0 +1,19 @@
+ENCODING.NAME=\u7f16\u7801
+NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
+PASS.NAME=\u5bc6\u7801
+TABLE.NAME=\u540E\u8FD0\u884C
+TABLE_ACTION.NAME=\u8868\u64CD\u4F5C
+TABLE_ACTION.ITEM.CLEAR=\u6E05\u9664\u8868\u4E2D\u6570\u636E
+TABLE_ACTION.ITEM.CREATE=\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5982\u679C\u8868\u4E0D\u5B58\u5728\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.DROP_CREATE=\u5220\u9664\u5E76\u521B\u5EFA\u8868
+DATA_ACTION.NAME=\u6570\u636E\u64CD\u4F5C
+DATA_ACTION.ITEM.INSERT=\u63D2\u5165
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+MAPPING.NAME=\u6620\u5c04
+SCHEMA.NAME=\u67B6\u6784
+NOTE.NAME=\u8282\u70b9
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+INCLUDEHEADER.NAME=\u52A0\u5165\u5934\u90E8\u5206
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5

org.talend.designer.components.localprovider/components/tAccessClose/tAccessClose_messages_zh_CN.properties

@@ -0,0 +1 @@
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAccessCommit/tAccessCommit_messages_zh_CN.properties

@@ -0,0 +1,2 @@
+CLOSE.NAME=\u5173\u95ED\u8FDE\u63A5
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAccessConnection/tAccessConnection_messages_zh_CN.properties

@@ -0,0 +1,8 @@
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+PASS.NAME=\u5bc6\u7801
+PORT.NAME=\u7aef\u53e3
+SHARED_CONNECTION_NAME.NAME=\u5171\u4EAB\u6570\u636E\u5E93\u8FDE\u63A5\u540D
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c

org.talend.designer.components.localprovider/components/tAccessInput/tAccessInput_messages_zh_CN.properties

@@ -0,0 +1,17 @@
+DBNAME.NAME=\u6570\u636e\u5e93
+ENCODING.NAME=\u7f16\u7801
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+PASS.NAME=\u5bc6\u7801
+QUERY.NAME=\u67e5\u8be2
+QUERYSTORE.NAME=\u67e5\u8be2\u7c7b\u578b
+SCHEMA.NAME=\u67B6\u6784
+USER.NAME=\u7528\u6237\u540D
+TABLE.NAME=\u8868
+TRIM_COLUMN.ITEM.TRIM=\u6574\u7406\u7A7A\u683C
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+GUESS_SCHEMA.NAME=\u8BA1\u7B97schema
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+MAPPING.NAME=\u6620\u5c04
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAccessOutput/tAccessOutput_main.javajet

@@ -140,7 +140,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
             	insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
             	nb_line_<%=cid%>++;
-            } catch(Exception e) {
+            } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
                 if (("true").equals(dieOnError)) {
@@ -225,7 +225,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
             	updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
             	nb_line_<%=cid%>++;
-            } catch(Exception e) {
+            } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
                 if (("true").equals(dieOnError)) {
@@ -336,7 +336,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try {
     				updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
-                } catch(Exception e) {
+                } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
                     <%
                     if (("true").equals(dieOnError)) {
@@ -389,7 +389,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try{
         			insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
-                } catch(Exception e) {
+                } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
                     <%
                     if (("true").equals(dieOnError)) {
@@ -478,7 +478,7 @@ skeleton="../templates/db_output_bulk.skeleton"
              try {
                  updateFlag_<%=cid%>=pstmtUpdate_<%=cid %>.executeUpdate();
                  updatedCount_<%=cid%> = updatedCount_<%=cid%>+updateFlag_<%=cid%>;
-             } catch(Exception e) {
+             } catch(java.lang.Exception e) {
                  whetherReject_<%=cid%> = true;
                  <%
                  if (("true").equals(dieOnError)) {
@@ -536,7 +536,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                  %>
                  try {
         			insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
-                 } catch(Exception e) {
+                 } catch(java.lang.Exception e) {
                      whetherReject_<%=cid%> = true;
                      <%
                      if (("true").equals(dieOnError)) {
@@ -607,7 +607,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     		%>
             try {
                 deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
-            } catch(Exception e) {
+            } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
                 if (("true").equals(dieOnError)) {

org.talend.designer.components.localprovider/components/tAccessOutput/tAccessOutput_messages_zh_CN.properties

@@ -0,0 +1,44 @@
+ADD_COLS.ITEM.NAME=\u540d\u79f0
+ADD_COLS.ITEM.DATATYPE=\u6570\u636e\u7c7b\u578b
+ADD_COLS.ITEM.POS=\u4f4d\u7f6e
+ADD_COLS.ITEM.POS.ITEM.AFTER=\u4e4b\u540e
+ADD_COLS.ITEM.POS.ITEM.BEFORE=\u4e4b\u524d
+ADD_COLS.ITEM.POS.ITEM.REPLACE=\u66ff\u4ee3
+ADD_COLS.ITEM.REFCOL=\u76f8\u5173\u7684\u5217
+ADD_COLS.ITEM.SQL=SQL\u8868\u8fbe\u5f0f
+ADD_COLS.NAME=\u9644\u52a0\u5217
+CLEAR_TABLE.NAME=\u6e05\u9664\u8868\u4e2d\u7684\u6570\u636e
+COMMIT_EVERY.NAME=\u63d0\u4ea4\u95f4\u9694
+DATA_ACTION.ITEM.DELETE=\u5220\u9664
+DATA_ACTION.ITEM.INSERT=\u63D2\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u63d2\u5165\u6216\u66f4\u65b0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66f4\u65b0\u6216\u63d2\u5165
+DATA_ACTION.NAME=\u6570\u636E\u64CD\u4F5C
+DBNAME.NAME=\u6570\u636e\u5e93
+DIE_ON_ERROR.NAME=\u9519\u8bef\u65f6\u7ec8\u6b62
+ENCODING.NAME=\u7f16\u7801
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+PASS.NAME=\u5bc6\u7801
+QUERY.NAME=\u67e5\u8be2
+SCHEMA_FLOW.NAME=\u67B6\u6784
+TABLE.NAME=\u8868
+USER.NAME=\u7528\u6237\u540D
+TABLE_ACTION.ITEM.CLEAR=\u6E05\u9664\u8868\u4E2D\u6570\u636E
+TABLE_ACTION.ITEM.CREATE=\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5982\u679c\u8868\u5b58\u5728\u5220\u9664\u7136\u540e\u521b\u5efa
+TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5982\u679C\u8868\u4E0D\u5B58\u5728\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.DROP_CREATE=\u5220\u9664\u5E76\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.NONE=\u65E0
+TABLE_ACTION.NAME=\u8868\u64CD\u4F5C
+ADD_COLS.ITEM.OPERATOR=\u64cd\u4f5c
+ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=\u5B9E\u6570\u7EDD\u5BF9\u503C
+ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=>=
+ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=>=
+ENABLE_DEBUG_MODE.NAME=\u542F\u7528\u8C03\u8BD5\u6A21\u5F0F
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+MAPPING.NAME=\u6620\u5c04
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAccessOutputBulk/tAccessOutputBulk_messages_zh_CN.properties

@@ -0,0 +1,6 @@
+APPEND.NAME=\u8FFD\u52A0
+ENCODING.NAME=\u7f16\u7801
+INCLUDEHEADER.NAME=\u52A0\u5165\u5934\u90E8\u5206
+SCHEMA.NAME=\u67B6\u6784
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+CREATE.NAME=\u76EE\u5F55\u4E0D\u5B58\u5728\u65F6\u521B\u5EFA\u76EE\u5F55

org.talend.designer.components.localprovider/components/tAccessOutputBulkExec/tAccessOutputBulkExec_messages_zh_CN.properties

@@ -0,0 +1,24 @@
+APPEND.NAME=\u8FFD\u52A0
+DBNAME.NAME=\u6570\u636e\u5e93\u540d
+DB_SCHEMA.NAME=\u67B6\u6784
+INCLUDEHEADER.NAME=\u52A0\u5165\u5934\u90E8\u5206
+PASS.NAME=\u5bc6\u7801
+ROWSEPARATOR.NAME=\u884c\u5206\u9694\u7b26
+RUN_IF.MENU=\u6B63\u5E38\u65F6\u8FD0\u884C
+SCHEMA.NAME=\u67B6\u6784
+TABLE.NAME=\u540E\u8FD0\u884C
+TABLE_ACTION.ITEM.CLEAR=\u6E05\u9664\u8868\u4E2D\u6570\u636E
+TABLE_ACTION.ITEM.CREATE=\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5982\u679C\u8868\u4E0D\u5B58\u5728\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.DROP_CREATE=\u5220\u9664\u5E76\u521B\u5EFA\u8868
+TABLE_ACTION.NAME=\u8868\u64CD\u4F5C
+CODE_PAGE.NAME=\u4EE3\u7801\u9875
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+MAPPING.NAME=\u6620\u5c04
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868
+ENCODING.NAME=\u7f16\u7801
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+DATA_ACTION.NAME=\u6570\u636E\u64CD\u4F5C
+DATA_ACTION.ITEM.INSERT=\u63D2\u5165
+CREATE.NAME=\u76EE\u5F55\u4E0D\u5B58\u5728\u65F6\u521B\u5EFA\u76EE\u5F55
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5

org.talend.designer.components.localprovider/components/tAccessRollback/tAccessRollback_messages_zh_CN.properties

@@ -0,0 +1,2 @@
+CLOSE.NAME=\u5173\u95ED\u8FDE\u63A5
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAccessRow/tAccessRow_java.xml

@@ -15,7 +15,7 @@
 
 	<CONNECTORS>
 		<CONNECTOR CTYPE="FLOW" MAX_INPUT="1" MAX_OUTPUT="1"/>
-		<CONNECTOR NAME="REJECT" CTYPE="FLOW" MAX_INPUT="0"
+		<CONNECTOR NAME="REJECT" NOT_SHOW_IF="(DIE_ON_ERROR == 'true')" CTYPE="FLOW" MAX_INPUT="0"
 			MAX_OUTPUT="1" LINE_STYLE="2" COLOR="FF0000" BASE_SCHEMA="FLOW" />
 		<CONNECTOR CTYPE="ITERATE" MAX_OUTPUT="1" MAX_INPUT="1" />
 		<CONNECTOR CTYPE="SUBJOB_OK" MAX_INPUT="1" />

org.talend.designer.components.localprovider/components/tAccessRow/tAccessRow_main.javajet

@@ -135,7 +135,7 @@ whetherReject_<%=cid%> = false;
 		}
 	}
 %>
-    } catch (Exception e) {
+    } catch (java.lang.Exception e) {
         whetherReject_<%=cid%> = true;
         <%
         if (("true").equals(dieOnError)) {

org.talend.designer.components.localprovider/components/tAccessRow/tAccessRow_messages_zh_CN.properties

@@ -0,0 +1,17 @@
+COMMIT_EVERY.NAME=\u63d0\u4ea4\u95f4\u9694
+DBNAME.NAME=\u6570\u636e\u5e93
+TABLE.NAME=\u8868
+DIE_ON_ERROR.NAME=\u9519\u8bef\u65f6\u7ec8\u6b62
+ENCODING.NAME=\u7f16\u7801
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+PASS.NAME=\u5bc6\u7801
+QUERY.NAME=\u67e5\u8be2
+SCHEMA_DB.NAME=\u67B6\u6784
+USER.NAME=\u7528\u6237\u540D
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+SCHEMA.NAME=\u67B6\u6784
+QUERYSTORE.NAME=\u67e5\u8be2\u7c7b\u578b
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u65f6\u95f4
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAddCRCRow/tAddCRCRow_messages_zh_CN.properties

@@ -0,0 +1,3 @@
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+FIELDSEPARATOR.NAME=\u5206\u5272\u7b26
+NB_LINE.NAME=\u884c\u6570

org.talend.designer.components.localprovider/components/tAddLocationFromIP/tAddLocationFromIP_messages_zh_CN.properties

@@ -0,0 +1,8 @@
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+DATABASE_FILEPATH.NAME=\u6570\u636E\u5E93\u8DEF\u5F84
+INPUT.NAME=\u8F93\u5165\u53C2\u6570
+INPUT_COLUMN.NAME=\u8F93\u5165\u5217
+INPUT_HOST_NAME.NAME=\u8F93\u5165\u503C\u4E3A\u4E3B\u673A\u540D
+INPUT_IP.NAME=\u8F93\u5165\u503C\u4E3AIP\u5730\u5740
+LOCATION_TYPE_CODE.NAME=\u56FD\u522B\u7801
+LOCATION_TYPE_NAME.NAME=\u56FD\u5BB6

org.talend.designer.components.localprovider/components/tAdvancedFileOutputXML/tAdvancedFileOutputXML_begin.javajet

@@ -137,7 +137,7 @@ if ((metadatas != null) && (metadatas.size() > 0)) {
 					try {
 						org.dom4j.Document doc4Str = org.dom4j.DocumentHelper.parseText("<root>"+ value + "</root>");
 						nestRoot.setContent(doc4Str.getRootElement().content());
-					} catch (Exception e) {
+					} catch (java.lang.Exception e) {
 						//    		e.printStackTrace();
 						nestRoot.setText(value);
 					}
@@ -216,9 +216,9 @@ if ((metadatas != null) && (metadatas.size() > 0)) {
 						org.dom4j.io.SAXReader saxReader_<%=cid %>= new org.dom4j.io.SAXReader();
 						doc_<%=cid %> = saxReader_<%=cid %>.read(createFile<%=cid %>);
 						nestXMLTool_<%=cid%>.removeWhiteSpaceTextNode(doc_<%=cid %>.getRootElement());
-					} catch (Exception ex) {
+					} catch (java.lang.Exception ex) {
 						ex.printStackTrace();
-						throw new Exception("can not find the file:" + fileName_<%=cid %>);
+						throw new java.lang.Exception("can not find the file:" + fileName_<%=cid %>);
 					}
 				} else {
 					doc_<%=cid %>=org.dom4j.DocumentHelper.createDocument();

org.talend.designer.components.localprovider/components/tAdvancedFileOutputXML/tAdvancedFileOutputXML_messages_en.properties

@@ -50,3 +50,4 @@ XSL_HREF.NAME=Href
 ADD_EMPTY_ATTRIBUTE.NAME=Create attribute even if its value is NULL
 ADD_UNMAPPED_ATTRIBUTE.NAME=Create attribute even if it is unmapped
 TRIM.NAME=Trim data
+SCHEMA_OPT_NUM.NAME=Min column number of optimize code

org.talend.designer.components.localprovider/components/tAdvancedFileOutputXML/tAdvancedFileOutputXML_messages_zh_CN.properties

@@ -0,0 +1,32 @@
+ADVANCED_SEPARATOR.NAME=\u6570\u503c\u5206\u9694\u7b26
+CREATE.NAME=\u76EE\u5F55\u4E0D\u5B58\u5728\u65F6\u521B\u5EFA\u76EE\u5F55
+CREATE_EMPTY_ELEMENT.NAME=\u5982\u679C\u9700\u8981\u521B\u5EFA\u7A7A\u5143\u7D20
+DECIMAL_SEPARATOR.NAME=\u5c0f\u6570\u70b9
+DELETE_EMPTYFILE.NAME=\u4E0D\u751F\u6210\u7A7A\u6587\u4EF6
+ENCODING.NAME=\u7f16\u7801
+FIELD_TAG.NAME=\u6570\u636E\u5217\u5BF9\u5E94\u7684\u6807\u8BB0
+FILENAME.NAME=\u6587\u4EF6\u540D
+GENERATION_MODE.ITEM.DOM4J=\u901f\u5ea6\u5feb,\u8017\u5185\u5b58(Dom4j)
+GENERATION_MODE.NAME=\u4ea7\u751f\u6a21\u5f0f
+GROUP.ITEM.COLUMN=\u5173\u8054\u5217
+GROUP.ITEM.VALUE=\u7f3a\u7701\u503c
+GROUP.NAME=\u5206\u7EC4
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+LOOP.ITEM.COLUMN=\u5173\u8054\u5217
+LOOP.ITEM.VALUE=\u7f3a\u7701\u503c
+MAP.NAME=RowGenerator\u7F16\u8F91\u5668
+MAPPING.NAME=\u6620\u5C04
+NB_LINE.NAME=\u884c\u6570
+OUTPUT_AS_XSD.NAME=\u521B\u5EFA\u5173\u8054\u7684XSD\u6587\u4EF6
+ROOT.ITEM.COLUMN=\u5173\u8054\u5217
+ROOT.ITEM.VALUE=\u7f3a\u7701\u503c
+ROOT.NAME=\u6839
+SCHEMA.NAME=\u67B6\u6784
+SPLIT.NAME=\u5206\u79BB\u8F93\u5165\u5230\u591A\u4E2A\u6587\u4EF6
+SPLIT_EVERY.NAME=\u5728\u6BCF\u4E2A\u8F93\u5165\u6587\u4EF6\u7684\u884C
+THOUSANDS_SEPARATOR.NAME=\u5343\u5206\u7b26
+NOT_TRIM_TEXT.NAME=\u5168\u90E8\u5C0F\u5199
+VALIDATORMODE.NAME=\u9A8C\u8BC1\u6A21\u5F0F
+XSL_VALID.NAME=XSL\u9A8C\u8BC1\u6587\u4EF6
+XSL_TYPE.NAME=\u7C7B\u578B
+XSL_HREF.NAME=Href

org.talend.designer.components.localprovider/components/tAdvancedHash/tAdvancedHash_end.javajet

@@ -69,7 +69,7 @@ java.util.List<java.util.concurrent.ConcurrentHashMap<String,Object>> mapsList_<
 	}
 
 } 
-} catch (Exception ex) {
+} catch (java.lang.Exception ex) {
 	globalMap.put("THREADS_HAVE_ERROR",ex);
 	throw ex;
 } catch (Error er) {

org.talend.designer.components.localprovider/components/tAdvancedHash/tAdvancedHash_main.javajet

@@ -23,7 +23,6 @@
 
 
     List<IConnection> connections = (List<IConnection>) node.getIncomingConnections();
-    List<IConnection> outConnections = (List<IConnection>) node.getOutgoingConnections();
     
 	if (connections != null && connections.size() > 0) { // T_AH_100
         for (IConnection connection : connections) { // T_AH_101

org.talend.designer.components.localprovider/components/tAdvancedHash/tAdvancedHash_messages_zh_CN.properties

@@ -0,0 +1,4 @@
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+RUN_IF.MENU=\u6B63\u5E38\u65F6\u8FD0\u884C
+SCHEMA.NAME=\u67B6\u6784
+NB_LINE.NAME=\u884c\u6570

org.talend.designer.components.localprovider/components/tAdvancedXMLMapHash/tAdvancedXMLMapHash_main.javajet

@@ -39,7 +39,6 @@
 
 
     List<IConnection> connections = (List<IConnection>) node.getIncomingConnections();
-    List<IConnection> outConnections = (List<IConnection>) node.getOutgoingConnections();
     
 	if (connections != null && connections.size() > 0) { // T_AH_100
         for (IConnection connection : connections) { // T_AH_101

org.talend.designer.components.localprovider/components/tAdvancedXMLMapHash/tAdvancedXMLMapHash_messages_zh_CN.properties

@@ -0,0 +1 @@
+SCHEMA.NAME=\u67B6\u6784

org.talend.designer.components.localprovider/components/tAggregateIn/tAggregateIn_messages_nl.properties

@@ -0,0 +1,2 @@
+OPERATIONS.ITEM.FUNCTION.ITEM.MAX=Max
+OPERATIONS.ITEM.FUNCTION.ITEM.MIN=Min

org.talend.designer.components.localprovider/components/tAggregateIn/tAggregateIn_messages_zh_CN.properties

@@ -0,0 +1,10 @@
+DESTINATION.NAME=\u76EE\u6807\u8DEF\u5F84
+GROUPBYS.NAME=\u5206\u7EC4
+OPERATIONS.ITEM.FUNCTION=\u529F\u80FD
+OPERATIONS.ITEM.FUNCTION.ITEM.COUNT=\u8ba1\u7b97
+OPERATIONS.ITEM.FUNCTION.ITEM.LIST=\u5217\u8868
+OPERATIONS.ITEM.IGNORE_NULL=\u5FFD\u7565\u7A7A\u503C
+OPERATIONS.NAME=\u64CD\u4F5C
+OPERATIONS.ITEM.FUNCTION.ITEM.STD_DEV=\u6807\u51C6\u504F\u5DEE
+RUN_IF.MENU=\u6B63\u5E38\u65F6\u8FD0\u884C
+SCHEMA.NAME=\u67B6\u6784

org.talend.designer.components.localprovider/components/tAggregateOut/tAggregateOut_messages_nl.properties

@@ -0,0 +1,2 @@
+OPERATIONS.ITEM.FUNCTION.ITEM.MAX=Max
+OPERATIONS.ITEM.FUNCTION.ITEM.MIN=Min

org.talend.designer.components.localprovider/components/tAggregateOut/tAggregateOut_messages_zh_CN.properties

@@ -0,0 +1,16 @@
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+DESTINATION.NAME=\u76EE\u6807\u8DEF\u5F84
+GROUPBYS.ITEM.INPUT_COLUMN=\u8F93\u5165
+GROUPBYS.ITEM.OUTPUT_COLUMN=\u8F93\u51FA
+GROUPBYS.NAME=\u5206\u7EC4
+NB_LINE.NAME=\u884c\u6570
+OPERATIONS.ITEM.FUNCTION=\u529F\u80FD
+OPERATIONS.ITEM.FUNCTION.ITEM.COUNT=\u8ba1\u7b97
+OPERATIONS.ITEM.FUNCTION.ITEM.LIST=\u5217\u8868
+OPERATIONS.ITEM.IGNORE_NULL=\u5FFD\u7565\u7A7A\u503C
+OPERATIONS.ITEM.INPUT_COLUMN=\u8F93\u5165
+OPERATIONS.ITEM.OUTPUT_COLUMN=\u8F93\u51FA
+OPERATIONS.NAME=\u64CD\u4F5C
+OPERATIONS.ITEM.FUNCTION.ITEM.STD_DEV=\u6807\u51C6\u504F\u5DEE
+RUN_IF.MENU=\u6B63\u5E38\u65F6\u8FD0\u884C
+SCHEMA.NAME=\u67B6\u6784

org.talend.designer.components.localprovider/components/tAggregateRow/tAggregateRow_messages_nl.properties

@@ -0,0 +1,2 @@
+OPERATIONS.ITEM.FUNCTION.ITEM.MAX=Max
+OPERATIONS.ITEM.FUNCTION.ITEM.MIN=Min

org.talend.designer.components.localprovider/components/tAggregateRow/tAggregateRow_messages_zh_CN.properties

@@ -0,0 +1,17 @@
+DESTINATION.NAME=\u76EE\u6807\u8DEF\u5F84
+GROUPBYS.ITEM.INPUT_COLUMN=\u8F93\u5165
+GROUPBYS.ITEM.OUTPUT_COLUMN=\u8F93\u51FA
+GROUPBYS.NAME=\u5206\u7EC4
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+NB_LINE.NAME=\u884c\u6570
+OPERATIONS.ITEM.FUNCTION=\u529F\u80FD
+OPERATIONS.ITEM.FUNCTION.ITEM.COUNT=\u8ba1\u7b97
+OPERATIONS.ITEM.FUNCTION.ITEM.LIST=\u5217\u8868
+OPERATIONS.ITEM.IGNORE_NULL=\u5FFD\u7565\u7A7A\u503C
+OPERATIONS.ITEM.INPUT_COLUMN=\u8F93\u5165
+OPERATIONS.ITEM.LIST_DELIMITER=\u5B9E\u6570\u7EDD\u5BF9\u503C
+OPERATIONS.ITEM.OUTPUT_COLUMN=\u8F93\u51FA
+OPERATIONS.NAME=\u64CD\u4F5C
+OPERATIONS.ITEM.FUNCTION.ITEM.STD_DEV=\u6807\u51C6\u504F\u5DEE
+RUN_IF.MENU=\u6B63\u5E38\u65F6\u8FD0\u884C
+SCHEMA.NAME=\u67B6\u6784

org.talend.designer.components.localprovider/components/tAggregateSortedRow/tAggregateSortedRow_main.javajet

@@ -829,7 +829,7 @@ emmitArray_<%=cid %>[tempCount_<%=cid %>].<%=column.getLabel() %> = String.value
 								}else{
 %>
 if(true){
-	throw new Exception("In column <%=column.getLabel() %>, the data type \"<%=JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable()) %>\" is not applicable for \"avg\" result.");
+	throw new java.lang.Exception("In column <%=column.getLabel() %>, the data type \"<%=JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable()) %>\" is not applicable for \"avg\" result.");
 }
 <%								}
 							}else if(("distinct").equals(functions[i])){
@@ -859,12 +859,12 @@ if(true){
 %>emmitArray_<%=cid %>[tempCount_<%=cid %>].<%=column.getLabel() %> = <%=functions[i] %>_<%=column_op[i][0].getLabel() %>_<%=needTestForNull[i] %>_<%=cid %>.toString();
 <%								} else if(javaType == JavaTypesManager.LIST){
 %>if(true){
-	throw new Exception("In column <%=column.getLabel() %>, data type \"List\" is not applicable for aggregate function \"list\" result. Please try aggregate function \"list(object)\"!");
+	throw new java.lang.Exception("In column <%=column.getLabel() %>, data type \"List\" is not applicable for aggregate function \"list\" result. Please try aggregate function \"list(object)\"!");
 }
 <%
 								}else{
 %>if(true){
-	throw new Exception("In column <%=column.getLabel() %>, the data type \"<%=JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable()) %>\" is not applicable for \"list\" result.");
+	throw new java.lang.Exception("In column <%=column.getLabel() %>, the data type \"<%=JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable()) %>\" is not applicable for \"list\" result.");
 }
 <%								}
 							}
@@ -1310,7 +1310,7 @@ emmitArray_<%=cid %>[tempCount_<%=cid %>].<%=column.getLabel() %> = String.value
 									}
 								}else{
 %>if(true){
-	throw new Exception("In column <%=column.getLabel() %>, the data type \"<%=JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable()) %>\" is not applicable for \"avg\" result.");
+	throw new java.lang.Exception("In column <%=column.getLabel() %>, the data type \"<%=JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable()) %>\" is not applicable for \"avg\" result.");
 }
 <%								}
 							}else if(("distinct").equals(functions[i])){
@@ -1340,12 +1340,12 @@ emmitArray_<%=cid %>[tempCount_<%=cid %>].<%=column.getLabel() %> = String.value
 %>emmitArray_<%=cid %>[tempCount_<%=cid %>].<%=column.getLabel() %> = <%=functions[i] %>_<%=column_op[i][0].getLabel() %>_<%=needTestForNull[i] %>_<%=cid %>.toString();
 <%								} else if(javaType == JavaTypesManager.LIST){
 %>if(true){
-	throw new Exception("In column <%=column.getLabel() %>, data type \"List\" is not applicable for aggregate function \"list\" result. Please try aggregate function \"list(object)\"!");
+	throw new java.lang.Exception("In column <%=column.getLabel() %>, data type \"List\" is not applicable for aggregate function \"list\" result. Please try aggregate function \"list(object)\"!");
 }
 <%
 								}else{
 %>if(true){
-	throw new Exception("In column <%=column.getLabel() %>, the data type \"<%=JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable()) %>\" is not applicable for \"list\" result.");
+	throw new java.lang.Exception("In column <%=column.getLabel() %>, the data type \"<%=JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable()) %>\" is not applicable for \"list\" result.");
 }
 <%								}
 							}

org.talend.designer.components.localprovider/components/tAggregateSortedRow/tAggregateSortedRow_messages_nl.properties

@@ -0,0 +1,2 @@
+OPERATIONS.ITEM.FUNCTION.ITEM.MAX=Max
+OPERATIONS.ITEM.FUNCTION.ITEM.MIN=Min

org.talend.designer.components.localprovider/components/tAggregateSortedRow/tAggregateSortedRow_messages_zh_CN.properties

@@ -0,0 +1,16 @@
+DESTINATION.NAME=\u76EE\u6807\u8DEF\u5F84
+GROUPBYS.ITEM.INPUT_COLUMN=\u8F93\u5165
+GROUPBYS.ITEM.OUTPUT_COLUMN=\u8F93\u51FA
+GROUPBYS.NAME=\u5206\u7EC4
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+NB_LINE.NAME=\u884c\u6570
+OPERATIONS.ITEM.FUNCTION=\u529F\u80FD
+OPERATIONS.ITEM.FUNCTION.ITEM.COUNT=\u8ba1\u7b97
+OPERATIONS.ITEM.FUNCTION.ITEM.LIST=\u5217\u8868
+OPERATIONS.ITEM.INPUT_COLUMN=\u8F93\u5165
+OPERATIONS.ITEM.OUTPUT_COLUMN=\u8F93\u51FA
+OPERATIONS.NAME=\u64CD\u4F5C
+ROW_COUNT.NAME=\u8F93\u5165\u884C\u6570
+RUN_IF.MENU=\u6B63\u5E38\u65F6\u8FD0\u884C
+SCHEMA.NAME=\u67B6\u6784
+OPERATIONS.ITEM.IGNORE_NULL=\u5FFD\u7565\u7A7A\u503C

org.talend.designer.components.localprovider/components/tAlfrescoOutput/tAlfrescoOutput_main.javajet

@@ -170,7 +170,7 @@ imports="
          
          nbLine_<%=cid%>++;
 	        
-	    } catch (Exception mainEx_<%=cid%>) { // end reject exception handling
+	    } catch (java.lang.Exception mainEx_<%=cid%>) { // end reject exception handling
 	    
 	        <%
 	        // handling exception as reject connection or std err

org.talend.designer.components.localprovider/components/tAlfrescoOutput/tAlfrescoOutput_messages_zh_CN.properties

@@ -0,0 +1,39 @@
+ALFRESCO_SERVER_GROUP.NAME=Alfresco\u670D\u52A1\u5668
+ALFRESCO_USER_LOGIN.NAME=\u987b\u6307\u5b9a\u767b\u5f55
+ALFRESCO_USER_PASSWORD.NAME=\u5fc5\u987b\u6307\u5b9a\u5bc6\u7801
+TARGET_LOCATION_COLUMN.NAME=\u5217
+CREATE_OR_UPDATE_MODE_GROUP.NAME=\u521B\u5EFA\u6216\u66F4\u65B0\u6A21\u5F0F
+DOCUMENT_MODE.NAME=\u6587\u6863\u6A21\u5F0F
+DOCUMENT_MODE.ITEM.CREATE_ONLY=\u4EC5\u521B\u5EFA
+DOCUMENT_MODE.ITEM.CREATE_OR_UPDATE=\u521B\u5EFA\u6216\u66F4\u65B0
+CONTAINER_MODE.ITEM.CREATE_OR_UPDATE=\u521B\u5EFA\u6216\u66F4\u65B0
+CONTAINER_MODE.ITEM.UPDATE_ONLY=\u53EA\u66F4\u65B0
+DEFINE_DOCUMENT_TYPE.NAME=\u5B9A\u4E49\u6587\u6863\u7C7B\u578B
+AVAILABLE_ALFRESCO_MODELS.ITEM.FILEPATH=\u5F53\u524D\u6587\u4EF6\u8DEF\u5F84
+AVAILABLE_ALFRESCO_MODELS.NAME=Alfresco\u6587\u6863\u6A21\u578B\n
+AVAILABLE_ALFRESCO_NAMESPACES.NAME=Alfresco\u6587\u4EF6\u547D\u540D\u7A7A\u95F4
+AVAILABLE_ALFRESCO_NAMESPACES.ITEM.PREFIX=\u524D\u7F00
+ALFRESCO_TYPE_NAME.NAME=Alfresco\u7684\u6587\u6863\u7C7B\u578B
+ALFRESCO_ASPECT_NAMES.ITEM.NAME=\u57fa\u672c\u6570\u636e\u540d
+ALFRESCO_ASPECT_NAMES.NAME=Alfresco\u7684\u6587\u4EF6\u65B9\u9762
+PROPERTY_MAPPING.NAME=\u8f93\u51fa
+PROPERTY_MAPPING.ITEM.NAME=\u57fa\u672c\u6570\u636e\u540d
+PROPERTY_MAPPING.ITEM.TITLE=\u6807\u9898
+PROPERTY_MAPPING.ITEM.TYPE=\u7C7B\u578B
+PROPERTY_MAPPING.ITEM.DEFAULT=\u7F3A\u7701
+PROPERTY_MAPPING.ITEM.COLUMN=\u5217
+PROPERTY_MAPPING.ITEM.VALUE=\u53C2\u6570\u503C
+SCHEMA.NAME=\u67B6\u6784
+CONFIGURE_TARGET_LOCATION_CONTAINER.NAME=\u914D\u7F6E\u76EE\u6807\u5B9A\u4F4D\u96C6\u88C5\u7BB1
+TARGET_LOCATION_CONTAINER_TYPE.NAME=\u7C7B\u578B
+CONFIGURE_PERMISSIONS.NAME=\u914D\u7F6E\u6743\u9650
+PERMISSIONS.ITEM.USERORGROUP=\u7528\u6237\u6216\u7EC4
+PERMISSIONS.ITEM.USERORGROUPCOLUMN=\u7528\u6237\u6216\u7EC4\u5217
+ASSOCIATION_MAPPING_GROUP.NAME=\u76EE\u6807\u5173\u7CFB\u56FE
+ASSOCIATION_MAPPING.NAME=\u8f93\u51fa
+ASSOCIATION_MAPPING.ITEM.NAME=\u57fa\u672c\u6570\u636e\u540d
+ASSOCIATION_MAPPING.ITEM.CHILD=\u5B50
+ASSOCIATION_MAPPING.ITEM.TITLE=\u6807\u9898
+ASSOCIATION_MAPPING.ITEM.TYPE=\u7C7B\u578B
+ASSOCIATION_MAPPING.ITEM.MANY=\u8BB8\u591A
+ASSOCIATION_MAPPING.ITEM.COLUMN=\u5217

org.talend.designer.components.localprovider/components/tAmazonMysqlClose/tAmazonMysqlClose_messages_zh_CN.properties

@@ -0,0 +1 @@
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAmazonMysqlCommit/tAmazonMysqlCommit_messages_zh_CN.properties

@@ -0,0 +1,39 @@
+ADD_COLS.ITEM.NAME=\u4f5c\u4e1a\u540d
+ADD_COLS.ITEM.POS=\u4f4d\u7f6e
+ADD_COLS.ITEM.POS.ITEM.AFTER=\u4e4b\u540e
+ADD_COLS.ITEM.POS.ITEM.BEFORE=\u4e4b\u524d
+ADD_COLS.ITEM.POS.ITEM.REPLACE=\u66ff\u4ee3
+ADD_COLS.ITEM.REFCOL=\u76f8\u5173\u7684\u5217
+ADD_COLS.ITEM.SQL=SQL\u8868\u8fbe\u5f0f
+ADD_COLS.NAME=\u9644\u52a0\u5217
+CLEAR_TABLE.NAME=\u6e05\u9664\u8868\u4e2d\u7684\u6570\u636e
+COMMIT_EVERY.NAME=\u63d0\u4ea4\u95f4\u9694
+DATA_ACTION.ITEM.DELETE=\u5220\u9664
+DATA_ACTION.ITEM.INSERT=\u63D2\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u63d2\u5165\u6216\u66f4\u65b0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66f4\u65b0\u6216\u63d2\u5165
+DATA_ACTION.NAME=\u6570\u636E\u64CD\u4F5C
+DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
+DBD-Oracle.INFO=\u4e3aOracle\u6240\u5fc5\u9700
+DBD-Pg.INFO=\u4e3aPostgreSQL\u6240\u5fc5\u9700
+DBD-mysql.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
+PASS.NAME=\u5bc6\u7801
+PORT.NAME=\u7aef\u53e3
+QUERY.NAME=\u67E5\u8BE2
+SCHEMA.NAME=\u67B6\u6784
+SQL_SYNTAX.NAME=SQL \u8bed\u53e5\u987b\u88ab\u6307\u5b9a
+STRING_QUOTE.NAME=\u5b57\u7b26\u4e32\u5f15\u7528
+TABLE.NAME=\u540E\u8FD0\u884C
+TABLE_ACTION.ITEM.CLEAR=\u6E05\u9664\u8868\u4E2D\u6570\u636E
+TABLE_ACTION.ITEM.CREATE=\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5982\u679C\u8868\u4E0D\u5B58\u5728\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.DROP_CREATE=\u5220\u9664\u5E76\u521B\u5EFA\u8868
+TABLE_ACTION.NAME=\u8868\u64CD\u4F5C
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+CLOSE.NAME=\u5173\u95ED\u8FDE\u63A5
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAmazonMysqlConnection/tAmazonMysqlConnection_messages_zh_CN.properties

@@ -0,0 +1,19 @@
+DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
+DBD-Oracle.INFO=\u4e3aOracle\u6240\u5fc5\u9700
+DBD-Pg.INFO=\u4e3aPostgreSQL\u6240\u5fc5\u9700
+DBD-mysql.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
+PASS.NAME=\u5bc6\u7801
+PORT.NAME=\u7aef\u53e3
+QUERY.NAME=\u67E5\u8BE2
+QUERYSTORE.NAME=\u67e5\u8be2\u7c7b\u578b
+SCHEMA.NAME=\u67B6\u6784
+SCHEMA_DB.NAME=\u67B6\u6784
+SQL_SYNTAX.NAME=SQL \u8bed\u53e5\u987b\u88ab\u6307\u5b9a
+STRING_QUOTE.NAME=\u5b57\u7b26\u4e32\u5f15\u7528
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+SHARED_CONNECTION_NAME.NAME=\u5171\u4EAB\u6570\u636E\u5E93\u8FDE\u63A5\u540D
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c

org.talend.designer.components.localprovider/components/tAmazonMysqlInput/tAmazonMysqlInput_messages_zh_CN.properties

@@ -0,0 +1,26 @@
+DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
+DBD-Oracle.INFO=\u4e3aOracle\u6240\u5fc5\u9700
+DBD-Pg.INFO=\u4e3aPostgreSQL\u6240\u5fc5\u9700
+DBD-mysql.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
+DBTABLE.NAME=\u6570\u636e\u8868
+ENABLE_STREAM.NAME=\u542F\u7528\u6D41
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
+PASS.NAME=\u5bc6\u7801
+PORT.NAME=\u7aef\u53e3
+QUERY.NAME=\u67E5\u8BE2
+QUERYSTORE.NAME=\u67e5\u8be2\u7c7b\u578b
+SCHEMA.NAME=\u67B6\u6784
+SCHEMA_DB.NAME=\u67B6\u6784
+SQL_SYNTAX.NAME=SQL \u8bed\u53e5\u987b\u88ab\u6307\u5b9a
+STRING_QUOTE.NAME=\u5b57\u7b26\u4e32\u5f15\u7528
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+TRIM_COLUMN.ITEM.TRIM=\u6574\u7406\u7A7A\u683C
+TABLE.NAME=\u6570\u636e\u8868
+GUESS_SCHEMA.NAME=\u8BA1\u7B97schema
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+MAPPING.NAME=\u6620\u5c04
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c

org.talend.designer.components.localprovider/components/tAmazonMysqlOutput/tAmazonMysqlOutput_begin.javajet

@@ -181,12 +181,12 @@ if(useExistingConnection) {
 	if(dbProperties_<%=cid%> == null || dbProperties_<%=cid%>.trim().length() == 0) {
 	    url_<%=cid%> = "jdbc:mysql://" + <%=dbhost%> + ":" + <%=dbport%> + "/" + <%=dbname%> + "?" + "rewriteBatchedStatements=true";
 	} else {
-		String proprtties_<%=cid%> = <%=dbproperties%>;
-		if (!proprtties_<%=cid%>.contains("rewriteBatchedStatements")) {
-			proprtties_<%=cid%> += "&rewriteBatchedStatements=true";
+		String properties_<%=cid%> = <%=dbproperties%>;
+		if (!properties_<%=cid%>.contains("rewriteBatchedStatements")) {
+			properties_<%=cid%> += "&rewriteBatchedStatements=true";
 		}
 		
-	    url_<%=cid%> = "jdbc:mysql://" + <%=dbhost%> + ":" + <%=dbport%> + "/" + <%=dbname%> + "?" + proprtties_<%=cid%>;
+	    url_<%=cid%> = "jdbc:mysql://" + <%=dbhost%> + ":" + <%=dbport%> + "/" + <%=dbname%> + "?" + properties_<%=cid%>;
 	}
     String dbUser_<%=cid %> = <%=dbuser%>;
     String dbPwd_<%=cid %> = <%=dbpwd%>;    
@@ -205,7 +205,7 @@ if(!useExistingConnection) {
 }
 %>
 <%
-if (useBatchSize && "MYSQL_5".equals(dbVersion) && !extendedInsert) {
+if (useBatchSize && "MYSQL_5".equals(dbVersion) && (("UPDATE").equals(dataAction)||("DELETE").equals(dataAction))) {
     if(!("").equals(batchSize)&&!("0").equals(batchSize)) {
 %>
    int batchSize_<%=cid%> = <%=batchSize%>;
@@ -556,15 +556,18 @@ if(isDynamic) {
 		    String insertColName<%=cid%>="";
 		    int counter<%=cid%>=1;
 <%
-	}
+	}else if ("MYSQL_5".equals(dbVersion) && extendedInsert){			       
+%>
+	int batchSizeCounter_<%=cid%>=0;
+	int batchSize_<%=cid%>=0;
+<%
+   }
 %>
 
 
 	java.sql.PreparedStatement pstmt_<%=cid %> =null;
 	java.sql.PreparedStatement pstmtInsert_<%=cid %> =null;
 	java.sql.PreparedStatement pstmtUpdate_<%=cid %> =null;
-	int batchSizeCounter_<%=cid%>=0;
-	int batchSize_<%=cid%>=0;
 	int rowCount<%=cid%>=0;
 <%
 }

org.talend.designer.components.localprovider/components/tAmazonMysqlOutput/tAmazonMysqlOutput_main.javajet

@@ -624,7 +624,7 @@ if(columnList != null && columnList.size() > 0) {
 	    	}
 	    }
 	    if ("MYSQL_5".equals(dbVersion)) {
-	    	if (extendedInsert || useBatchSize) {
+	    	if ((extendedInsert&&"INSERT".equals(dataAction)) || (useBatchSize&&("UPDATE".equals(dataAction)||"DELETE".equals(dataAction)))) {
 			    if((!("").equals(numPerInsert)&&!("0").equals(numPerInsert))
 			    	||(!("").equals(batchSize)&&!("0").equals(batchSize))) {
 %>
@@ -772,7 +772,7 @@ if(columnList != null && columnList.size() > 0) {
 	                try {
 	                    insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
 	                    nb_line_<%=cid%>++;
-	                } catch(Exception e) {
+	                } catch(java.lang.Exception e) {
 	                    whetherReject_<%=cid%> = true;
 	                    <%
 	                    if (("true").equals(dieOnError)) {
@@ -840,7 +840,7 @@ if(columnList != null && columnList.size() > 0) {
                 try {
                     insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
-                } catch(Exception e) {
+                } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
                     <%
                     if (("true").equals(dieOnError)) {
@@ -949,7 +949,7 @@ if(columnList != null && columnList.size() > 0) {
             try {
                 updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 nb_line_<%=cid%>++;
-            } catch(Exception e) {
+            } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
                 if (("true").equals(dieOnError)) {
@@ -1072,7 +1072,7 @@ if(columnList != null && columnList.size() > 0) {
     			%>
                 try {
                     updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
-                } catch(Exception e) {
+                } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
                     <%
                     if (("true").equals(dieOnError)) {
@@ -1134,7 +1134,7 @@ if(columnList != null && columnList.size() > 0) {
     			%>
                 try {
                     insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
-                } catch(Exception e) {
+                } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
                     <%
                     if (("true").equals(dieOnError)) {
@@ -1235,7 +1235,7 @@ if(columnList != null && columnList.size() > 0) {
                 updateFlag_<%=cid%>=pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%>+updateFlag_<%=cid%>;
                 
-            } catch(Exception e) {
+            } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
                 if (("true").equals(dieOnError)) {
@@ -1303,7 +1303,7 @@ if(columnList != null && columnList.size() > 0) {
         		%>
                 try {
                     insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
-                } catch(Exception e) {
+                } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
                     <%
                     if (("true").equals(dieOnError)) {
@@ -1374,7 +1374,6 @@ if(columnList != null && columnList.size() > 0) {
         	<%if (rejectConnName == null && useBatchSize && "MYSQL_5".equals(dbVersion)) { // whether use batch
     		%>
     		pstmt_<%=cid %>.addBatch();
-    		nb_line_<%=cid%>++;    		 
 			
     		  <%if (useBatchSize && !("").equals(batchSize) && !("0").equals(batchSize)) {
     		  %>
@@ -1386,7 +1385,7 @@ if(columnList != null && columnList.size() > 0) {
     		%>
             try {
         	    deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
-            } catch(Exception e) {
+            } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
                 if (("true").equals(dieOnError)) {
@@ -1448,7 +1447,7 @@ if(columnList != null && columnList.size() > 0) {
             int replaceCount_<%=cid%> = 0;
             try {
                 replaceCount_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-            } catch(Exception e) {
+            } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
                 if (("true").equals(dieOnError)) {
@@ -1524,7 +1523,7 @@ if(columnList != null && columnList.size() > 0) {
             int count_on_duplicate_key_<%=cid%> = 0;
             try {
                 count_on_duplicate_key_<%=cid%> = pstmt_<%=cid %>.executeUpdate();
-            } catch(Exception e) {
+            } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
                 if (("true").equals(dieOnError)) {
@@ -1586,7 +1585,7 @@ if(columnList != null && columnList.size() > 0) {
                 try {
                     insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                     nb_line_<%=cid%>++;
-                } catch(Exception e) {
+                } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
                     <%
                     if (("true").equals(dieOnError)) {
@@ -1688,11 +1687,11 @@ if(columnList != null && columnList.size() > 0) {
     		}
     	
     	}
-    	if (useBatchSize && "MYSQL_5".equals(dbVersion) &&(rejectConnName==null)) {
+    	if (useBatchSize && "MYSQL_5".equals(dbVersion) &&(rejectConnName==null)&& (("UPDATE").equals(dataAction) || ("DELETE").equals(dataAction))) {
     		if(!("").equals(batchSize) && !("0").equals(batchSize)) {
     		%>
     			if ( batchSize_<%=cid%> <= batchSizeCounter_<%=cid%>) {                
-                <%if ( (rejectConnName==null) && (("UPDATE").equals(dataAction) || ("DELETE").equals(dataAction))) {
+                <%if (rejectConnName==null) {
                 %>                                                
                 try {
 						int countSum_<%=cid%> = 0;

org.talend.designer.components.localprovider/components/tAmazonMysqlOutput/tAmazonMysqlOutput_messages_zh_CN.properties

@@ -0,0 +1,62 @@
+ADD_COLS.ITEM.NAME=\u4f5c\u4e1a\u540d
+ADD_COLS.ITEM.DATATYPE=\u6570\u636E\u7C7B\u578B
+ADD_COLS.ITEM.POS=\u4f4d\u7f6e
+ADD_COLS.ITEM.POS.ITEM.AFTER=\u4e4b\u540e
+ADD_COLS.ITEM.POS.ITEM.BEFORE=\u4e4b\u524d
+ADD_COLS.ITEM.POS.ITEM.REPLACE=\u66ff\u4ee3
+ADD_COLS.ITEM.REFCOL=\u76f8\u5173\u7684\u5217
+ADD_COLS.ITEM.SQL=SQL\u8868\u8fbe\u5f0f
+ADD_COLS.ITEM.OPERATOR=\u64CD\u4F5C\u7B26
+ADD_COLS.NAME=\u9644\u52a0\u5217
+CLEAR_TABLE.NAME=\u6e05\u9664\u8868\u4e2d\u7684\u6570\u636e
+COMMIT_EVERY.NAME=\u63d0\u4ea4\u95f4\u9694
+DATA_ACTION.ITEM.REPLACE=\u66ff\u4ee3
+DATA_ACTION.ITEM.INSERT_ON_DUPLICATE_KEY_UPDATE=\u63D2\u5165\u6216\u66F4\u65B0\u91CD\u590D\u952E\u6216\u552F\u4E00\u7D22\u5F15
+DATA_ACTION.ITEM.DELETE=\u5220\u9664
+DATA_ACTION.ITEM.INSERT=\u63D2\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u63d2\u5165\u6216\u66f4\u65b0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66f4\u65b0\u6216\u63d2\u5165
+DATA_ACTION.NAME=\u6570\u636E\u64CD\u4F5C
+DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
+DBD-Oracle.INFO=\u4e3aOracle\u6240\u5fc5\u9700
+DBD-Pg.INFO=\u4e3aPostgreSQL\u6240\u5fc5\u9700
+DBD-mysql.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
+DIE_ON_ERROR.NAME=\u9519\u8bef\u65f6\u7ec8\u6b62
+ENCODING.NAME=\u7f16\u7801
+EXTENDINSERT.NAME=\u6269\u5c55\u63d2\u5165
+HOST.NAME=\u4e3b\u673a
+NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
+PASS.NAME=\u5bc6\u7801
+PORT.NAME=\u7aef\u53e3
+QUERY.NAME=\u67E5\u8BE2
+SCHEMA_FLOW.NAME=\u67B6\u6784
+SQL_SYNTAX.NAME=SQL \u8bed\u53e5\u987b\u88ab\u6307\u5b9a
+STRING_QUOTE.NAME=\u5b57\u7b26\u4e32\u5f15\u7528
+TABLE.NAME=\u540E\u8FD0\u884C
+TABLE_ACTION.ITEM.CLEAR=\u6E05\u9664\u8868\u4E2D\u6570\u636E
+TABLE_ACTION.ITEM.CREATE=\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5982\u679C\u8868\u4E0D\u5B58\u5728\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5982\u679c\u8868\u5b58\u5728\u5220\u9664\u7136\u540e\u521b\u5efa
+TABLE_ACTION.ITEM.DROP_CREATE=\u5220\u9664\u5E76\u521B\u5EFA\u8868
+TABLE_ACTION.NAME=\u8868\u64CD\u4F5C
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+NB_ROWS_PER_INSERT.NAME=\u6bcf\u6b21\u63d2\u5165\u7684\u884c\u6570
+ENABLE_DEBUG_MODE.NAME=\u542F\u7528\u8C03\u8BD5\u6A21\u5F0F
+NB_LINE_UPDATED.NAME=\u66f4\u65b0\u7684\u884c\u6570
+NB_LINE_INSERTED.NAME=\u63D2\u5165\u7684\u884C\u6570
+NB_LINE_DELETED.NAME=\u5220\u9664\u7684\u884c\u6570
+DUPLICATED_KEYS.ITEM.DUPLICATED_KEY=\u5217
+DUPLICATED_KEYS.ITEM.DUPLICATED_VALUE=\u503c
+NOTE.NAME=\u8282\u70b9
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868
+MAPPING.NAME=\u6620\u5c04
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+HINT_OPTIONS.ITEM.POSITION=\u4f4d\u7f6e
+HINT_OPTIONS.ITEM.POSITION.ITEM.AFTER=\u4e4b\u540e
+HINT_OPTIONS.ITEM.SQL_STMT.ITEM.INSERT=\u63D2\u5165
+HINT_OPTIONS.ITEM.SQL_STMT.ITEM.UPDATE=\u66F4\u65B0
+HINT_OPTIONS.ITEM.SQL_STMT.ITEM.DELETE=\u5220\u9664
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+BATCH_SIZE.NAME=\u6279\u5927\u5C0F

org.talend.designer.components.localprovider/components/tAmazonMysqlRollback/tAmazonMysqlRollback_messages_zh_CN.properties

@@ -0,0 +1,39 @@
+ADD_COLS.ITEM.NAME=\u4f5c\u4e1a\u540d
+ADD_COLS.ITEM.POS=\u4f4d\u7f6e
+ADD_COLS.ITEM.POS.ITEM.AFTER=\u4e4b\u540e
+ADD_COLS.ITEM.POS.ITEM.BEFORE=\u4e4b\u524d
+ADD_COLS.ITEM.POS.ITEM.REPLACE=\u66ff\u4ee3
+ADD_COLS.ITEM.REFCOL=\u76f8\u5173\u7684\u5217
+ADD_COLS.ITEM.SQL=SQL\u8868\u8fbe\u5f0f
+ADD_COLS.NAME=\u9644\u52a0\u5217
+CLEAR_TABLE.NAME=\u6e05\u9664\u8868\u4e2d\u7684\u6570\u636e
+COMMIT_EVERY.NAME=\u63d0\u4ea4\u95f4\u9694
+DATA_ACTION.ITEM.DELETE=\u5220\u9664
+DATA_ACTION.ITEM.INSERT=\u63D2\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u63d2\u5165\u6216\u66f4\u65b0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66f4\u65b0\u6216\u63d2\u5165
+DATA_ACTION.NAME=\u6570\u636E\u64CD\u4F5C
+DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
+DBD-Oracle.INFO=\u4e3aOracle\u6240\u5fc5\u9700
+DBD-Pg.INFO=\u4e3aPostgreSQL\u6240\u5fc5\u9700
+DBD-mysql.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
+PASS.NAME=\u5bc6\u7801
+PORT.NAME=\u7aef\u53e3
+QUERY.NAME=\u67E5\u8BE2
+SCHEMA.NAME=\u67B6\u6784
+SQL_SYNTAX.NAME=SQL \u8bed\u53e5\u987b\u88ab\u6307\u5b9a
+STRING_QUOTE.NAME=\u5b57\u7b26\u4e32\u5f15\u7528
+TABLE.NAME=\u540E\u8FD0\u884C
+TABLE_ACTION.ITEM.CLEAR=\u6E05\u9664\u8868\u4E2D\u6570\u636E
+TABLE_ACTION.ITEM.CREATE=\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5982\u679C\u8868\u4E0D\u5B58\u5728\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.DROP_CREATE=\u5220\u9664\u5E76\u521B\u5EFA\u8868
+TABLE_ACTION.NAME=\u8868\u64CD\u4F5C
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+CLOSE.NAME=\u5173\u95ED\u8FDE\u63A5
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAmazonMysqlRow/tAmazonMysqlRow_java.xml

@@ -25,7 +25,7 @@
 
   <CONNECTORS>
     <CONNECTOR CTYPE="FLOW" MAX_INPUT="1" MAX_OUTPUT="1"/>
-    <CONNECTOR NAME="REJECT" CTYPE="FLOW" MAX_INPUT="0" MAX_OUTPUT="1" LINE_STYLE="2" COLOR="FF0000" BASE_SCHEMA="FLOW" />
+    <CONNECTOR NAME="REJECT" NOT_SHOW_IF="(DIE_ON_ERROR == 'true')" CTYPE="FLOW" MAX_INPUT="0" MAX_OUTPUT="1" LINE_STYLE="2" COLOR="FF0000" BASE_SCHEMA="FLOW" />
     <CONNECTOR CTYPE="ITERATE" MAX_OUTPUT="1" MAX_INPUT="1"/>
     <CONNECTOR CTYPE="SUBJOB_OK" MAX_INPUT="1" />
     <CONNECTOR CTYPE="SUBJOB_ERROR" MAX_INPUT="1" />

org.talend.designer.components.localprovider/components/tAmazonMysqlRow/tAmazonMysqlRow_main.javajet

@@ -135,7 +135,7 @@ try {
 		}
 	}
     %>
-    } catch (Exception e) {
+    } catch (java.lang.Exception e) {
         whetherReject_<%=cid%> = true;
         <%
         if (("true").equals(dieOnError)) {

org.talend.designer.components.localprovider/components/tAmazonMysqlRow/tAmazonMysqlRow_messages_zh_CN.properties

@@ -0,0 +1,23 @@
+COMMIT_EVERY.NAME=\u63d0\u4ea4\u95f4\u9694
+DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
+DBD-Oracle.INFO=\u4e3aOracle\u6240\u5fc5\u9700
+DBD-Pg.INFO=\u4e3aPostgreSQL\u6240\u5fc5\u9700
+DBD-mysql.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
+DBTABLE.NAME=\u6570\u636e\u8868
+DIE_ON_ERROR.NAME=\u9519\u8bef\u65f6\u7ec8\u6b62
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+PASS.NAME=\u5bc6\u7801
+PORT.NAME=\u7aef\u53e3
+QUERY.NAME=\u67E5\u8BE2
+SCHEMA_DB.NAME=\u67B6\u6784
+STATEMENT_PARAMS.ITEM.INPUT_COLUMN=\u8F93\u5165\u680F
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+TABLE.NAME=\u6570\u636e\u8868
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868
+SCHEMA_FLOW.NAME=\u67B6\u6784
+QUERYSTORE.NAME=\u67e5\u8be2\u7c7b\u578b
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u65f6\u95f4

org.talend.designer.components.localprovider/components/tAmazonOracleClose/tAmazonOracleClose_messages_zh_CN.properties

@@ -0,0 +1 @@
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAmazonOracleCommit/tAmazonOracleCommit_messages_zh_CN.properties

@@ -0,0 +1,39 @@
+ADD_COLS.ITEM.NAME=\u4f5c\u4e1a\u540d
+ADD_COLS.ITEM.POS=\u4f4d\u7f6e
+ADD_COLS.ITEM.POS.ITEM.AFTER=\u4e4b\u540e
+ADD_COLS.ITEM.POS.ITEM.BEFORE=\u4e4b\u524d
+ADD_COLS.ITEM.POS.ITEM.REPLACE=\u66ff\u4ee3
+ADD_COLS.ITEM.REFCOL=\u76f8\u5173\u7684\u5217
+ADD_COLS.ITEM.SQL=SQL\u8868\u8fbe\u5f0f
+ADD_COLS.NAME=\u9644\u52a0\u5217
+CLEAR_TABLE.NAME=\u6e05\u9664\u8868\u4e2d\u7684\u6570\u636e
+COMMIT_EVERY.NAME=\u63d0\u4ea4\u95f4\u9694
+DATA_ACTION.ITEM.DELETE=\u5220\u9664
+DATA_ACTION.ITEM.INSERT=\u63D2\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u63d2\u5165\u6216\u66f4\u65b0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66f4\u65b0\u6216\u63d2\u5165
+DATA_ACTION.NAME=\u6570\u636E\u64CD\u4F5C
+DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
+DBD-Oracle.INFO=\u4e3aOracle\u6240\u5fc5\u9700
+DBD-Pg.INFO=\u4e3aPostgreSQL\u6240\u5fc5\u9700
+DBD-mysql.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
+PASS.NAME=\u5bc6\u7801
+PORT.NAME=\u7aef\u53e3
+QUERY.NAME=\u67E5\u8BE2
+SCHEMA.NAME=\u67B6\u6784
+SQL_SYNTAX.NAME=SQL \u8bed\u53e5\u987b\u88ab\u6307\u5b9a
+STRING_QUOTE.NAME=\u5b57\u7b26\u4e32\u5f15\u7528
+TABLE.NAME=\u540E\u8FD0\u884C
+TABLE_ACTION.ITEM.CLEAR=\u6E05\u9664\u8868\u4E2D\u6570\u636E
+TABLE_ACTION.ITEM.CREATE=\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5982\u679C\u8868\u4E0D\u5B58\u5728\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.DROP_CREATE=\u5220\u9664\u5E76\u521B\u5EFA\u8868
+TABLE_ACTION.NAME=\u8868\u64CD\u4F5C
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+CLOSE.NAME=\u5173\u95ED\u8FDE\u63A5
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAmazonOracleConnection/tAmazonOracleConnection_messages_zh_CN.properties

@@ -0,0 +1,15 @@
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+PASS.NAME=\u5bc6\u7801
+PORT.NAME=\u7aef\u53e3
+SCHEMA.NAME=\u67B6\u6784
+SCHEMA_DB.NAME=\u67B6\u6784
+DBD-Oracle.INFO=\u4e3aOracle\u6240\u5fc5\u9700
+CONNECTION_TYPE.NAME=\u8FDE\u63A5\u7C7B\u578B
+LOCAL_SERVICE_NAME.NAME=\u672C\u5730\u670D\u52A1\u540D
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+DB_VERSION.ITEM.ORACLE_11-6=Oracle 11-6
+OVERRIDE_NLS_LANG.NAME=\u8986\u76D6\u4EFB\u4F55\u5DF2\u5B58\u5728\u7684NLS_LANG\u73AF\u5883\u53D8\u91CF
+SHARED_CONNECTION_NAME.NAME=\u5171\u4EAB\u6570\u636E\u5E93\u8FDE\u63A5\u540D
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b

org.talend.designer.components.localprovider/components/tAmazonOracleInput/tAmazonOracleInput_messages_zh_CN.properties

@@ -0,0 +1,30 @@
+CONNECTION_TYPE.NAME=\u8FDE\u63A5\u7C7B\u578B
+CURSOR_SIZE.NAME=\u5149\u6807\u5927\u5C0F
+DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
+DBD-Oracle.INFO=\u4e3aOracle\u6240\u5fc5\u9700
+DBD-Pg.INFO=\u4e3aPostgreSQL\u6240\u5fc5\u9700
+DBD-mysql.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
+DBTABLE.NAME=\u6570\u636e\u8868
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
+PASS.NAME=\u5bc6\u7801
+PORT.NAME=\u7aef\u53e3
+QUERY.NAME=\u67E5\u8BE2
+QUERYSTORE.NAME=\u67e5\u8be2\u7c7b\u578b
+SCHEMA.NAME=\u67B6\u6784
+SQL_SYNTAX.NAME=SQL \u8bed\u53e5\u987b\u88ab\u6307\u5b9a
+STRING_QUOTE.NAME=\u5b57\u7b26\u4e32\u5f15\u7528
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+LOCAL_SERVICE_NAME.NAME=\u672C\u5730\u670D\u52A1\u540D
+TRIM_COLUMN.ITEM.TRIM=\u6574\u7406\u7A7A\u683C
+TABLE.NAME=\u6570\u636e\u8868
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+DB_VERSION.ITEM.ORACLE_11-6=Oracle 11-6
+OVERRIDE_NLS_LANG.NAME=\u8986\u76D6\u4EFB\u4F55\u5DF2\u5B58\u5728\u7684NLS_LANG\u73AF\u5883\u53D8\u91CF
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+GUESS_SCHEMA.NAME=\u8BA1\u7B97schema
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868
+MAPPING.NAME=\u6620\u5c04
+CONVERT_XMLTYPE.ITEM.REFCOL=\u6807\u7b7e\u540d

org.talend.designer.components.localprovider/components/tAmazonOracleOutput/tAmazonOracleOutput_begin.javajet

@@ -425,7 +425,7 @@ if(columnList != null && columnList.size()>0) {
 		  } catch( java.sql.SQLException sqlexp){
 		    tempClob.freeTemporary(); 
 		    sqlexp.printStackTrace();
-		  } catch(Exception exp){
+		  } catch(java.lang.Exception exp){
 		    tempClob.freeTemporary(); 
 		    exp.printStackTrace();
 		  }

org.talend.designer.components.localprovider/components/tAmazonOracleOutput/tAmazonOracleOutput_main.javajet

@@ -444,7 +444,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 nb_line_<%=cid%>++;
-            } catch(Exception e) {
+            } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
                 if (("true").equals(dieOnError)) {
@@ -562,7 +562,7 @@ skeleton="../templates/db_output_bulk.skeleton"
              try {
                 updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
                 nb_line_<%=cid%>++;
-            } catch(Exception e) {
+            } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
                 if (("true").equals(dieOnError)) {
@@ -700,7 +700,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try {
         			updatedCount_<%=cid%> = updatedCount_<%=cid%> + pstmtUpdate_<%=cid %>.executeUpdate();
-                } catch(Exception e) {
+                } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
                     <%
                     if (("true").equals(dieOnError)) {
@@ -768,7 +768,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     			%>
                 try {
                     insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
-                } catch(Exception e) {
+                } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
                     <%
                     if (("true").equals(dieOnError)) {
@@ -877,7 +877,7 @@ skeleton="../templates/db_output_bulk.skeleton"
             try {
                 updateFlag_<%=cid%> = pstmtUpdate_<%=cid %>.executeUpdate();
                 updatedCount_<%=cid%> = updatedCount_<%=cid%>+updateFlag_<%=cid%>;
-            } catch(Exception e) {
+            } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
                 if (("true").equals(dieOnError)) {
@@ -951,7 +951,7 @@ skeleton="../templates/db_output_bulk.skeleton"
                 try {
                     insertedCount_<%=cid%> = insertedCount_<%=cid%> + pstmtInsert_<%=cid %>.executeUpdate();
                    
-                } catch(Exception e) {
+                } catch(java.lang.Exception e) {
                     whetherReject_<%=cid%> = true;
                     <%
                     if (("true").equals(dieOnError)) {
@@ -1037,7 +1037,7 @@ skeleton="../templates/db_output_bulk.skeleton"
     		%>
             try {
                 deletedCount_<%=cid%> = deletedCount_<%=cid%> + pstmt_<%=cid %>.executeUpdate();
-            } catch(Exception e) {
+            } catch(java.lang.Exception e) {
                 whetherReject_<%=cid%> = true;
                 <%
                 if (("true").equals(dieOnError)) {

org.talend.designer.components.localprovider/components/tAmazonOracleOutput/tAmazonOracleOutput_messages_zh_CN.properties

@@ -0,0 +1,61 @@
+ADD_COLS.ITEM.NAME=\u4f5c\u4e1a\u540d
+ADD_COLS.ITEM.DATATYPE=\u6570\u636E\u7C7B\u578B
+ADD_COLS.ITEM.OPERATOR=\u64CD\u4F5C\u7B26
+ADD_COLS.ITEM.POS=\u4f4d\u7f6e
+ADD_COLS.ITEM.POS.ITEM.AFTER=\u4e4b\u540e
+ADD_COLS.ITEM.POS.ITEM.BEFORE=\u4e4b\u524d
+ADD_COLS.ITEM.POS.ITEM.REPLACE=\u66ff\u4ee3
+ADD_COLS.ITEM.REFCOL=\u76f8\u5173\u7684\u5217
+ADD_COLS.ITEM.SQL=SQL\u8868\u8fbe\u5f0f
+ADD_COLS.NAME=\u9644\u52a0\u5217
+CLEAR_TABLE.NAME=\u6e05\u9664\u8868\u4e2d\u7684\u6570\u636e
+COMMIT_EVERY.NAME=\u63d0\u4ea4\u95f4\u9694
+CONNECTION_TYPE.NAME=\u8FDE\u63A5\u7C7B\u578B
+DATA_ACTION.ITEM.DELETE=\u5220\u9664
+DATA_ACTION.ITEM.INSERT=\u63D2\u5165
+DATA_ACTION.ITEM.INSERT_OR_UPDATE=\u63d2\u5165\u6216\u66f4\u65b0
+DATA_ACTION.ITEM.UPDATE=\u66F4\u65B0
+DATA_ACTION.ITEM.UPDATE_OR_INSERT=\u66f4\u65b0\u6216\u63d2\u5165
+DATA_ACTION.NAME=\u6570\u636E\u64CD\u4F5C
+DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
+DBD-Oracle.INFO=\u4e3aOracle\u6240\u5fc5\u9700
+DBD-Pg.INFO=\u4e3aPostgreSQL\u6240\u5fc5\u9700
+DBD-mysql.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
+DIE_ON_ERROR.NAME=\u9519\u8bef\u65f6\u7ec8\u6b62
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+NULL_CHAR.NAME=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
+PASS.NAME=\u5bc6\u7801
+PORT.NAME=\u7aef\u53e3
+QUERY.NAME=\u67E5\u8BE2
+SCHEMA_FLOW.NAME=\u67B6\u6784
+SQL_SYNTAX.NAME=SQL \u8bed\u53e5\u987b\u88ab\u6307\u5b9a
+STRING_QUOTE.NAME=\u5b57\u7b26\u4e32\u5f15\u7528
+TABLE.NAME=\u540E\u8FD0\u884C
+TABLE_ACTION.ITEM.CLEAR=\u6E05\u9664\u8868\u4E2D\u6570\u636E
+TABLE_ACTION.ITEM.CREATE=\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.CREATE_IF_NOT_EXISTS=\u5982\u679C\u8868\u4E0D\u5B58\u5728\u521B\u5EFA\u8868
+TABLE_ACTION.ITEM.DROP_IF_EXISTS_AND_CREATE=\u5982\u679c\u8868\u5b58\u5728\u5220\u9664\u7136\u540e\u521b\u5efa
+TABLE_ACTION.ITEM.DROP_CREATE=\u5220\u9664\u5E76\u521B\u5EFA\u8868
+TABLE_ACTION.NAME=\u8868\u64CD\u4F5C
+TYPE.NAME=\u6570\u636e\u5e93\u9a71\u52a8
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+LOCAL_SERVICE_NAME.NAME=\u672C\u5730\u670D\u52A1\u540D
+CONVERT_COLUMN_TABLE_TO_UPPERCASE.NAME=\u8F6C\u6362\u5217\u548C\u8868\u4E3A\u5927\u5199\u5B57\u6BCD
+ENABLE_DEBUG_MODE.NAME=\u542F\u7528\u8C03\u8BD5\u6A21\u5F0F
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+DB_VERSION.ITEM.ORACLE_11-6=Oracle 11-6
+OVERRIDE_NLS_LANG.NAME=\u8986\u76D6\u4EFB\u4F55\u5DF2\u5B58\u5728\u7684NLS_LANG\u73AF\u5883\u53D8\u91CF
+NB_LINE_UPDATED.NAME=\u66f4\u65b0\u7684\u884c\u6570
+NB_LINE_INSERTED.NAME=\u63D2\u5165\u7684\u884C\u6570
+NB_LINE_DELETED.NAME=\u5220\u9664\u7684\u884c\u6570
+BATCH_SIZE.NAME=\u6279\u5927\u5C0F
+HINT_OPTIONS.ITEM.POSITION=\u4f4d\u7f6e
+HINT_OPTIONS.ITEM.POSITION.ITEM.AFTER=\u4e4b\u540e
+HINT_OPTIONS.ITEM.SQL_STMT.ITEM.INSERT=\u63D2\u5165
+HINT_OPTIONS.ITEM.SQL_STMT.ITEM.UPDATE=\u66F4\u65B0
+HINT_OPTIONS.ITEM.SQL_STMT.ITEM.DELETE=\u5220\u9664
+NOTE.NAME=\u8282\u70b9
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868
+MAPPING.NAME=\u6620\u5c04
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b

org.talend.designer.components.localprovider/components/tAmazonOracleRollback/tAmazonOracleRollback_messages_zh_CN.properties

@@ -0,0 +1,2 @@
+CLOSE.NAME=\u5173\u95ED\u8FDE\u63A5
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868

org.talend.designer.components.localprovider/components/tAmazonOracleRow/tAmazonOracleRow_java.xml

@@ -25,7 +25,7 @@
 
   <CONNECTORS>
     <CONNECTOR CTYPE="FLOW" MAX_INPUT="1" MAX_OUTPUT="1"/>
-    <CONNECTOR NAME="REJECT" CTYPE="FLOW" MAX_INPUT="0" MAX_OUTPUT="1" LINE_STYLE="2" COLOR="FF0000" BASE_SCHEMA="FLOW" />
+    <CONNECTOR NAME="REJECT" NOT_SHOW_IF="(DIE_ON_ERROR == 'true')" CTYPE="FLOW" MAX_INPUT="0" MAX_OUTPUT="1" LINE_STYLE="2" COLOR="FF0000" BASE_SCHEMA="FLOW" />
     <CONNECTOR CTYPE="ITERATE" MAX_OUTPUT="1" MAX_INPUT="1"/>
     <CONNECTOR CTYPE="SUBJOB_OK" MAX_INPUT="1" />
     <CONNECTOR CTYPE="SUBJOB_ERROR" MAX_INPUT="1" />

org.talend.designer.components.localprovider/components/tAmazonOracleRow/tAmazonOracleRow_main.javajet

@@ -175,7 +175,7 @@ try {
 	}//end feature 0010425
 %>
 
-    } catch (Exception e) {
+    } catch (java.lang.Exception e) {
         whetherReject_<%=cid%> = true;
         <%
         if (("true").equals(dieOnError)) {

org.talend.designer.components.localprovider/components/tAmazonOracleRow/tAmazonOracleRow_messages_zh_CN.properties

@@ -0,0 +1,28 @@
+COMMIT_EVERY.NAME=\u63d0\u4ea4\u95f4\u9694
+CONNECTION_TYPE.NAME=\u8FDE\u63A5\u7C7B\u578B
+DBD-ODBC.INFO=\u4e3aODBC-like\u6240\u5fc5\u9700
+DBD-Oracle.INFO=\u4e3aOracle\u6240\u5fc5\u9700
+DBD-Pg.INFO=\u4e3aPostgreSQL\u6240\u5fc5\u9700
+DBD-mysql.INFO=\u4e3aMySQL\u6240\u5fc5\u987b
+DBTABLE.NAME=\u6570\u636e\u8868
+DIE_ON_ERROR.NAME=\u9519\u8bef\u65f6\u7ec8\u6b62
+ENCODING.NAME=\u7f16\u7801
+HOST.NAME=\u4e3b\u673a
+LOCAL_SERVICE_NAME.NAME=\u672C\u5730\u670D\u52A1\u540D
+PASS.NAME=\u5bc6\u7801
+PORT.NAME=\u7aef\u53e3
+QUERY.NAME=\u67E5\u8BE2
+SCHEMA_DB.NAME=\u67B6\u6784
+STATEMENT_PARAMS.ITEM.INPUT_COLUMN=\u8F93\u5165\u680F
+TYPE.NAME=\u7C7B\u578B
+USE_EXISTING_CONNECTION.NAME=\u5E94\u7528\u5DF2\u5B58\u5728\u7684\u8FDE\u63A5
+TABLE.NAME=\u6570\u636e\u8868
+DB_VERSION.NAME=\u6570\u636e\u5e93\u7248\u672c
+DB_VERSION.ITEM.ORACLE_11-6=Oracle 11-6
+OVERRIDE_NLS_LANG.NAME=\u8986\u76D6\u4EFB\u4F55\u5DF2\u5B58\u5728\u7684NLS_LANG\u73AF\u5883\u53D8\u91CF
+PROPERTY.NAME=\u5c5e\u6027\u7c7b\u578b
+CONNECTION.NAME=\u7ec4\u4ef6\u5217\u8868
+SCHEMA_FLOW.NAME=\u67B6\u6784
+QUERYSTORE.NAME=\u67e5\u8be2\u7c7b\u578b
+SET_PREPAREDSTATEMENT_PARAMETERS.ITEM.PARAMETER_TYPE.ITEM.Time=\u65f6\u95f4
+USE_NB_LINE.ITEM.NB_LINE_DELETED=\u5DF2\u5220\u9664

org.talend.designer.components.localprovider/components/tApacheLogInput/tApacheLogInput_begin.javajet

@@ -159,7 +159,7 @@
 					
 <%if(rejectConnName.equals(firstConnName)) {%> <%=firstConnName %> = null; <%}%>					
 					
-    } catch (Exception e) {
+    } catch (java.lang.Exception e) {
         whetherReject_<%=cid%> = true;
         <%
         if (dieOnError) {

org.talend.designer.components.localprovider/components/tApacheLogInput/tApacheLogInput_java.xml

@@ -24,7 +24,7 @@
 
   <CONNECTORS>
     <CONNECTOR CTYPE="FLOW" MAX_INPUT="0" MAX_OUTPUT="1"/>
-    <CONNECTOR NAME="REJECT" CTYPE="FLOW" MAX_INPUT="0" MAX_OUTPUT="1" LINE_STYLE="2" COLOR="FF0000" BASE_SCHEMA="FLOW" />    
+    <CONNECTOR NAME="REJECT" NOT_SHOW_IF="(DIE_ON_ERROR == 'true')" CTYPE="FLOW" MAX_INPUT="0" MAX_OUTPUT="1" LINE_STYLE="2" COLOR="FF0000" BASE_SCHEMA="FLOW" />    
     <CONNECTOR CTYPE="ITERATE" MAX_OUTPUT="1" MAX_INPUT="1"/>
     <CONNECTOR CTYPE="SUBJOB_OK" MAX_INPUT="1" />
     <CONNECTOR CTYPE="SUBJOB_ERROR" MAX_INPUT="1" />

org.talend.designer.components.localprovider/components/tApacheLogInput/tApacheLogInput_messages_zh_CN.properties

@@ -0,0 +1,4 @@
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+FILENAME.NAME=\u6587\u4EF6\u540D
+DIE_ON_ERROR.NAME=\u9519\u8bef\u65f6\u7ec8\u6b62
+ENCODING.NAME=\u7f16\u7801

org.talend.designer.components.localprovider/components/tArray/tArray_messages_zh_CN.properties

@@ -0,0 +1,5 @@
+LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
+RUN_IF.MENU=\u6B63\u5E38\u65F6\u8FD0\u884C
+SCHEMA.NAME=\u67B6\u6784
+NB_LINE.NAME=\u884c\u6570
+DESTINATION.NAME=\u76EE\u6807\u8DEF\u5F84