Fix Bug TDI-26545 : tGreenplum components are not correctly using schema

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

org.talend.componentdesigner-feature/feature.xml

@@ -740,7 +740,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="true"/>
 
    <plugin
          id="org.eclipse.jet.core"

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

@@ -46,7 +46,6 @@ ComponentProjectPreferencePage.Warning=Warnung
 AbstractXMLConfigPage.VERSIONTip=Ein Dezimalwert zur Angabe der Version Ihrer neuen Komponente.
 WizardJetFilesChoosePage.Directory=Verzeichnis:
 CreateComponentWizard.NewComponent=Neue Komponente
-WizardComponentFolderPage.Name=Name
 RemoveResourceAction.Remove=Entfernen
 WizardJetFilesChoosePage.UseIconFrom=Verwende Icon von:
 ImportComponentDialog.ImportFinished=Import der Komponente abgeschlossen

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

@@ -4,7 +4,7 @@ EditComponentActionProvider.Edit=Editer ce composant
 ImportComponentDialog.ErrorMSG4=Aucun composant sélectionné pour l'import
 ProjectSelectionDialog.SelectPath=Sélectionner le chemin du projet
 AbstractXMLConfigPage.TYPETip=Type de données.
-PushToPaletteActionProvider.Error2=Erreur
+PushToPaletteActionProvider.Error2=ERROR
 CopyFromPaletteActionProvider.Label2=Importer les composants de la Palette
 AbstractXMLConfigPage.MAXOUTPUTTip=Entier. Nombre maximum de sorties pour cette connexion.
 ImportComponentDialog.Browser=Parcourir...
@@ -18,7 +18,7 @@ CreateComponentWizard.SpecifyRes=Sp
 AbstractXMLConfigPage.REPOSITORYVALUETip=Référentiel de Métadonnées à sélectionner.
 PushToPaletteActionProvider.ErrorMSG=Le répertoire des composants utilisateur n'est pas défini.
 AbstractXMLConfigPage.NUMROWTip=Entier. Position de ligne du paramètre dans la vue Composant
-PushToPaletteActionProvider.Error=Erreur
+PushToPaletteActionProvider.Error=ERROR
 ComponentProjectManager.InternalErrorMsg=Erreur interne \: {(0)}
 AbstractXMLConfigPage.IntValue=Entier
 ImportComponentDialog.ImportCanceled=Import des composants annulé

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

@@ -19,16 +19,21 @@ WizardComponentFolderPage.ErrMSG1=Nije ozna\u010Den jezik za komponentu
 CreateComponentWizard.FillIn=Popuni svojstva komponente
 ComponentProjectPreferencePage.Warning=Upozorenje
 AbstractXMLConfigPage.VERSIONTip=Decimalna vrijednost koja ozna\u010Dava verziju va\u0161e nove komponente.
+WizardJetFilesChoosePage.Directory=Direktorij:
 WizardComponentFolderPage.Name=Ime
+RemoveResourceAction.Remove=Ukloni
+WizardJetFilesChoosePage.UseIconFrom=Koristi ikonu iz:
 AbstractXMLConfigPage.SetProperties=Postavi svojstva odabranog elementa.
 AddResourceAction.AddLib=Dodaj biblioteke...
 WizardComponentFolderPage.Perl=Perl
 AbstractXMLConfigPage.NBLINESTip=Cjelobrojna vrijednost. Linije se prote\u017Eu od tog parametra unutar Component pogleda.
 AbstractXMLConfigPage.MININPUTTip=Integer vrijednost. Najmanji broj ulaza za ovu vezu.
+WizardJetFilesChoosePage.UseDefaultIcon=Koristi zadanu ikonu
 WizardComponentFolderPage.LongName=Duga\u010Dko ime (mouseover tooltip)
 CopyComponentActionProvider.CopyComponent=Kopiraj tu komponentu
 AddExternalResourceAction.ErrorMsg=Ozna\u010Dena vanjska arhiva nije dostupna ili ne postoji.
 CopyFromPaletteActionProvider.Label=Kopiraj komponentu iz izbornika Palette
+WizardJetFilesChoosePage.ChoseAIcon=Odaberi ikonu
 AbstractXMLConfigPage.LINESTYLETip=Cjelobrojna vrijednost'. Stil spojne linije (1. Puna, 2: Crtkana, 3: To\u010Dka, 4: Crta-To\u010Dka)
 ComponentProjectPreferencePage.ButtonLabel0=U redu
 CreateComponentWizard.MainProperties=Glavna svojstva

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

@@ -0,0 +1,13 @@
+PushToPaletteActionProvider.Error2=Fout
+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_sr.properties

@@ -1,3 +1,2 @@
 PushToPaletteActionProvider.Error2=Gre\u0161ka
 PushToPaletteActionProvider.Error=Gre\u0161ka
-AbstractXMLConfigPage.Delete=DELETE

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

@@ -0,0 +1,88 @@
+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
+PushToPaletteActionProvider.PushToPaletteActionProvider.result=\u9A8C\u8BC1\u7ED3\u679C

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.componentdesigner/src/org/talend/componentdesigner/manager/ComponentProjectManager.java

@@ -124,6 +124,7 @@ public final class ComponentProjectManager {
         // create the new project operation
         IRunnableWithProgress op = new IRunnableWithProgress() {
 
+            @Override
             public void run(IProgressMonitor monitor) throws InvocationTargetException {
                 CreateProjectOperation op = new CreateProjectOperation(description,
                         Messages.getString("ComponentProjectManager.NewProject")); //$NON-NLS-1$
@@ -183,6 +184,7 @@ public final class ComponentProjectManager {
     public void configProject(final IProject project, Shell shell) {
         IRunnableWithProgress op = new IRunnableWithProgress() {
 
+            @Override
             public void run(IProgressMonitor monitor) throws InvocationTargetException {
                 monitor.beginTask("Configure project...", 4);
                 try {
@@ -222,15 +224,17 @@ public final class ComponentProjectManager {
         if (monitor != null && monitor.isCanceled()) {
             throw new OperationCanceledException();
         }
-        if (project == null)
+        if (project == null) {
             return;
+        }
         IClasspathEntry[] entries = null;
         List<IClasspathEntry> cpEntries = new ArrayList<IClasspathEntry>();
         cpEntries.addAll(Arrays.asList(getDefaultJREClasspathEntries()));
         cpEntries.addAll(getDefaultUtilClasspathEntries());
-        entries = (IClasspathEntry[]) cpEntries.toArray(new IClasspathEntry[cpEntries.size()]);
-        if (monitor != null)
+        entries = cpEntries.toArray(new IClasspathEntry[cpEntries.size()]);
+        if (monitor != null) {
             monitor.worked(1);
+        }
 
         IPath output = getOutputLocation();
         IProgressMonitor subProgressMonitor = monitor == null ? new NullProgressMonitor() : new SubProgressMonitor(monitor, 2);
@@ -260,7 +264,6 @@ public final class ComponentProjectManager {
         addLibClasspathEntries(ces, "org.talend.metadata.managment"); //$NON-NLS-1$
         addLibClasspathEntries(ces, "org.talend.core"); //$NON-NLS-1$
         addLibClasspathEntries(ces, "org.talend.designer.codegen"); //$NON-NLS-1$
-        addLibClasspathEntries(ces, "org.talend.commons"); //$NON-NLS-1$
         return ces;
     }
 

org.talend.componentdesigner/src/org/talend/componentdesigner/ui/action/provider/NewActionProvider.java

@@ -39,7 +39,6 @@ public class NewActionProvider extends CommonActionProvider {
 
     private IAction newProjectAction;
 
-    @Override
     public void init(ICommonActionExtensionSite anExtensionSite) {
 
         if (anExtensionSite.getViewSite() instanceof ICommonViewerWorkbenchSite) {
@@ -50,7 +49,6 @@ public class NewActionProvider extends CommonActionProvider {
     /**
      * Adds a submenu to the given menu with the name "New Component".
      */
-    @Override
     public void fillContextMenu(IMenuManager menu) {
         for (IContributionItem item : menu.getItems()) {
             if (item == null || item.getId() == null) {
@@ -84,7 +82,6 @@ public class NewActionProvider extends CommonActionProvider {
         /*
          * (non-Javadoc) Method declared on IAction.
          */
-        @Override
         public void run() {
             CreateComponentWizard wizard = new CreateComponentWizard();
             wizard.init(PlatformUI.getWorkbench(), null);

org.talend.componentdesigner/src/org/talend/componentdesigner/ui/composite/TreeNodeAttrCompsite.java

@@ -60,7 +60,6 @@ public class TreeNodeAttrCompsite extends Composite {
 
             nodeText.addModifyListener(new ModifyListener() {
 
-                @Override
                 public void modifyText(ModifyEvent e) {
                     nodeData.getXMLNode().setTextContent(nodeText.getText());
                     nodeData.setBodayText(nodeText.getText());
@@ -88,7 +87,6 @@ public class TreeNodeAttrCompsite extends Composite {
 
                     attrText.addModifyListener(new ModifyListener() {
 
-                        @Override
                         public void modifyText(ModifyEvent e) {
                             String attrName = attrLabel.getText().split(MARK)[0];
                             if (attrText.getText().equals(PluginConstant.EMPTY_STRING)) {
@@ -130,7 +128,6 @@ public class TreeNodeAttrCompsite extends Composite {
 
                     attrCombo.addModifyListener(new ModifyListener() {
 
-                        @Override
                         public void modifyText(ModifyEvent e) {
                             String attrName = attrLabel.getText().split(MARK)[0];
                             if (attrCombo.getText().equals(PluginConstant.EMPTY_STRING)) {

org.talend.componentdesigner/src/org/talend/componentdesigner/ui/preferencepage/ComponentProjectPreferencePage.java

@@ -12,11 +12,15 @@
 // ============================================================================
 package org.talend.componentdesigner.ui.preferencepage;
 
+import java.io.File;
+
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.preference.DirectoryFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.IWorkbench;
@@ -27,8 +31,8 @@ import org.talend.componentdesigner.i18n.internal.Messages;
 
 /**
  * This class represents a preference page that is contributed to the Preferences dialog. By subclassing
- * <samp>FieldEditorPreferencePage</samp>, we can use the field support built into JFace that allows us to create a
- * page that is small and knows how to save, restore and apply itself.
+ * <samp>FieldEditorPreferencePage</samp>, we can use the field support built into JFace that allows us to create a page
+ * that is small and knows how to save, restore and apply itself.
  * <p>
  * This page is used to modify preferences only. They are stored in the preference store that belongs to the main
  * plug-in class. That way, preferences can be accessed directly via the preference store.
@@ -50,6 +54,7 @@ public class ComponentProjectPreferencePage extends FieldEditorPreferencePage im
      * 
      * @see org.eclipse.jface.preference.PreferencePage#performApply()
      */
+    @Override
     protected void performApply() {
         super.performApply();
     }
@@ -59,29 +64,47 @@ public class ComponentProjectPreferencePage extends FieldEditorPreferencePage im
      * 
      * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
      */
+    @Override
     public void createFieldEditors() {
         Label l = new Label(getFieldEditorParent(), SWT.NONE);
         l.setText(Messages.getString("ComponentProjectPreferencePage.ChooseProject")); //$NON-NLS-1$
         GridData gd = new GridData();
         gd.horizontalSpan = 3;
         l.setLayoutData(gd);
-        filePathTemp = new DirectoryFieldEditor(PluginConstant.PROJECT_URL, Messages
-                .getString("ComponentProjectPreferencePage.ComponentProject"), //$NON-NLS-1$
+        filePathTemp = new DirectoryFieldEditor(PluginConstant.PROJECT_URL,
+                Messages.getString("ComponentProjectPreferencePage.ComponentProject"), //$NON-NLS-1$
                 getFieldEditorParent());
         addField(filePathTemp);
+        // addModifyListener for the filePath text
+        filePathTemp.getTextControl(getFieldEditorParent()).addModifyListener(new ModifyListener() {
+
+            @Override
+            public void modifyText(ModifyEvent e) {
+                String newPath = filePathTemp.getTextControl(getFieldEditorParent()).getText();
+                File file = new File(newPath);
+                if (!file.exists() && !"".equals(newPath)) {
+                    filePathTemp.showErrorMessage();
+                    setValid(false);
+                } else {
+                    setValid(true);
+                }
+            }
+        });
     }
 
     /*
      * (non-Javadoc)
      * 
-     * @see org.eclipse.jface.preference.FieldEditorPreferencePage#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
+     * @see
+     * org.eclipse.jface.preference.FieldEditorPreferencePage#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
      */
+    @Override
     public void propertyChange(PropertyChangeEvent event) {
 
         super.propertyChange(event);
-        
-        MessageDialog warningMessageDialog = new MessageDialog(getFieldEditorParent().getShell(), Messages
-                .getString("ComponentProjectPreferencePage.Warning"), null, //$NON-NLS-1$
+
+        MessageDialog warningMessageDialog = new MessageDialog(getFieldEditorParent().getShell(),
+                Messages.getString("ComponentProjectPreferencePage.Warning"), null, //$NON-NLS-1$
                 Messages.getString("ComponentProjectPreferencePage.WarningMSG"), MessageDialog.WARNING, //$NON-NLS-1$
                 new String[] { Messages.getString("ComponentProjectPreferencePage.ButtonLabel0") }, 0); //$NON-NLS-1$
         warningMessageDialog.open();
@@ -92,6 +115,7 @@ public class ComponentProjectPreferencePage extends FieldEditorPreferencePage im
      * 
      * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
      */
+    @Override
     public void init(IWorkbench workbench) {
     }
 
@@ -100,6 +124,7 @@ public class ComponentProjectPreferencePage extends FieldEditorPreferencePage im
      * 
      * @see org.eclipse.jface.preference.FieldEditorPreferencePage#performOk()
      */
+    @Override
     public boolean performOk() {
         ComponentDesigenerPlugin.getDefault().creatComponentProj(filePathTemp.getStringValue());
         return super.performOk();

org.talend.componentdesigner/src/org/talend/componentdesigner/ui/wizard/creatcomponent/AbstractXMLConfigPage.java

@@ -134,7 +134,6 @@ public abstract class AbstractXMLConfigPage extends AbstractComponentPage {
      * 
      * @see org.talend.componentdesigner.ui.wizard.creatcomponent.AbstractComponentPage#initialize()
      */
-    @Override
     protected void initialize() {
         availableXmlTree.addSelectionListener(new SelectionAdapter() {
 
@@ -153,7 +152,6 @@ public abstract class AbstractXMLConfigPage extends AbstractComponentPage {
                 itemDel.setText(Messages.getString("AbstractXMLConfigPage.Delete")); //$NON-NLS-1$
                 itemDel.addSelectionListener(new SelectionAdapter() {
 
-                    @Override
                     public void widgetSelected(SelectionEvent e) {
                         TreeNodeData currentNodeData = (TreeNodeData) treeItem[0].getParentItem().getData();
                         currentNodeData.getXMLNode().removeChild(((TreeNodeData) treeItem[0].getData()).getXMLNode());
@@ -173,7 +171,6 @@ public abstract class AbstractXMLConfigPage extends AbstractComponentPage {
                         nodeMenuItem.setText(itemName);
                         nodeMenuItem.addSelectionListener(new SelectionAdapter() {
 
-                            @Override
                             public void widgetSelected(SelectionEvent e) {
                                 TreeItem newItem = new TreeItem(treeItem[0], 0);
                                 newItem.setText(itemName);
@@ -229,7 +226,6 @@ public abstract class AbstractXMLConfigPage extends AbstractComponentPage {
      * 
      * @see org.talend.componentdesigner.ui.wizard.creatcomponent.AbstractComponentPage#validatePage()
      */
-    @Override
     protected boolean validatePage() {
         return false;
     }

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

@@ -0,0 +1,3 @@
+prefs.configuration.LINK_STYLE.AUTO=Automatisch
+prefs.configuration.LINK_STYLE.LINE=Lijnen (snel)
+prefs.configuration.LINK_STYLE.BEZIER_CURVE=Rondingen

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;
@@ -23,16 +26,16 @@ import org.apache.oro.text.regex.Substitution;
 import org.apache.oro.text.regex.Util;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.core.model.context.UpdateContextVariablesHelper;
-import org.talend.core.model.process.AbstractExternalNode;
 import org.talend.core.model.process.IElementParameter;
 import org.talend.core.model.process.node.IExternalMapEntry;
+import org.talend.core.model.process.node.MapperExternalNode;
 import org.talend.designer.abstractmap.ui.prefs.MapPrefsConstants;
 
 /**
  * DOC amaumont class global comment. Detailled comment <br/>
  * 
  */
-public abstract class AbstractMapComponent extends AbstractExternalNode {
+public abstract class AbstractMapComponent extends MapperExternalNode {
 
     /**
      * DOC amaumont AbstractMapComponent constructor comment.
@@ -46,6 +49,7 @@ public abstract class AbstractMapComponent extends AbstractExternalNode {
      * 
      * @see org.talend.core.model.process.IExternalNode#initialize()
      */
+    @Override
     public void initialize() {
         initElementParameters();
     }
@@ -75,7 +79,7 @@ public abstract class AbstractMapComponent extends AbstractExternalNode {
 
     protected boolean hasDataIntoExpression(Pattern pattern, PatternMatcher matcher, String expression) {
         if (expression != null) {
-            if (matcher.contains(expression, pattern)) {
+            if (matcher.matches(expression, pattern)) {
                 return true;
             }
         }
@@ -87,6 +91,7 @@ public abstract class AbstractMapComponent extends AbstractExternalNode {
      * 
      * @see org.talend.core.model.process.INode#useData(java.lang.String)
      */
+    @Override
     public boolean useData(String name) {
         if (super.useData(name)) {
             return true;
@@ -103,6 +108,7 @@ public abstract class AbstractMapComponent extends AbstractExternalNode {
      * 
      * @see org.talend.core.model.process.INode#renameData(java.lang.String, java.lang.String)
      */
+    @Override
     public void renameData(String oldName, String newName) {
         super.renameData(oldName, newName);
 
@@ -110,11 +116,17 @@ public abstract class AbstractMapComponent extends AbstractExternalNode {
 
     }
 
+    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);
@@ -122,8 +134,15 @@ public abstract class AbstractMapComponent extends AbstractExternalNode {
         }
     }
 
+    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_de.properties

@@ -14,5 +14,4 @@ AlfrescoOutputModelManager.prefixConflict=Kann das Modell nicht hinzuf
 AlfrescoOutputModelManager.notYetAdded=Dieses Modell wurde noch nicht hinzugefügt.
 AlfrescoModelDialog.type=Typ
 AlfrescoModelDialog.addModelFailed=Modell hinzufügen fehlgeschlagen
-AlfrescoModelDialog.modelTable.name=Name
 AlfrescoModelDialog.remove=Entfernen

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

@@ -10,4 +10,5 @@ AlfrescoOutputModelManager.prefixConflict=Ne mogu dodati model, prefix je u konf
 AlfrescoOutputModelManager.notYetAdded=Taj model jo\u0161 nije dodan
 AlfrescoModelDialog.addModelFailed=Dodavanje modela nije uspjelo
 AlfrescoModelDialog.modelTable.name=Ime
+AlfrescoModelDialog.remove=Ukloni
 AlfrescoOutputManager.failedLoadModel=U\u010Ditavanje modela iz metapodataka komponente nije uspjelo, reinicijaliziram

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

@@ -0,0 +1,5 @@
+AlfrescoModelDialog.modelTable.title=Titel
+AlfrescoOutputManager.schemaError.title=Fout in schema
+AlfrescoModelDialog.add=Toevoegen
+AlfrescoModelDialog.removeModelFailed=Fout bij verwijderen model
+AlfrescoModelDialog.modelTable.name=Naam

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

@@ -1,3 +1,4 @@
 AlfrescoModelDialog.modelTable.title=Ba\u015Fl\u0131k
 AlfrescoModelDialog.add=Ekle...
+AlfrescoModelDialog.type=Tip
 AlfrescoModelDialog.modelTable.name=Ad\u0131

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_ar.properties

@@ -53,3 +53,4 @@ BusinessNewDiagramFileWizard.SelectDiagramRootElement=\u0627\u062E\u062A\u0631 \
 BusinessAbstractParser.StringFloatConvertError=\u0644\u0627 \u064A\u0645\u0643\u0646 \u062A\u062D\u0648\u064A\u0644 \u0642\u064A\u0645\u0629 \u0646\u0635\u064A\u0629 \u0625\u0644\u0649 \u0642\u064A\u0645\u0629 \u0639\u0634\u0631\u064A\u0629
 BusinessAbstractParser.StringValueDoesNotConvertToByteValue=\u0644\u0627 \u064A\u0645\u0643\u0646 \u062A\u062D\u0648\u064A\u0644 \u0642\u064A\u0645\u0629 \u0646\u0635\u064A\u0629 \u0625\u0644\u0649 \u0642\u064A\u0645\u0629 \u0628\u0627\u064A\u062A
 DeleteAssignmentAction.DeleteAssignment=\u062D\u0630\u0641 \u062A\u0643\u0644\u064A\u0641
+BusinessDiagramEditor.canNotSaveTitle=\u062A\u062D\u0630\u064A\u0631

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

@@ -16,7 +16,6 @@ BusinessModelingAssistantProvider.AvaiableDomainModelElements=Verf
 BusinessPaletteFactory.BidirectionalRelationShip=Bidirektionale Beziehung
 BusinessPaletteFactory.CreateDirectionalRelationShip=Direktionale Beziehung hinzufügen
 BusinessPaletteFactory.CreateBidirectionalRelationShip=Bidirektionale Beziehung hinzufügen
-AssignmentPropertySection.Name=Name
 CreateAssignmentCommand.CannotAssign=Zuordnung nicht möglich.
 BusinessNewDiagramFileWizard.DiagramRootElement=Diagramm root-Element
 BusinessNewDiagramFileWizard.NoDiagramRootElementSelectedError=Kein Diagram-Root Element ausgewählt
@@ -79,3 +78,4 @@ BusinessAbstractParser.StringValueDoesNotConvertToByteValue=String-Wert l
 BusinessNewDiagramFileWizard.IntialNewEcoreDiagramFile=Neue Ecore-Diagramm-Datei initialisieren
 BusinessTooltipFigure.assignedMeta={0} zugewiesene Metadaten
 DeleteAssignmentAction.DeleteAssignment=Zuordnung löschen
+BusinessDiagramEditor.canNotSaveTitle=Warnung

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

@@ -75,3 +75,4 @@ BusinessAbstractParser.StringValueDoesNotConvertToByteValue=\u03A4\u03B9\u03BC\u
 BusinessNewDiagramFileWizard.IntialNewEcoreDiagramFile=\u0391\u03C1\u03C7\u03B9\u03BA\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7 \u03BD\u03AD\u03BF\u03C5 \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF\u03C5 \u03B4\u03B9\u03B1\u03B3\u03C1\u03AC\u03BC\u03BC\u03B1\u03C4\u03BF\u03C2 Ecore
 BusinessTooltipFigure.assignedMeta={0} \u03BA\u03B1\u03B8\u03BF\u03C1\u03B9\u03C3\u03BC\u03AD\u03BD\u03B1 \u039C\u03B5\u03C4\u03B1\u03B4\u03B5\u03B4\u03BF\u03BC\u03AD\u03BD\u03B1
 DeleteAssignmentAction.DeleteAssignment=\u0394\u03B9\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE \u0391\u03BD\u03AC\u03B8\u03B5\u03C3\u03B7\u03C2
+BusinessDiagramEditor.canNotSaveTitle=\u03A0\u03C1\u03BF\u03B5\u03B9\u03B4\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7

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

@@ -79,3 +79,5 @@ BusinessAbstractParser.StringValueDoesNotConvertToByteValue=String value cannot
 BusinessNewDiagramFileWizard.IntialNewEcoreDiagramFile=Initialize new Ecore diagram file
 BusinessTooltipFigure.assignedMeta={0} assigned Metadata
 DeleteAssignmentAction.DeleteAssignment=Delete Assignment
+BusinessDiagramEditor.canNotSaveTitle=Warning
+BusinessDiagramEditor.canNotSaveMessage=Business Model is not locked by user, can not save.

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

@@ -46,3 +46,4 @@ BusinessAbstractParser.ValueOfIntegerIsExpected=Se esperaba un valor de tipo Int
 BusinessNewDiagramFileWizard.SelectDiagramRootElement=Seleccione un elemento del diagrama principal:
 BusinessAbstractParser.StringFloatConvertError=Valor del String no puede ser convertido a Float
 BusinessAbstractParser.StringValueDoesNotConvertToByteValue=Valor del String no puede ser convertido a Byte
+BusinessDiagramEditor.canNotSaveTitle=Advertencia

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

@@ -26,7 +26,7 @@ BusinessAbstractParser.ValueOfTypeByteIsExpected=Une valeur de type Byte est att
 BusinessAbstractParser.ValueOfTypeCharacterIsExpected=Une valeur de type Character est attendue
 BusinessPaletteFactory.ActionComment=Créer une nouvelle action
 BusinessAbstractParser.ValueOfTypeStringIsExpected=Une valeur de type String est attendue
-BusinessInitDiagramFileAction.Error=Erreur
+BusinessInitDiagramFileAction.Error=ERROR
 BusinessNewDiagramFileWizard.SelectRootElement=Sélectionnez un élément racine
 RepositoryFactoryProxyLabelProvider.Deleted=(Supprimé)
 BusinessPaletteFactory.TerminalComment=Créer un nouveau Terminal
@@ -45,7 +45,7 @@ BusinessPaletteFactory.InputComment=Cr
 BusinessPaletteFactory.Data=Données
 BusinessPaletteFactory.Ellipse=Ellipse
 BusinessPaletteFactory.Input=Lecture
-BusinessPaletteFactory.List=Liste
+BusinessPaletteFactory.List=liste
 BusinessPaletteFactory.Relationshop=Relation
 BusinessAbstractParser.ValueOfBooleanIsExpected=Une valeur de type Boolean est attendue
 BusinessPaletteFactory.decision=Décision
@@ -79,3 +79,4 @@ BusinessAbstractParser.StringValueDoesNotConvertToByteValue=Une valeur de cha
 BusinessNewDiagramFileWizard.IntialNewEcoreDiagramFile=Initialiser un nouveau fichier diagramme Ecore
 BusinessTooltipFigure.assignedMeta={0} Métadonnée affectée
 DeleteAssignmentAction.DeleteAssignment=Effacer l'affectation.
+BusinessDiagramEditor.canNotSaveTitle=Avertissement

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

@@ -64,3 +64,4 @@ BusinessAbstractParser.StringFloatConvertError=String nije mogu\u0107e konvertir
 BusinessAbstractParser.StringValueDoesNotConvertToByteValue=String nije mogu\u0107e konvertirati u Byte
 BusinessNewDiagramFileWizard.IntialNewEcoreDiagramFile=Inicijaliziranje nove datoteke za  Ecore dijagram
 DeleteAssignmentAction.DeleteAssignment=Izbri\u0161i pridru\u017Eivanje
+BusinessDiagramEditor.canNotSaveTitle=Upozorenje

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

@@ -77,3 +77,4 @@ BusinessAbstractParser.StringValueDoesNotConvertToByteValue=Valore String non co
 BusinessNewDiagramFileWizard.IntialNewEcoreDiagramFile=Inizializzare un nuovo file di diagramma Ecore
 BusinessTooltipFigure.assignedMeta={0} Metadati assegnati
 DeleteAssignmentAction.DeleteAssignment=Elimina Assegnazione
+BusinessDiagramEditor.canNotSaveTitle=Avvertimento

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

@@ -79,3 +79,5 @@ BusinessAbstractParser.StringValueDoesNotConvertToByteValue=String \u5024\u3092
 BusinessNewDiagramFileWizard.IntialNewEcoreDiagramFile=\u65B0\u898F Ecore \u30C0\u30A4\u30A2\u30B0\u30E9\u30E0 \u30D5\u30A1\u30A4\u30EB\u306E\u521D\u671F\u5316
 BusinessTooltipFigure.assignedMeta=\u5272\u308A\u5F53\u3066\u3089\u308C\u305F\u30E1\u30BF\u30C7\u30FC\u30BF {0}
 DeleteAssignmentAction.DeleteAssignment=\u5272\u308A\u5F53\u3066\u306E\u524A\u9664
+BusinessDiagramEditor.canNotSaveTitle=\u8B66\u544A
+BusinessDiagramEditor.canNotSaveMessage=\u4ED6\u306E\u30E6\u30FC\u30B6\u304C\u64CD\u4F5C\u4E2D\u306E\u305F\u3081\u3001\u30D3\u30B8\u30CD\u30B9\u30E2\u30C7\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093\u3002

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

@@ -0,0 +1,9 @@
+AssignmentPropertySection.Name=Naam
+BusinessPaletteFactory.ActionComment=Nieuwe Aktie
+BusinessInitDiagramFileAction.Error=Fout
+AssignmentPropertySection.Comment=Opmerking
+BusinessPaletteFactory.Data=Data
+BusinessPaletteFactory.Ellipse=Elips
+BusinessPaletteFactory.Document=Document
+BusinessPaletteFactory.Action=Aktie
+BusinessPaletteFactory.DocuemntComment=Nieuw Document

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

@@ -57,3 +57,4 @@ BusinessAbstractParser.StringFloatConvertError=Warto\u015B\u0107 typu znakowego
 BusinessAbstractParser.StringValueDoesNotConvertToByteValue=Warto\u015B\u0107 typu znakowego nie mo\u017Ce by\u0107 skonwertowana na warto\u015B\u0107 typu Byte
 BusinessNewDiagramFileWizard.IntialNewEcoreDiagramFile=Inicjalizuj nowy plik diagramu Ecore
 DeleteAssignmentAction.DeleteAssignment=Skasuj przypisanie
+BusinessDiagramEditor.canNotSaveTitle=Ostrze\u017Cenie

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

@@ -64,3 +64,4 @@ BusinessNewDiagramFileWizard.SelectSemanticModelElement=Selecione o elemento de
 BusinessNewDiagramFileWizard.IntialNewEcoreDiagramFile=Iniciar novo arquivo de Diagrama Ecore
 BusinessTooltipFigure.assignedMeta=Metadados atribuidos à {0}
 DeleteAssignmentAction.DeleteAssignment=Apagar Cessão
+BusinessDiagramEditor.canNotSaveTitle=Advertência

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

@@ -73,3 +73,4 @@ BusinessAbstractParser.StringValueDoesNotConvertToByteValue=\u0421\u0442\u0440\u
 BusinessNewDiagramFileWizard.IntialNewEcoreDiagramFile=\u0418\u043D\u0438\u0446\u0438\u0430\u043B\u0438\u0437\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u0444\u0430\u0439\u043B \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u044B Ecore
 BusinessTooltipFigure.assignedMeta={0} \u043F\u0440\u0438\u0441\u0432\u043E\u0435\u043D\u044B \u043C\u0435\u0442\u0430-\u0434\u0430\u043D\u043D\u044B\u0435
 DeleteAssignmentAction.DeleteAssignment=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043D\u0430\u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435
+BusinessDiagramEditor.canNotSaveTitle=\u041F\u0440\u0435\u0434\u0443\u043F\u0440\u0435\u0436\u0434\u0435\u043D\u0438\u0435

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

@@ -1,3 +1,4 @@
+AssignmentPropertySection.Type=Tip
 AssignmentPropertySection.Name=Ad\u0131
 BusinessInitDiagramFileAction.Error=Hata
 BusinessPaletteFactory.InputComment=Yeni giri\u015F olu\u015Ftur

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

@@ -0,0 +1,81 @@
+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
+BusinessDiagramEditor.canNotSaveTitle=\u8B66\u544A

org.talend.designer.business.diagram/plugin.xml

@@ -557,5 +557,16 @@
             level="20"
             name="ReadDiagramAction"/>
    </extension>
+   <extension
+         point="org.eclipse.core.expressions.definitions">
+      <definition
+            id="isActiveEditorOfBusinessModelEditor">
+         <not>
+            <instanceof
+                  value="org.talend.designer.business.model.business.diagram.part.BusinessDiagramEditor">
+            </instanceof>
+         </not>
+      </definition>
+   </extension>
    
 </plugin>

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/OpenDiagramAction.java

@@ -69,6 +69,7 @@ public class OpenDiagramAction extends AContextualAction implements IIntroAction
      * 
      * @see org.eclipse.jface.action.Action#run()
      */
+    @Override
     protected void doRun() {
         ISelection selection = getSelectedObject();
         if (selection == null) {
@@ -96,10 +97,11 @@ public class OpenDiagramAction extends AContextualAction implements IIntroAction
                 if (part instanceof BusinessDiagramEditor) {
                     ((BusinessDiagramEditor) part).setLastVersion(true);
                 }
-                IRepositoryView view = getViewPart();
-                if (view != null) {
-                    view.refresh(repositoryNode);
-                }
+                // TDI-21143 : Studio repository view : remove all refresh call to repo view
+                // IRepositoryView view = getViewPart();
+                // if (view != null) {
+                // view.refresh(repositoryNode);
+                // }
             }
         }
     }

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/diagram/custom/edit/parts/BusinessItemShapeEditPart.java

@@ -213,9 +213,9 @@ public abstract class BusinessItemShapeEditPart extends ShapeNodeEditPart {
     private BusinessAlignment getAlignment(String alignment) {
         BusinessAlignment[] alignments = BusinessAlignment.values();
         BusinessAlignment position = null;
-        for (BusinessAlignment alignment2 : alignments) {
-            if (alignment2.toString().equalsIgnoreCase(alignment)) {
-                position = alignment2;
+        for (int i = 0; i < alignments.length; i++) {
+            if (alignments[i].toString().equalsIgnoreCase(alignment)) {
+                position = alignments[i];
                 return position;
             }
 

org.talend.designer.business.diagram/src/org/talend/designer/business/diagram/custom/properties/RepositoryFactoryProxyLabelProvider.java

@@ -12,7 +12,7 @@ import org.talend.commons.ui.runtime.image.ECoreImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
 import org.talend.commons.ui.runtime.image.OverlayImage;
 import org.talend.commons.ui.runtime.image.OverlayImage.EPosition;
-import org.talend.core.model.metadata.MetadataTool;
+import org.talend.core.model.metadata.MetadataToolHelper;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.metadata.builder.connection.Query;
 import org.talend.core.model.metadata.builder.connection.SAPFunctionUnit;
@@ -42,15 +42,16 @@ public class RepositoryFactoryProxyLabelProvider extends AdapterFactoryLabelProv
             if (columnIndex == 0) {
                 IRepositoryViewObject lastVersion = getLastVersion(object);
                 if (lastVersion == null) {
-                    MetadataTable table = MetadataTool.getMetadataTableFromRepository(assignment.getTalendItem().getId());
+                    MetadataTable table = MetadataToolHelper.getMetadataTableFromRepository(assignment.getTalendItem().getId());
                     if (table != null) {
                         return image;
                     }
-                    Query query = MetadataTool.getQueryFromRepository(assignment.getTalendItem().getId());
+                    Query query = MetadataToolHelper.getQueryFromRepository(assignment.getTalendItem().getId());
                     if (query != null) {
                         return image;
                     }
-                    SAPFunctionUnit function = MetadataTool.getSAPFunctionFromRepository(assignment.getTalendItem().getId());
+                    SAPFunctionUnit function = MetadataToolHelper
+                            .getSAPFunctionFromRepository(assignment.getTalendItem().getId());
                     if (function != null) {
                         return image;
                     }
@@ -97,22 +98,26 @@ public class RepositoryFactoryProxyLabelProvider extends AdapterFactoryLabelProv
         try {
             if (columnIndex == 0) {
                 if (lastVersion == null) {
-                    MetadataTable table = MetadataTool.getMetadataTableFromRepository(assignment.getTalendItem().getId());
+                    MetadataTable table = MetadataToolHelper.getMetadataTableFromRepository(assignment.getTalendItem().getId());
                     if (table != null) {
-                        if (SubItemHelper.isDeleted(table))
+                        if (SubItemHelper.isDeleted(table)) {
                             columnText += Messages.getString("RepositoryFactoryProxyLabelProvider.Deleted"); //$NON-NLS-1$
+                        }
                         return columnText;
                     }
-                    Query query = MetadataTool.getQueryFromRepository(assignment.getTalendItem().getId());
+                    Query query = MetadataToolHelper.getQueryFromRepository(assignment.getTalendItem().getId());
                     if (query != null) {
-                        if (SubItemHelper.isDeleted(query))
+                        if (SubItemHelper.isDeleted(query)) {
                             columnText += Messages.getString("RepositoryFactoryProxyLabelProvider.Deleted"); //$NON-NLS-1$
+                        }
                         return columnText;
                     }
-                    SAPFunctionUnit function = MetadataTool.getSAPFunctionFromRepository(assignment.getTalendItem().getId());
+                    SAPFunctionUnit function = MetadataToolHelper
+                            .getSAPFunctionFromRepository(assignment.getTalendItem().getId());
                     if (function != null) {
-                        if (SubItemHelper.isDeleted(function))
+                        if (SubItemHelper.isDeleted(function)) {
                             columnText += Messages.getString("RepositoryFactoryProxyLabelProvider.Deleted"); //$NON-NLS-1$
+                        }
                         return columnText;
                     }
                     TalendItem item = assignment.getTalendItem();
@@ -151,8 +156,8 @@ public class RepositoryFactoryProxyLabelProvider extends AdapterFactoryLabelProv
             if (lastVersion != null) {
                 String label = lastVersion.getProperty().getLabel();
                 if (!label.equals(columnText)) {
-                    ChangeTalendItemLabelCommand command = new ChangeTalendItemLabelCommand(((BusinessAssignment) object)
-                            .getTalendItem(), label);
+                    ChangeTalendItemLabelCommand command = new ChangeTalendItemLabelCommand(
+                            ((BusinessAssignment) object).getTalendItem(), label);
                     try {
                         command.execute(null, null);
                     } catch (ExecutionException e) {

org.talend.designer.business.diagram/src/org/talend/designer/business/diagram/custom/util/ElementHelper.java

@@ -31,7 +31,7 @@ import org.talend.commons.ui.runtime.image.ImageUtils.ICON_SIZE;
 import org.talend.commons.ui.runtime.image.OverlayImage;
 import org.talend.commons.ui.runtime.image.OverlayImage.EPosition;
 import org.talend.core.CorePlugin;
-import org.talend.core.model.metadata.MetadataTool;
+import org.talend.core.model.metadata.MetadataToolHelper;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.metadata.builder.connection.Query;
 import org.talend.core.model.metadata.builder.connection.SAPFunctionUnit;
@@ -117,9 +117,9 @@ public class ElementHelper {
                                 labels.add(label);
                             } else {
 
-                                MetadataTable table = MetadataTool.getMetadataTableFromRepository(talendItem.getId());
-                                Query query = MetadataTool.getQueryFromRepository(talendItem.getId());
-                                SAPFunctionUnit function = MetadataTool.getSAPFunctionFromRepository(talendItem.getId());
+                                MetadataTable table = MetadataToolHelper.getMetadataTableFromRepository(talendItem.getId());
+                                Query query = MetadataToolHelper.getQueryFromRepository(talendItem.getId());
+                                SAPFunctionUnit function = MetadataToolHelper.getSAPFunctionFromRepository(talendItem.getId());
                                 if (table != null) {
                                     img = ImageDescriptor.createFromFile(ECoreImage.class,
                                             ECoreImage.METADATA_TABLE_ICON.getPath()).createImage();

org.talend.designer.business.diagram/src/org/talend/designer/business/diagram/views/jobsettings/BusinessAssignmentComposite.java

@@ -57,7 +57,7 @@ import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.swt.actions.ITreeContextualAction;
 import org.talend.core.CorePlugin;
 import org.talend.core.model.business.BusinessType;
-import org.talend.core.model.metadata.MetadataTool;
+import org.talend.core.model.metadata.MetadataToolHelper;
 import org.talend.core.model.metadata.builder.connection.MetadataTable;
 import org.talend.core.model.metadata.builder.connection.SAPFunctionUnit;
 import org.talend.core.model.properties.RoutineItem;
@@ -82,6 +82,7 @@ import org.talend.designer.core.ui.views.jobsettings.JobSettingsView;
 import org.talend.designer.core.ui.views.jobsettings.tabs.AbstractTabComposite;
 import org.talend.designer.core.utils.EmfPropertyHelper;
 import org.talend.designer.core.utils.KeyHelper;
+import org.talend.repository.ProjectManager;
 import org.talend.repository.model.IRepositoryNode;
 import org.talend.repository.model.IRepositoryNode.ENodeType;
 import org.talend.repository.model.IRepositoryNode.EProperties;
@@ -289,7 +290,7 @@ public class BusinessAssignmentComposite extends AbstractTabComposite {
                         curNode = RepositoryNodeUtilities.getRepositoryNode(lastVersion);
                         select(viewer, curNode);
                     } else if (item instanceof TableMetadata) {
-                        MetadataTable table = MetadataTool.getMetadataTableFromRepository(item.getId());
+                        MetadataTable table = MetadataToolHelper.getMetadataTableFromRepository(item.getId());
                         if (table != null) {
                             String id = item.getId().split(" - ")[0]; //$NON-NLS-1$
 
@@ -303,8 +304,8 @@ public class BusinessAssignmentComposite extends AbstractTabComposite {
 
                         }
                     } else if (item instanceof Query) {
-                        org.talend.core.model.metadata.builder.connection.Query query = MetadataTool.getQueryFromRepository(item
-                                .getId());
+                        org.talend.core.model.metadata.builder.connection.Query query = MetadataToolHelper
+                                .getQueryFromRepository(item.getId());
                         if (query != null) {
                             String id = item.getId().split(" - ")[0]; //$NON-NLS-1$
                             IRepositoryView view = getRepositoryView();
@@ -314,7 +315,7 @@ public class BusinessAssignmentComposite extends AbstractTabComposite {
                         }
 
                     } else if (item instanceof SAPFunction) {
-                        SAPFunctionUnit function = MetadataTool.getSAPFunctionFromRepository(item.getId());
+                        SAPFunctionUnit function = MetadataToolHelper.getSAPFunctionFromRepository(item.getId());
                         if (function != null) {
                             IRepositoryView view = getRepositoryView();
                             RepositoryNode node = RepositoryNodeUtilities.getSAPFunctionFromConnection(item.getId());
@@ -411,11 +412,12 @@ public class BusinessAssignmentComposite extends AbstractTabComposite {
                                 }
                             }
                         }
-
+                        if (ProjectManager.getInstance().isInCurrentMainProject(repositoryNode)) {
+                            CorePlugin.getDefault().getDiagramModelService()
+                                    .addDeleteAssignmentAction(mgr, tableViewer.getSelection());
+                        }
                     }
-                    CorePlugin.getDefault().getDiagramModelService().addDeleteAssignmentAction(mgr, tableViewer.getSelection());
                 }
-
             }
         });
         Menu menu = menuMgr.createContextMenu(tableViewer.getControl());
@@ -454,18 +456,19 @@ public class BusinessAssignmentComposite extends AbstractTabComposite {
                     return repositoryNode;
                 }
             } else if (item instanceof TableMetadata) {
-                MetadataTable table = MetadataTool.getMetadataTableFromRepository(item.getId());
+                MetadataTable table = MetadataToolHelper.getMetadataTableFromRepository(item.getId());
                 if (table != null) {
                     return RepositoryNodeUtilities.getMetadataTableFromConnection(item.getId());
                 }
 
             } else if (item instanceof Query) {
-                org.talend.core.model.metadata.builder.connection.Query query = MetadataTool.getQueryFromRepository(item.getId());
+                org.talend.core.model.metadata.builder.connection.Query query = MetadataToolHelper.getQueryFromRepository(item
+                        .getId());
                 if (query != null) {
                     return RepositoryNodeUtilities.getQueryFromConnection(item.getId());
                 }
             } else if (item instanceof SAPFunction) {
-                SAPFunctionUnit function = MetadataTool.getSAPFunctionFromRepository(item.getId());
+                SAPFunctionUnit function = MetadataToolHelper.getSAPFunctionFromRepository(item.getId());
                 if (function != null) {
                     return RepositoryNodeUtilities.getSAPFunctionFromConnection(item.getId());
                 }

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_de.properties

@@ -87,7 +87,7 @@ FAMILY.Misc=Verschiedenes
 FAMILY.MySQL=MySQL
 FAMILY.Netezza=Netezza
 FAMILY.OLAP_Cube=OLAP Würfel
-FAMILY.Oracle=Dieser Quellcode wurde automatisiert generiert durch {0}
+FAMILY.Oracle=Oracle
 FAMILY.Orchestration=Instrumentation
 FAMILY.Output= Ausgabe
 FAMILY.ParAccel=Paraccel

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

@@ -13,6 +13,7 @@ FAMILY.Access=Access
 FAMILY.Business=negocio
 FAMILY.Connections=Conexiones
 FAMILY.DB2=DB2
+FAMILY.eXist=Existe
 FAMILY.File=Fichero
 FAMILY.FireBird=Firebird
 FAMILY.Greenplum=Greenplum
@@ -33,5 +34,6 @@ FAMILY.PostgreSQL=PostgreSQL
 FAMILY.PostgresPlus=PostgresPlus
 FAMILY.SQLite=SQLite
 FAMILY.Sybase=Sybase
+FAMILY.System=Sistema
 FAMILY.Teradata=Teradata
 FAMILY.Vertica=Vertica

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

@@ -43,7 +43,7 @@ CodeGeneratorEmittersPoolFactory.dialogContent=La g
 CodeGeneratorEmittersPoolFactory.operationCanceled=Opération annulée
 ComponentsFactory.afterSystemComponent=après le(s) composant(s) système
 ComponentsFactory.componentNotFound=Impossible de trouver le dossier du composant :
-ComponentsFactory.load.components=Charger des composants...
+ComponentsFactory.load.components=Chargement des composants...
 ComponentsFactory.parentNotRecompiled=Attention\: les parents de *.inc.javajet ne sont pas recompilés.
 ComponentsLocalProviderService.componentLoadError=Erreur de chargement du composant
 ComponentsLocalProviderService.talendExchangeError=Erreur de Talend Exchange

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

@@ -25,3 +25,4 @@ FAMILY.Input=Unos
 FAMILY.MySQL=MySQL
 FAMILY.Oracle=Oracle
 FAMILY.PostgreSQL=PostgreSQL
+FAMILY.XML=XML

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

@@ -57,8 +57,8 @@ ComponentsProviderManager.unableLoad=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\
 ComponenttRunJobPreferencePage.label=tRunJob\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u5F8C\u3001\u5BFE\u5FDC\u30B8\u30E7\u30D6\u3092\u8868\u793A\u3057\u306A\u3044\u3002
 ComponentJobletPreferencePage.label=Joblet\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u5F8C\u3001\u5BFE\u5FDC\u30B8\u30E7\u30D6\u3092\u8868\u793A\u3057\u306A\u3044\u3002
 ComponenttRunJobPreferencePage.showCorrespondingJob=tRunJob\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u5F8C\u3001\u5BFE\u5FDC\u30B8\u30E7\u30D6\u3092\u8868\u793A\u3059\u308B\u3002
-XsdValidationCacheManager.unableLoadxsd=XSD\u306E\u30D0\u30EA\u30C7\u30FC\u30B7\u30E7\u30F3\u306E\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093\u3002
-XsdValidationCacheManager.unableSavexsd=XSD\u306E\u30D0\u30EA\u30C7\u30FC\u30B7\u30E7\u30F3\u306E\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
+XsdValidationCacheManager.unableLoadxsd=XSD\u30D0\u30EA\u30C7\u30FC\u30B7\u30E7\u30F3\u306E\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093\u3002
+XsdValidationCacheManager.unableSavexsd=XSD\u30D0\u30EA\u30C7\u30FC\u30B7\u30E7\u30F3\u306E\u30AD\u30E3\u30C3\u30B7\u30E5\u30D5\u30A1\u30A4\u30EB\u3092\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
 prefs.configuration.LINK_STYLE.AUTO=\u81EA\u52D5
 prefs.configuration.LINK_STYLE.BEZIER_CURVE=\u66F2\u7DDA
 prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA(\u6700\u901F)

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

@@ -0,0 +1,5 @@
+prefs.configuration.LINK_STYLE.AUTO=Automatisch
+prefs.configuration.LINK_STYLE.BEZIER_CURVE=Rondingen
+prefs.configuration.LINK_STYLE.LINE=Lijnen (snel)
+FAMILY.Access=Toegang
+FAMILY.Connections=Verbindingen

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.test/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="output" path="class"/>
+</classpath>

org.talend.designer.codegen.test/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.talend.designer.codegen.test</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

org.talend.designer.codegen.test/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

org.talend.designer.codegen.test/META-INF/MANIFEST.MF

@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test
+Bundle-SymbolicName: org.talend.designer.codegen.test
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.talend.designer.codegen;bundle-version="2.2.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.junit4

org.talend.designer.codegen.test/build.properties

@@ -0,0 +1,4 @@
+source.. = src/main/java/
+output.. = class/
+bin.includes = META-INF/,\
+               .

org.talend.designer.codegen.test/src/main/java/org/talend/designer/codegen/junit/JUnitStudioStartup.java

@@ -0,0 +1,53 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2012 Talend Inc. - www.talend.com
+//
+// This source code is available under agreement available at
+// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+//
+// You should have received a copy of the agreement
+// along with this program; if not, write to Talend SA
+// 9 rue Pages 92150 Suresnes, France
+//
+// ============================================================================
+package org.talend.designer.codegen.junit;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.junit.Test;
+import org.talend.designer.codegen.model.CodeGeneratorEmittersPoolFactory;
+
+/**
+ * created by nrousseau on Jul 25, 2012 Detailled comment
+ * 
+ */
+public class JUnitStudioStartup {
+
+    private static final long ONE_MINUTE_IN_MILLISEC = 60000;
+
+    private static final long INIT_TIMEOUT = ONE_MINUTE_IN_MILLISEC * 10;
+
+    private static final long INIT_PAUSE = 100;
+
+    private final SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd-HH:mm:ss");
+
+    @Test
+    public void test() throws InterruptedException {
+        System.out.println("|" + format.format(new Date()) + "| Wait for full generation of jet emitters");
+        long startTimer = System.currentTimeMillis();
+        long endTimer = startTimer;
+        while ((!CodeGeneratorEmittersPoolFactory.isInitialized()) && ((endTimer - startTimer) < INIT_TIMEOUT)) {
+            Thread.sleep(INIT_PAUSE);
+            endTimer = System.currentTimeMillis();
+        }
+        if ((endTimer - startTimer) > INIT_TIMEOUT) {
+            System.out.println("|" + format.format(new Date())
+                    + "| Timeout when generate jet emitters (10 minutes), will just continue with standards junits");
+        } else {
+            System.out.println("|" + format.format(new Date())
+                    + "| Jet emitters initialized successfully, will proceed to standards junits");
+        }
+    }
+
+}

org.talend.designer.codegen/plugin.xml

@@ -56,7 +56,7 @@
       <page
             category="org.talend.designer.codegen.components.localprovider.page1"
             class="org.talend.designer.components.preference.labelformat.ComponentsFormatPreferencePage"
-            id="org.talend.designer.codegen.components.localprovider.page1"
+            id="org.talend.designer.codegen.components.localprovider.page2"
             name="%format">
       </page>
    </extension>

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

@@ -6,8 +6,10 @@
 		org.talend.core.model.process.EConnectionType
 		org.talend.core.model.process.ElementParameterParser
 		org.talend.designer.codegen.config.CodeGeneratorArgument
+		org.talend.core.model.utils.JavaResourcesHelper
 		java.util.Vector
 		java.util.List
+		java.util.Map
 	"
 %>
 <%
@@ -15,63 +17,107 @@
 	 Vector v = (Vector) codeGenArgument.getArgument();
 	IProcess process = (IProcess)v.get(0);
 	
+	String jobFolderName = JavaResourcesHelper.getJobFolderName(process.getName(), process.getVersion());
+	String packageName = codeGenArgument.getCurrentProjectName().toLowerCase() + "." + jobFolderName;
+	
 	boolean stats = codeGenArgument.isStatistics();
 %>
 
 		}
 			};
-			getCamelContexts().get(0).addRoutes(routeBuilder);
 		}	
 		
-
-		protected void doStop() throws Exception {
-			super.doStop();
-			getCamelContexts().get(0).stop();
-		}
-
-		protected org.apache.camel.ProducerTemplate findOrCreateCamelTemplate() {
-			return getCamelContexts().get(0).createProducerTemplate();
-		}
-
-		protected java.util.Map<String, org.apache.camel.CamelContext> getCamelContextMap() {
-			java.util.Map<String, org.apache.camel.CamelContext> answer = new java.util.HashMap<String, org.apache.camel.CamelContext>();
-			org.apache.camel.impl.DefaultCamelContext camelContext;
-			org.apache.camel.spi.TypeConverterRegistry typeConverterRegistry;
+		/**
+		* create a fully configured CameContext and add into map
+		* the Registry of it is #TalendRouteRegistry
+		* @return 
+		*		<code>key: <%=process.getName()%>-ctx<code>
+		*       <code>value: DefaultCamelContext<code>
+		* 
+		*/
+		public Map<String, CamelContext> getCamelContextMap() {
+			Map<String,CamelContext> answer = new HashMap<String, CamelContext>();
+			DefaultCamelContext camelContext = camelContext();
+<%		
+			//process cConfig components first 
+			List<? extends INode> camelContextNodes = process.getNodesOfType("cConfig");
+			for(INode node: camelContextNodes){
+%>
+			    <%=ElementParameterParser.getValue(node, "__CODE__")%>
 <%
-			boolean startable = false;
-			for (INode node : (List< ? extends INode>)process.getGraphicalNodes()) {
-				Object value = node.getPropertyValue("STARTABLE");
-				startable = value == null? false:(Boolean)value;
-				if(startable){
-					break;
+			} 
+%>
+			TalendRouteRegistry contextRegister = new TalendRouteRegistry(camelContext.getRegistry());
+			camelContext.setRegistry(contextRegister);
+<%
+			//then process cBeanRegister components
+			List<? extends INode> beanRegisterNodes = process.getNodesOfType("cBeanRegister");
+			if(beanRegisterNodes != null && beanRegisterNodes.size()>0){
+			for(INode node: beanRegisterNodes){
+				String id = ElementParameterParser.getValue(node, "__ID__");
+				String isSimple = ElementParameterParser.getValue(node, "__SIMPLE_CONFIG__");
+				String classQualifiedName = ElementParameterParser.getValue(node, "__CLASS_QUALIFIED_NAME__");
+				String hasArguments = ElementParameterParser.getValue(node, "__SPECIFY_ARGUMENTS__");
+				List<Map<String, String>> arguments = (List<Map<String, String>>) ElementParameterParser.getObjectValue(node, "__ARGUMENTS__");
+				
+				String code = ElementParameterParser.getValue(node, "__CODE__");
+				
+				if("true".equals(isSimple)){
+					StringBuilder sb = new StringBuilder();
+					if("true".equals(hasArguments)){
+						for(Map<String, String> s: arguments){
+							if(sb.length() == 0){
+								sb.append(s.get("VALUE"));
+							}else{
+								sb.append(",");
+								sb.append(s.get("VALUE"));
+							}
+						}
+					}
+%>
+					contextRegister.register(<%=id%>, new <%=classQualifiedName%>(<%=sb.toString()%>));
+<%
+				}else{
+%>
+				{
+					Object beanInstance = null;
+					<%=code%>
+					if(beanInstance != null){
+						contextRegister.register(<%=id%>, beanInstance);
+					}
 				}
+<%
+				}
+			}
 			}
 			
-			if (startable) { 
-%>
-				if (bundleContext != null) {
-					org.apache.camel.osgi.CamelContextFactory factory = new org.apache.camel.osgi.CamelContextFactory();
-					factory.setBundleContext(bundleContext);
-					camelContext = factory.createContext();
-					bundleContext.registerService(org.apache.camel.CamelContext.class.getName(), camelContext, null);
-				} else {
-					camelContext = new org.apache.camel.impl.DefaultCamelContext();
+			//after, process cDataset 
+			List<? extends INode> datasetNodes = process.getNodesOfType("cDataset");
+			for(INode n: datasetNodes){
+				String beanID = ElementParameterParser.getValue(n, "__DATASET_NAME__");
+				String registerNewBean = ElementParameterParser.getValue(n, "__REGISTER_DATASET_BEAN__");
+				if(!"true".equals(registerNewBean)){
+					continue;
+				}
+				String beanClass = ElementParameterParser.getValue(n, "__BEAN_CLASS__");
+				List<Map<String, String>> beanArguments = (List<Map<String, String>>) ElementParameterParser.getObjectValue(n, "__BEAN_ARGUMENTS__");
+				StringBuilder sb = new StringBuilder();
+				if(beanArguments != null){
+					for(Map<String,String> map: beanArguments){
+						if(sb.length() == 0){
+							sb.append(map.get("VALUE"));
+						}else{
+							sb.append(",");
+							sb.append(map.get("VALUE"));
+						}
+					}
 				}
-<%
-			} else {
 %>
-				camelContext = new org.apache.camel.impl.DefaultCamelContext();
+				contextRegister.register(<%=beanID%>, new <%=beanClass%>(<%=sb.toString()%>));
 <%
 			}
-%>
-			typeConverterRegistry = camelContext.getTypeConverterRegistry();
-<%
             //cJMSConnectionFactory http://jira.talendforge.org/browse/TESB-4860
 			List<? extends INode> jmsCFNodes = process.getNodesOfType("cJMSConnectionFactory");
-			if(jmsCFNodes.size()>0){
-%>
-				javax.jms.ConnectionFactory jmsConnectionFactory = null;
-<%			}
 			for(INode node: jmsCFNodes){
 				//Use transaction http://jira.talendforge.org/browse/TESB-5160 By LiXiaopeng
 				String useTransaction = ElementParameterParser.getValue(node, "__USE_TRANSACTION__");
@@ -94,7 +140,8 @@
 					String amqUri = ElementParameterParser.getValue(node, "__AMQ_BROKER_URI__").trim();
 					
 %>
-				jmsConnectionFactory = new org.apache.activemq.ActiveMQConnectionFactory(<%=amqUri%>);
+				{
+				javax.jms.ConnectionFactory jmsConnectionFactory = new org.apache.activemq.ActiveMQConnectionFactory(<%=amqUri%>);
 <%
 				String amqPool = ElementParameterParser.getValue(node, "__AMQ_POOL__").trim();
 				if("true".equals(amqPool)){
@@ -131,7 +178,7 @@
 				org.apache.activemq.pool.PooledConnectionFactory pooledConnectionFactory_<%=node.getUniqueName()%> 
 					= new org.apache.activemq.pool.PooledConnectionFactory();
 				pooledConnectionFactory_<%=node.getUniqueName()%>.setConnectionFactory(jmsConnectionFactory);
-				pooledConnectionFactory_<%=node.getUniqueName()%>.setExpiryTimeout(<%=amq_pool_expiry_timeout%>);
+				pooledConnectionFactory_<%=node.getUniqueName()%>.setExpiryTimeout(<%=amq_pool_expiry_timeout%>L);
 				pooledConnectionFactory_<%=node.getUniqueName()%>.setIdleTimeout(<%=amq_pool_idle_timeout%>);
 				pooledConnectionFactory_<%=node.getUniqueName()%>.setMaxConnections(<%=amq_pool_max_connections%>);
 				pooledConnectionFactory_<%=node.getUniqueName()%>.setMaximumActive(<%=amq_pool_max_active%>);
@@ -145,6 +192,9 @@
 					org.apache.camel.component.jms.JmsComponent.jmsComponent<%=transactedMethodStr%>(jmsConnectionFactory));
 <%				
 				    }
+%>
+				}
+<%
 				}else if("WebSphere MQ".equals(mqType)){
 					String wmqServer = ElementParameterParser.getValue(node, "__WQM_SEVER__");
 					String wmqPort = ElementParameterParser.getValue(node, "__WMQ_PORT__");
@@ -170,7 +220,8 @@
 					}
 					
 %>
-					jmsConnectionFactory = new com.ibm.mq.jms.MQQueueConnectionFactory();
+					{
+					javax.jms.ConnectionFactory jmsConnectionFactory = new com.ibm.mq.jms.MQQueueConnectionFactory();
 	       			((com.ibm.mq.jms.MQConnectionFactory) jmsConnectionFactory).setHostName(<%=wmqServer%>);
 	       			try {
 	       				((com.ibm.mq.jms.MQConnectionFactory) jmsConnectionFactory).setPort(<%=wmqPort%>);
@@ -197,23 +248,22 @@
 						org.apache.camel.component.jms.JmsComponent.jmsComponent<%=transactedMethodStr%>(connectionFactoryAdapter<%=node.getUniqueName()%>));
 <%						
 					}					
-					
+%>
+					}
+<%
 				}else if("Other".equals(mqType)){
 %>
-					<%=ElementParameterParser.getValue(node, "__OTHER_CODE__")%>
-					camelContext.addComponent(<%=name%>,
-						org.apache.camel.component.jms.JmsComponent.jmsComponent<%=transactedMethodStr%>(jmsConnectionFactory));
+					{
+					  javax.jms.ConnectionFactory jmsConnectionFactory;
+						<%=ElementParameterParser.getValue(node, "__OTHER_CODE__")%>
+						camelContext.addComponent(<%=name%>,
+							org.apache.camel.component.jms.JmsComponent.jmsComponent<%=transactedMethodStr%>(jmsConnectionFactory));
+					}
 <%
 				}
 			
 			}
-			//cConfig 
-			List<? extends INode> camelContextNodes = process.getNodesOfType("cConfig");
-			for(INode node: camelContextNodes){
-%>
-			    <%=ElementParameterParser.getValue(node, "__CODE__")%>
-<%
-			} 
+
 			//http://jira.talendforge.org/browse/TESB-4087: Change CamelContext name
 %>
 			//using Route name as CamelContext ID
@@ -221,36 +271,40 @@
 			camelContext.setName("<%=process.getName() + "-ctx"%>");
 			return answer;
 		}
-
-		protected org.apache.camel.view.ModelFileGenerator createModelFileGenerator()
-				throws javax.xml.bind.JAXBException {
-			return null;
+		
+		/**
+		* create a simple DefaultCamelContext 
+		* please use #getCamelContextMap() to get a fully configured CamelContext
+		* @return DefaultCamelContext
+		*/
+		public DefaultCamelContext camelContext() {
+							DefaultCamelContext camelContext;
+<%
+			boolean startable = false;
+			for (INode node : (List< ? extends INode>)process.getGraphicalNodes()) {
+				Object value = node.getPropertyValue("STARTABLE");
+				startable = value == null? false:(Boolean)value;
+				if(startable){
+					break;
+				}
+			}
+			
+			if (startable) { 
+%>
+				if (bundleContext != null) {
+					CamelContextFactory factory = new CamelContextFactory();
+					factory.setBundleContext(bundleContext);
+					camelContext = factory.createContext();
+					bundleContext.registerService(CamelContext.class.getName(), camelContext, null);
+				} else {
+					camelContext = new DefaultCamelContext();
+				}
+<%
+			} else {
+%>
+				camelContext = new DefaultCamelContext();
+<%
+			}
+%>
+			return camelContext;
 		}
-	}
-	
-	final CamelImpl camelImplementation = new CamelImpl();
-	if(start){
-		stopDelegate = new TalendESBRoute() {
-			
-			public int runJobInTOS(String[] args) {
-				return 0;
-			}
-			
-			public String[][] runJob(String[] args) {
-				return null;
-			}
-			
-			public void stop() throws Exception {
-				camelImplementation.stop();
-			}
-			
-			public void shutdown() throws Exception {
-				camelImplementation.shutdown();
-			}
-		};	
-		camelImplementation.enableHangupSupport();
-		camelImplementation.run();
-	}
-	return routeBuilder;
-	
-}

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

@@ -42,101 +42,21 @@
 
 	List< ? extends INode> processNodes = (List< ? extends INode>)process.getGeneratingNodes();
 %>
-
-class CamelImpl extends org.apache.camel.impl.MainSupport {
-	protected CamelImpl instance;
-
-	public CamelImpl() {
-		try {
-			postProcessContext();
-			initRoute();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Returns the currently executing main
-	 *
-	 * @return the current running instance
-	 */
-	public CamelImpl getInstance() {
-		return instance;
-	}
-
-	protected void doStart() throws Exception {
-		super.doStart();
-
-		org.apache.camel.management.JmxNotificationEventNotifier notifier = new org.apache.camel.management.JmxNotificationEventNotifier();
-		notifier.setSource("MyCamel");
-		notifier.setIgnoreCamelContextEvents(true);
-		notifier.setIgnoreRouteEvents(true);
-		notifier.setIgnoreServiceEvents(true);
-
-		getCamelContexts().get(0).getManagementStrategy().addEventNotifier(notifier);
-
-		java.net.URLClassLoader sysloader = (java.net.URLClassLoader) ClassLoader.getSystemClassLoader();
-		java.lang.reflect.Method method = java.net.URLClassLoader.class.getDeclaredMethod("addURL", new Class[] { java.net.URL.class });
-		method.setAccessible(true);
-		String[] libPaths = new String[] {
-
-
-<%
-for (INode node : processNodes) {
-	if (node.isActivate()) {
-		if (node.getComponent().getName().equals("cMessagingEndpoint")) {
-			List<Map<String, String>> dependencies = (List<Map<String,String>>) ElementParameterParser.getObjectValue(node, "__HOTLIBS__");
-			for(Map<String, String> dependencie : dependencies){
-				String librarieJar = dependencie.get("LIBPATH"); %>
-				"<%=librarieJar %>",
-<%			}
-		}
-	}
-}
-%>
-		};
-		for (String lib : libPaths) {
-			String separator = System.getProperty("path.separator");
-			String[] jarFiles = lib.split(separator);
-			for (String jarFile : jarFiles) {
-				method.invoke(sysloader, new Object[] { new java.io.File(jarFile).toURL() });
-			}
-		}
-
-		getCamelContexts().get(0).start();
-
-
-<% if(stats) { %>
-
-		CamelStat runStat = new CamelStat(getCamelContexts().get(0));
-
-		runStat.setParams();
-
-		runStat.openSocket(true);
-		runStat.setAllPID(rootPid, fatherPid, pid, jobName);
-		runStat.startThreadStat(clientHost, portStats);
-		runStat.updateStatOnJob(RunStat.JOBSTART, "");
-
-		MyStatThread statsThread = new MyStatThread(runStat);
-		statsThread.run();
-<% } //if stats %>
-
-	}
-
-	public void initRoute() throws Exception {
-		routeBuilder = new org.apache.camel.builder.RouteBuilder() {
-			public void configure() throws Exception {
+		return new RouteBuilder() {
+			public void configure() throws java.lang.Exception {
 <%
 	for (INode node : processNodes) {
 		if (node.getComponent().getName().equals("cCXF")) {
 			IElementParameter param = node.getElementParameter("LABEL");
-			String cid = "";
-			if (param != null && !"__UNIQUE_NAME__".equals(param.getValue())) {
-				cid = (String)param.getValue();
-			} else {
-				cid = node.getUniqueName();
+		   	String cid = node.getUniqueName();
+		//  http://jira.talendforge.org/browse/TESB-5241
+			/*
+		   	 * change to use label + unique to make it unique but readable
+		   	 */
+			if(param != null && !"__UNIQUE_NAME__".equals(param.getValue())){
+				cid = (String)param.getValue()+"_"+cid;	
 			}
-			String endpointVar = "endpoint" + cid;
+			String endpointVar = "endpoint_" + node.getUniqueName();
 			String uriRef = "uriMap.get(\"" + cid + "\")";
 %>
 				// CXF endpoint for <%=cid%>
@@ -180,7 +100,7 @@ for (INode node : processNodes) {
 			}
 			//http://jira.talendforge.org/browse/TESB-3850
 			String formatType = ElementParameterParser.getValue(node, "__DATAFORMAT__");
-			if ("true".equals(useSAM) && !"MESSAGE".equals(formatType)) {
+			if ("true".equals(useSAM) && !"RAW".equals(formatType)) {
 %>
 				// Add Service Activity Monitor Service to <%=endpointVar%>
 				if (eventFeature != null) {

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

@@ -32,9 +32,19 @@ INode node = (INode) codeGenArgument.getArgument();
 List< ? extends IConnection> connsIf = node.getIncomingConnections();
 if(connsIf.size()>0) {
 	if(connsIf.get(0).getLineStyle()==EConnectionType.ROUTE_WHEN) {
+		INode sourceNode = connsIf.get(0).getSource();
+		String languageType = connsIf.get(0).getRouteConnectionType();
+		String condition = connsIf.get(0).getCondition();
+		String expression = "none".equals(languageType)?condition:languageType+"("+condition+")";
+		if("cIntercept".equals(sourceNode.getComponent().getName())){
 %>
-		.when().<%=connsIf.get(0).getRouteConnectionType()%>(<%=connsIf.get(0).getCondition()%>)
+		.when(<%=expression%>)
 <%
+		}else{
+%>
+		.when().<%=expression%>
+<%
+		}
 	} else if(connsIf.get(0).getLineStyle()==EConnectionType.ROUTE_OTHER) {
 %>
 		.otherwise()

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

@@ -144,9 +144,14 @@ currentComponent="<%=node.getUniqueName() %>";
 	if ((codePart.equals(ECodePart.BEGIN))&&(stat)&&connSet.size()>0) {
 		for(IConnection con:connSet){
 %>
-if(execStat){
-	runStat.updateStatOnConnection("<%=con.getUniqueName() %>"+iterateId,0, 0);
-}	 
+
+if (execStat) {
+    java.util.concurrent.ConcurrentHashMap<Object, Object> concurrentHashMap_<%=con.getUniqueName() %> = (java.util.concurrent.ConcurrentHashMap) globalMap.get("concurrentHashMap");
+	concurrentHashMap_<%=con.getUniqueName() %>.putIfAbsent("<%=con.getUniqueName() %>" + iterateLoop,new java.util.concurrent.atomic.AtomicInteger(0));
+	java.util.concurrent.atomic.AtomicInteger stats_<%=con.getUniqueName() %> = (java.util.concurrent.atomic.AtomicInteger) concurrentHashMap_<%=con.getUniqueName() %>.get("<%=con.getUniqueName() %>" + iterateLoop);
+	runStat.updateStatOnConnection("<%=con.getUniqueName() %>" + iterateId, stats_<%=con.getUniqueName() %>.incrementAndGet()<=1?0:1, 0);
+} 
+
 <%		}
 	}
 	

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_java.skeleton

@@ -45,7 +45,12 @@ public class CLASS
        //        toReturn += createCallProcess(conn.getTarget(),  className, isMultiThread);
        //    }
        //}            
-       toReturn += "\n}finally {\n}"; 
+        if(isMultiThread){
+            toReturn += "\n}catch (Error e_" + rootNode.getUniqueName() + ") {\n";
+            toReturn += "\ne_" + rootNode.getUniqueName() + ".printStackTrace();\n";
+            toReturn += "globalMap.put(\""+rootNode.getUniqueName()+ "_SUBPROCESS_STATE\", -1);\n";
+        }
+       toReturn += "\n}"; 
        return toReturn;
     }
 		 

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

@@ -9,6 +9,8 @@
 		org.talend.core.model.process.IContextParameter
 		org.talend.core.model.metadata.types.JavaTypesManager
 		org.talend.core.model.utils.JavaResourcesHelper
+		java.util.Map
+		org.talend.core.model.process.ElementParameterParser
 	" 
 	class="Footer" 
 	skeleton="footer_java.skeleton"	
@@ -17,7 +19,8 @@
 	CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
     Vector v = (Vector) codeGenArgument.getArgument();
     IProcess process = (IProcess)v.get(0);
-	
+
+	List<? extends INode> processNodes = (List<? extends INode>) process.getGeneratingNodes();
 	List<IContextParameter> params = new ArrayList<IContextParameter>();
     params=process.getContextManager().getDefaultContext().getContextParameterList();
     String jobFolderName = JavaResourcesHelper.getJobFolderName(process.getName(), process.getVersion());
@@ -25,6 +28,195 @@
 	boolean stats = codeGenArgument.isStatistics();
 	
 %>
+
+protected void doStart() throws java.lang.Exception {
+		// init uriMap first
+		initUriMap();
+		
+		//add route
+		addRouteBuilder(route());
+
+		//prepare camel contexts
+		super.doStart();
+		postProcessContext();
+
+		//add jmx notification
+		JmxNotificationEventNotifier notifier = new JmxNotificationEventNotifier();
+		notifier.setSource("MyCamel");
+		notifier.setIgnoreCamelContextEvents(true);
+		notifier.setIgnoreRouteEvents(true);
+		notifier.setIgnoreServiceEvents(true);
+
+		getCamelContexts().get(0).getManagementStrategy().addEventNotifier(notifier);
+
+<%
+StringBuilder librariesSb = new StringBuilder();
+for (INode node : processNodes) {
+	if (node.isActivate()) {
+		if (node.getComponent().getName().equals("cMessagingEndpoint")) {
+			List<Map<String, String>> dependencies = (List<Map<String,String>>) ElementParameterParser.getObjectValue(node, "__HOTLIBS__");
+			for(Map<String, String> dependencie : dependencies){
+				String librarieJar = dependencie.get("LIBPATH");
+				librariesSb.append("\"");
+				librariesSb.append(librarieJar);
+				librariesSb.append("\",");
+			}
+		}
+	}
+}
+if(librariesSb.length()>0){
+%>
+		// add external libraries
+		java.net.URLClassLoader sysloader = (java.net.URLClassLoader) ClassLoader.getSystemClassLoader();
+		java.lang.reflect.Method method = java.net.URLClassLoader.class.getDeclaredMethod("addURL", new Class[] { java.net.URL.class });
+		method.setAccessible(true);
+		String[] libPaths = new String[] {<%=librariesSb.toString()%>};
+		for (String lib : libPaths) {
+			String separator = System.getProperty("path.separator");
+			String[] jarFiles = lib.split(separator);
+			for (String jarFile : jarFiles) {
+				method.invoke(sysloader, new Object[] { new java.io.File(jarFile).toURL() });
+			}
+		}
+<%
+}
+%>
+		//start camel context	
+		getCamelContexts().get(0).start();
+
+
+<% if(stats) { %>
+
+		// add statistics which shows on the connection
+		routines.system.CamelStat runStat = new routines.system.CamelStat(getCamelContexts().get(0));
+
+		runStat.setParams();
+
+		runStat.openSocket(true);
+		runStat.setAllPID(rootPid, fatherPid, pid, jobName);
+		runStat.startThreadStat(clientHost, portStats);
+		runStat.updateStatOnJob(routines.system.RunStat.JOBSTART, "");
+
+		new Thread(new MyStatThread(runStat)).start();
+<% } //if stats %>
+
+	}
+
+	protected void doStop() throws java.lang.Exception {
+		super.doStop();
+		getCamelContexts().get(0).stop();
+	}
+
+	protected ProducerTemplate findOrCreateCamelTemplate() {
+		return getCamelContexts().get(0).createProducerTemplate();
+	}
+		
+	public void stop() throws java.lang.Exception {
+		super.stop();
+	}
+
+	public void shutdown() throws java.lang.Exception {
+		super.shutdown();
+	}
+	
+	protected ModelFileGenerator createModelFileGenerator()
+		throws JAXBException {
+		return null;
+	}
+<% if(stats) { %>
+
+	class MyStatThread implements Runnable {
+
+		routines.system.CamelStat stats;
+		boolean isFinished;
+
+		public MyStatThread(routines.system.CamelStat stats) {
+			this.stats = stats;
+		}
+
+		public void run() {
+			while (true) {
+				try {
+<%
+		for (INode node : processNodes) {
+			if (node.isActivate()) {
+				for(int i=0; i<node.getIncomingConnections().size(); i++) {
+%>
+					stats.updateStatOnConnection("<%=node.getIncomingConnections().get(i).getUniqueName()%>", 1, "<%=node.getUniqueName()%>");
+<%
+				}
+			}
+		}
+%>
+					Thread.sleep(1000);
+				} catch (java.lang.Exception e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+<% } //if stats %>
+
+
+	private Properties defaultProps = new Properties();
+
+	public class ContextProperties extends Properties {
+
+		public ContextProperties(Properties properties) {
+			super(properties);
+		}
+		public ContextProperties() {
+			super();
+		}
+
+		public void synchronizeContext() {
+		<% for (IContextParameter ctxParam : params){
+			String cParaName = ctxParam.getName(); %>
+			if(<%=cParaName %> != null){
+			<% if(ctxParam.getType().equals("id_Date")){ %>
+				String pattern_<%=cParaName %> = "yyyy-MM-dd HH:mm:ss";
+				String value_<%=cParaName %> = "<%=ctxParam.getValue() %>";
+				String[] parts_<%=cParaName %> = value_<%=cParaName %>.split(";");
+				if (parts_<%=cParaName %>.length > 1) {
+					pattern_<%=cParaName %> = parts_<%=cParaName %>[0];
+					this.setProperty("<%=cParaName %>", pattern_<%=cParaName %> + ";" + FormatterUtils.format_Date(<%=cParaName %>, pattern_<%=cParaName %>));
+				} else {
+					this.setProperty("<%=cParaName %>", FormatterUtils.format_Date(<%=cParaName %>, pattern_<%=cParaName %>));
+				}
+			<% } else { %>
+				this.setProperty("<%=cParaName %>", <%=cParaName %>.toString());
+			<% } %>
+			}
+		<% } %>
+		}
+
+<%
+for (IContextParameter ctxParam : params) {
+	if(ctxParam.getType().equals("id_List Of Value") || ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory")) { %>
+		public String <%=ctxParam.getName()%>;
+		public String get<%=Character.toUpperCase(ctxParam.getName().charAt(0)) + ctxParam.getName().substring(1)%>() {
+			return this.<%=ctxParam.getName()%>;
+		}
+<%	} else { %>
+		public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> <%=ctxParam.getName()%>;
+		public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Character.toUpperCase(ctxParam.getName().charAt(0)) + ctxParam.getName().substring(1)%>() {
+			return this.<%=ctxParam.getName()%>;
+		}
+<%	}
+}
+%>
+	}
+
+	private ContextProperties context = new ContextProperties();
+	public ContextProperties getContext() {
+		return this.context;
+	}
+	
+	private final String jobVersion = "<%=process.getVersion() %>";
+	private final String jobName = "<%=codeGenArgument.getJobName() %>";
+	private final String projectName = "<%=codeGenArgument.getCurrentProjectName() %>";
+	
+	public Integer errorCode = null;
 	public String resuming_logs_dir_path = null;
 	public String resuming_checkpoint_path = null;
 	public String parent_part_launcher = null;
@@ -48,8 +240,8 @@
 	
 	private boolean execStat = true;
 	
-	private java.util.Properties context_param = new java.util.Properties();
-    public java.util.Map<String, Object> parentContextMap = new java.util.HashMap<String, Object>();
+	private Properties context_param = new Properties();
+    public Map<String, Object> parentContextMap = new HashMap<String, Object>();
     
     public static void main(String[] args){
     	final <%=process.getName() %> <%=process.getName() %>Class = new <%=process.getName() %>();
@@ -115,10 +307,27 @@
 <%
 		}
 %> 
-		
+		//read context values
+		readContextValues(contextStr);
 		
 		try {
-			java.io.InputStream inContext = <%=process.getName()%>.class.getClassLoader().getResourceAsStream("<%=codeGenArgument.getCurrentProjectName().toLowerCase() %>/<%=jobFolderName %>/contexts/"+contextStr+".properties");
+			run();
+		} catch (java.lang.Exception e) {
+			System.err.println(e.getMessage());
+			e.printStackTrace();
+			return 1;
+		}
+		return 0;
+	}
+	
+	/**
+	* read context values from specified context
+	* @parameter contextName : the name of context while will be used
+	*/
+	public void readContextValues(String contextName){
+			
+		try {
+			java.io.InputStream inContext = <%=process.getName()%>.class.getClassLoader().getResourceAsStream("<%=codeGenArgument.getCurrentProjectName().toLowerCase() %>/<%=jobFolderName %>/contexts/"+contextName+".properties");
 			
 			if (inContext!=null) {
 	    		//defaultProps is in order to keep the original context value
@@ -127,7 +336,7 @@
 	    		context = new ContextProperties(defaultProps);
 	    	}else{
 	    		//print info and job continue to run, for case: context_param is not empty.
-	    		System.err.println("Could not find the context " + contextStr);
+	    		System.err.println("Could not find the context " + contextName);
 			}
 			
 			if(!context_param.isEmpty()) {						
@@ -183,7 +392,7 @@
 			} //end for
 %>
     	} catch (java.io.IOException ie) {
-    		System.err.println("Could not load context "+contextStr);
+    		System.err.println("Could not load context "+contextName);
     		ie.printStackTrace();
     	}
     	
@@ -206,15 +415,6 @@
 		}
 %>
 		}    
-		try {
-			initUriMap();
-			Route(true);
-		} catch (Exception e) {
-			System.err.println(e.getMessage());
-			e.printStackTrace();
-			return 1;
-		}
-		return 0;
 	}
 
 	private void evalParam(String arg) {
@@ -253,4 +453,64 @@
             }
     	}	
 	}
+}
+
+class TalendRouteRegistry implements Registry {
+
+	private Map<String, Object> map = new HashMap<String, Object>();
+
+	private Registry wrapped = null;
+
+	public TalendRouteRegistry() {
+		this(null);
+	}
+
+	public TalendRouteRegistry(Registry wrapped) {
+		this.wrapped = wrapped;
+	}
+
+	public Object lookup(String name) {
+		Object obj = null;
+		if (wrapped != null) {
+			obj = wrapped.lookup(name);
+		}
+		if (obj == null) {
+			obj = map.get(name);
+		}
+		return obj;
+	}
+
+	public <T> T lookup(String name, Class<T> type) {
+		T t = null;
+		if (wrapped != null) {
+			t = wrapped.lookup(name, type);
+		}
+		if (t == null) {
+			t = (T) map.get(name);
+		}
+		return t;
+	}
+
+	public <T> Map<String, T> lookupByType(Class<T> type) {
+		Map<String, T> result = null;
+		if (wrapped != null) {
+			result = wrapped.lookupByType(type);
+		}
+		if (result == null) {
+			result = new HashMap<String, T>();
+		}
+		if (result.isEmpty()) {
+			for (Map.Entry<String, Object> entry : map.entrySet()) {
+				if (type.isInstance(entry.getValue())) {
+					result.put(entry.getKey(), type.cast(entry.getValue()));
+				}
+			}
+		}
+		return result;
+	}
+
+	public void register(String name, Object instance) {
+		map.put(name, instance);
+	}
+
 }

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

@@ -99,8 +99,8 @@ import java.util.Comparator;
 String talendJobInterfaces = "TalendJob";
 
 boolean talendMdmJob = !process.getNodesOfType("tMDMTriggerInput").isEmpty() || !process.getNodesOfType("tMDMTriggerOutput").isEmpty();
-boolean talendEsbJob = !process.getNodesOfType("tESBProviderRequest").isEmpty() || !process.getNodesOfType("tESBConsumer").isEmpty();
-boolean talendEsbJobFactory = !process.getNodesOfType("tESBProviderRequest").isEmpty();
+boolean talendEsbJob = !process.getNodesOfType("tESBProviderRequest").isEmpty() || !process.getNodesOfType("tESBConsumer").isEmpty() || !process.getNodesOfType("tRouteInput").isEmpty();
+boolean talendEsbJobFactory = !process.getNodesOfType("tESBProviderRequest").isEmpty() || !process.getNodesOfType("tRouteInput").isEmpty();
 
 if (talendMdmJob) {
 	talendJobInterfaces += ", TalendMDMJob"; // Talend MDM job
@@ -116,7 +116,19 @@ public class <%=process.getName()%> implements <%=talendJobInterfaces%> {
 
 <% if (talendEsbJobFactory) { %>
 	public TalendESBJob newTalendESBJob() {
-		return new <%=process.getName()%>();
+		<%=process.getName()%> talendESBJob = new <%=process.getName()%>();
+		java.util.Map<String, routines.system.TalendDataSource> talendDataSources = 
+			(java.util.Map<String, routines.system.TalendDataSource>) globalMap.get(KEY_DB_DATASOURCES);
+		if (null != talendDataSources) {
+            java.util.Map<String, javax.sql.DataSource> dataSources = new java.util.HashMap<String, javax.sql.DataSource>();
+            for (java.util.Map.Entry<String, routines.system.TalendDataSource> talendDataSourceEntry : talendDataSources.entrySet()) {
+                dataSources.put(talendDataSourceEntry.getKey(), talendDataSourceEntry.getValue().getRawDataSource());
+            }
+            talendESBJob.setDataSources(dataSources);
+		}
+		// fix for TESB-7714
+		talendESBJob.setEndpointRegistry(registry);
+		return talendESBJob;
 	}
 <% } %>
 
@@ -247,6 +259,17 @@ private RunTrace runTrace = new RunTrace();
 
 public boolean isExportedAsOSGI = <%=exportAsOSGI%>;
 
+	// OSGi DataSource
+	private final static String KEY_DB_DATASOURCES = "KEY_DB_DATASOURCES";
+
+	public void setDataSources(java.util.Map<String, javax.sql.DataSource> dataSources) {
+		java.util.Map<String, routines.system.TalendDataSource> talendDataSources = new java.util.HashMap<String, routines.system.TalendDataSource>();
+		for (java.util.Map.Entry<String, javax.sql.DataSource> dataSourceEntry : dataSources.entrySet()) {
+			talendDataSources.put(dataSourceEntry.getKey(), new routines.system.TalendDataSource(dataSourceEntry.getValue()));
+		}
+		globalMap.put(KEY_DB_DATASOURCES, talendDataSources);
+	}
+
 <%
 	for (INode logCatcher : process.getNodesOfType("tLogCatcher")) {
 %>
@@ -284,28 +307,36 @@ 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 java.lang.Exception getException() {
+		return this.e;
+	}
+	
+	public String getCurrentComponent() {
+		return this.currentComponent;
+	}
 
 	@Override
 	public void printStackTrace() {
@@ -426,17 +457,6 @@ private class TalendException extends Exception {
 			}
 		}
 		%>
-		} else {
-		<%
-		if (isRunInMultiThread ) {
-		%>
-		((java.util.Map)threadLocal.get()).put("status", "failure");
-		<%
-		 } else {%>
-		 status = "failure";
-		 <%
-		 }
-		 %>
 		}
 	}
 }
@@ -446,7 +466,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);
@@ -509,7 +529,7 @@ private class TalendException extends Exception {
 							}
 							%>
 
-						} catch (Exception e) {
+						} catch (java.lang.Exception e) {
 							e.printStackTrace();
 						}
 						<%
@@ -552,9 +572,27 @@ private class TalendException extends Exception {
 					}
 				}
 				//end
+				
+				/*
+				This part of code has been added in order to call the correct onComponentError and onSubjobError for the specific components (like tWriteXMLField, tWriteJSONField, tMDMOutput, tBRMS, ...).
+				*/
+				INode subjob_start_node = node;
+				boolean hasBeenChanged = true;
+				
+				while(subjob_start_node.getDesignSubjobStartNode().isVirtualGenerateNode() && hasBeenChanged) {
+					hasBeenChanged = false;
+					if(subjob_start_node.getDesignSubjobStartNode().getIncomingConnections(EConnectionType.ON_COMPONENT_OK) != null) {
+						if(subjob_start_node.getDesignSubjobStartNode().getIncomingConnections(EConnectionType.ON_COMPONENT_OK).size() >0) {
+							if(subjob_start_node.getDesignSubjobStartNode().getIncomingConnections(EConnectionType.ON_COMPONENT_OK).get(0).getSource().getVirtualLinkTo()==EConnectionType.ON_COMPONENT_OK) {
+								subjob_start_node = subjob_start_node.getDesignSubjobStartNode().getIncomingConnections(EConnectionType.ON_COMPONENT_OK).get(0).getSource();
+								hasBeenChanged = true;
+							}
+						}
+					}
+				}
+				
 				%>
-				<%=node.getDesignSubjobStartNode().getUniqueName() %>_onSubJobError(exception, errorComponent, globalMap);
-
+					<%=subjob_start_node.getDesignSubjobStartNode().getUniqueName() %>_onSubJobError(exception, errorComponent, globalMap);
 			}
 			<%
 		}
@@ -562,7 +600,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;
@@ -612,7 +650,7 @@ resumeUtil.addLog("SYSTEM_LOG", "NODE:"+ errorComponent, "", Thread.currentThrea
 <%
 					}
 %>
-				} catch (Exception e) {
+				} catch (java.lang.Exception e) {
 					e.printStackTrace();
 				}
 <%

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

@@ -24,6 +24,7 @@
 		org.talend.designer.codegen.ITalendSynchronizer
 		org.talend.designer.codegen.config.CodeGeneratorArgument
 		org.talend.designer.runprocess.CodeGeneratorRoutine
+		org.talend.core.model.process.EParameterFieldType
 	"
 	class="Header"
 %>
@@ -55,43 +56,76 @@ if (service instanceof AbstractBrandingService) {
 package <%= packageName %>;
 
 <%
-for (String routine : CodeGeneratorRoutine.getRequiredRoutineName(process)) {
-	if (!routine.equals(ITalendSynchronizer.TEMPLATE)) {
-%>
-import routines.<%=routine%>;
-<%
+	java.util.Set<String> importsSet = new java.util.TreeSet<String>();
+/*	for (String routine : CodeGeneratorRoutine.getRequiredRoutineName(process)) {
+		if (!routine.equals(ITalendSynchronizer.TEMPLATE)) {
+			importsSet.add("import routines."+routine);
+		}
 	}
-}
+*/
+	importsSet.add("import java.util.HashMap");
+	importsSet.add("import java.util.Map");
+	importsSet.add("import javax.xml.bind.JAXBException");
+	importsSet.add("import org.apache.camel.ProducerTemplate");
+	importsSet.add("import org.apache.camel.builder.RouteBuilder");
+	importsSet.add("import org.apache.camel.impl.DefaultCamelContext");
+	importsSet.add("import org.apache.camel.main.MainSupport");
+	importsSet.add("import routines.TalendString");
+	importsSet.add("import routines.system.api.TalendESBRoute");
+	importsSet.add("import org.apache.camel.view.ModelFileGenerator");
+	importsSet.add("import org.apache.camel.spi.Registry");
+	importsSet.add("import org.apache.camel.impl.DefaultCamelContext");
+	importsSet.add("import org.apache.camel.osgi.CamelContextFactory");
+	importsSet.add("import  org.apache.camel.CamelContext");
+	importsSet.add("import  java.util.Properties");
+	importsSet.add("import  org.apache.camel.management.JmxNotificationEventNotifier");
+	
+	String headerImports = ElementParameterParser.getValue(process, "__HEADER_IMPORT__");
+	if(headerImports!=null && !"".equals(headerImports.trim())){
+		String[] imports = headerImports.split(";");
+		for(String s: imports){
+			if(s!=null && !"".equals(s.trim())){
+				importsSet.add(s.trim());
+			}
+		}
+	}
+	String footerImports = ElementParameterParser.getValue(process, "__FOOTER_IMPORT__");
+	if(footerImports!=null && !"".equals(footerImports.trim())){
+		String[] imports = footerImports.split(";");
+		for(String s: imports){
+			if(s!=null && !"".equals(s.trim())){
+				importsSet.add(s.trim());
+			}
+		}
+	}
+
+	List<? extends INode> generatingNodes = process.getGeneratingNodes();
+	for(INode n: generatingNodes){
+		List<? extends IElementParameter> elementParameters = n.getElementParameters();
+		for(IElementParameter p: elementParameters){
+			if(p.getShowIf() != null && !p.isShow(elementParameters)){
+				continue;
+			}
+			if(EParameterFieldType.MEMO_IMPORT == p.getFieldType()){
+				Object value = p.getValue();
+				if(value == null || !(value instanceof String) || "".equals(((String)value).trim())){
+					continue;
+				}
+				String[] imports = ((String)value).trim().split(";");
+				for(String s: imports){
+					if(s!=null && !"".equals(s.trim())){
+						importsSet.add(s.trim());
+					}
+				}
+			}
+		}
+		
+	}
+	
+	for(String s: importsSet){
 %>
-import routines.system.*;
-import routines.system.api.*;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.math.BigDecimal;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import java.util.Comparator;
-
-<%=ElementParameterParser.getValue(process, "__HEADER_IMPORT__") %>
-<%=ElementParameterParser.getValue(process, "__FOOTER_IMPORT__") %>
-
-
+		<%=s%> ;
 <%
-	List<INode> nodesWithImport = process.getNodesWithImport();
-	if (nodesWithImport != null) {
-		for (INode node:nodesWithImport) {
-%>
-	//the import part of <%=node.getUniqueName() %>
-	<%=ElementParameterParser.getValue(node, "__IMPORT__") %>
-
-<%		}
 	}
 %>
 
@@ -102,25 +136,9 @@ import java.util.Comparator;
  * @version <%=version %>
  * @status <%=ElementParameterParser.getValue(process, "__STATUS__") %>
  */
- public class <%=process.getName()%> implements TalendESBRoute {
-
-	private final String jobVersion = "<%=process.getVersion() %>";
-	private final String jobName = "<%=codeGenArgument.getJobName() %>";
-	private final String projectName = "<%=codeGenArgument.getCurrentProjectName() %>";
-	public Integer errorCode = null;
-	private String currentComponent = "";
-	public TalendESBRoute stopDelegate = null;
+ public class <%=process.getName()%> extends MainSupport implements TalendESBRoute {
 
 	public <%=process.getName()%>(){
-		initUriMap();
-	}
-
-	public void stop() throws Exception {
-		if (stopDelegate != null) stopDelegate.stop();
-	}
-
-	public void shutdown() throws Exception {
-		if (stopDelegate != null) stopDelegate.shutdown();
 	}
 
 <%
@@ -139,7 +157,9 @@ import java.util.Comparator;
 
 <%
 	for (INode node : graphicalNodes) {
-		if("cCXF".equals(node.getComponent().getName())) { %>
+		if("cCXF".equals(node.getComponent().getName()) 
+							&& "true".equals(ElementParameterParser.getValue(node, "__ENABLE_SAM__"))  
+							&& !"RAW".equals(ElementParameterParser.getValue(node, "__DATAFORMAT__"))) { %>
 			//ESB Service Activity Monitor Feature
 			private org.apache.cxf.feature.AbstractFeature eventFeature;
 
@@ -151,40 +171,158 @@ import java.util.Comparator;
 	}
 %>
 
-	private org.apache.camel.builder.RouteBuilder routeBuilder;
+	private Map<String, String> uriMap;
 
-	private java.util.Map<String, String> uriMap;
-
-	public java.util.Map<String,String> getUriMap() {
+	public Map<String,String> getUriMap() {
 		return this.uriMap;
 	}
 
-	public void loadCustomUriMap(java.util.Map<String,String> newMap) {
+	public void loadCustomUriMap(Map<String,String> newMap) {
 		if(newMap == null) {
 			return;
 		}
-		for(java.util.Map.Entry<String, String> entry: newMap.entrySet()) {
+		for(Map.Entry<String, String> entry: newMap.entrySet()) {
 			uriMap.put(entry.getKey(), entry.getValue());
 		}
 	}
 
-	protected void initUriMap() {
-		uriMap = new java.util.HashMap<String, String>();
+	/*
+	* the readContextValues(contextName) may have to invoked first before this
+	*/
+	public void initUriMap() {
+		uriMap = new HashMap<String, String>();
 <%
 String cid = "";
 String componentName = "";
 String uri = "";
 for (INode node : graphicalNodes) {
-	IElementParameter param = node.getElementParameter("LABEL");
-	if (param != null && !"__UNIQUE_NAME__".equals(param.getValue())) {
-		cid = (String) param.getValue();
-	} else {
-		cid = node.getUniqueName();
+	if(!node.isActivate()){
+		continue;
 	}
+   	cid = node.getUniqueName();
+//  http://jira.talendforge.org/browse/TESB-5241
+	/*
+   	 * change to use label + unique to make it unique but readable
+   	 */
+	IElementParameter param = node.getElementParameter("LABEL");
+	if(param != null && !"__UNIQUE_NAME__".equals(param.getValue())){
+		cid = (String)param.getValue()+"_"+cid;	
+	}
+   	
 	componentName = node.getComponent().getName();
 	uri = "";
 	if ("cMessagingEndpoint".equals(componentName)) {
 		uri = ElementParameterParser.getValue(node, "__URI__");
+	}else if("cTimer".equals(componentName)){
+		uri = "\"timer:\"+\""+node.getUniqueName()+"\"";
+		StringBuilder sb = new StringBuilder();
+		String period = ElementParameterParser.getValue(node, "__PERIOD__");
+		if(period!=null && !period.trim().equals("") && !"1000".equals(period)){
+			sb.append("+\"?period=\"+");
+			sb.append(period);
+		}
+		String repeat = ElementParameterParser.getValue(node, "__REPEATCOUNT__");
+		if(repeat!=null && !repeat.trim().equals("") && !"0".equals(repeat)){
+			if(sb.length()==0){
+				sb.append("+\"?repeatCount=\"+");
+				sb.append(repeat);
+			}else{
+				sb.append("+\"&repeatCount=\"+");
+				sb.append(repeat);
+			}
+		}
+		String delay = ElementParameterParser.getValue(node, "__DELAY__");
+		if(delay!=null && !delay.trim().equals("")){
+			if(sb.length()==0){
+				sb.append("+\"?delay=\"+");
+				sb.append(delay);
+			}else{
+				sb.append("+\"&delay=\"+");
+				sb.append(delay);
+			}
+		}
+		String fixedRate = ElementParameterParser.getValue(node, "__FIXEDRATE__");
+		if("true".equals(fixedRate)){
+			if(sb.length()==0){
+				sb.append("+\"?fixedRate=true\"");
+			}else{
+				sb.append("+\"&fixedRate=true\"");
+			}
+		}
+		String daemon = ElementParameterParser.getValue(node, "__DAEMON__");
+		if("false".equals(daemon)){
+			if(sb.length()==0){
+				sb.append("+\"?daemon=false\"");
+			}else{
+				sb.append("+\"&daemon=false\"");
+			}
+		}
+		String setTime = ElementParameterParser.getValue(node, "__SET_TIME__");
+		if("true".equals(setTime)){
+			String time = ElementParameterParser.getValue(node, "__TIME__");
+			if(sb.length()==0){
+				sb.append("+\"?time=\"+");
+				sb.append(time);
+			}else{
+				sb.append("+\"&time=\"+");
+				sb.append(time);
+			}
+		}
+		if(sb.length()>0){
+			uri = uri + sb.toString();
+		}
+	}else if("cDataset".equals(componentName)){
+		uri = "\"dataset:\"+"+ElementParameterParser.getValue(node, "__DATASET_NAME__");
+		StringBuilder sb = new StringBuilder();
+		String produceDelay = ElementParameterParser.getValue(node, "__PRODUCE_DELAY__");
+		if(produceDelay!=null && !produceDelay.trim().equals("") && !"3".equals(produceDelay)){
+			sb.append("+\"?produceDelay=\"+");
+			sb.append(produceDelay);
+		}
+		String consumeDelay = ElementParameterParser.getValue(node, "__CONSUME_DELAY__");
+		if(consumeDelay!=null && !consumeDelay.trim().equals("") && !"0".equals(consumeDelay)){
+			if(sb.length()==0){
+				sb.append("+\"?consumeDelay=\"+");
+				sb.append(consumeDelay);
+			}else{
+				sb.append("+\"&consumeDelay=\"+");
+				sb.append(consumeDelay);
+			}
+		}
+		String preloadSize = ElementParameterParser.getValue(node, "__PRELOAD_SIZE__");
+		if(preloadSize!=null && !preloadSize.trim().equals("") && !"0".equals(preloadSize)){
+			if(sb.length()==0){
+				sb.append("+\"?preloadSize=\"+");
+				sb.append(preloadSize);
+			}else{
+				sb.append("+\"&preloadSize=\"+");
+				sb.append(preloadSize);
+			}
+		}
+		String initialDelay = ElementParameterParser.getValue(node, "__INITIAL_DELAY__");
+		if(initialDelay!=null && !initialDelay.trim().equals("") && !"1000".equals(initialDelay)){
+			if(sb.length()==0){
+				sb.append("+\"?initialDelay=\"+");
+				sb.append(initialDelay);
+			}else{
+				sb.append("+\"&initialDelay=\"+");
+				sb.append(initialDelay);
+			}
+		}
+		String minRate = ElementParameterParser.getValue(node, "__MIN_RATE__");
+		if(minRate!=null && !minRate.trim().equals("") && !"0".equals(minRate)){
+			if(sb.length()==0){
+				sb.append("+\"?minRate=\"+");
+				sb.append(minRate);
+			}else{
+				sb.append("+\"&minRate=\"+");
+				sb.append(minRate);
+			}
+		}
+		
+		if(sb.length()>0){
+			uri = uri + sb.toString();
+		}
 	} else if ("cFile".equals(componentName)) {
 		String filePath = ElementParameterParser.getValue(node, "__URI__");
 		String noop = ElementParameterParser.getValue(node, "__NOOP__");
@@ -196,7 +334,7 @@ for (INode node : graphicalNodes) {
 
 		StringBuffer arguments = new StringBuffer();
 
-		uri = "\"file:///\"+" + filePath;
+		uri = "\"file://\"+" + filePath;
 
 		if ("true".equals(noop)) {
 			arguments.append("\"noop=true\"+");
@@ -258,7 +396,17 @@ for (INode node : graphicalNodes) {
 		sb.append("\"cxf://\"+").append(url).append("+\"?" + serviceType + "=\"");
 
 		if ("wsdlURL".equals(serviceType)) {
-			String filePath = ElementParameterParser.getValue(node, "__WSDL_FILE__");
+		
+			//http://jira.talendforge.org/browse/TESB-6226
+		    String filePath = "";
+			
+			String wsdlType = ElementParameterParser.getValue(node, "__WSDL_TYPE__");
+			if("file".equals(wsdlType)){
+			  filePath =  ElementParameterParser.getValue(node, "__WSDL_FILE__");
+			}else{
+				filePath =  ElementParameterParser.getValue(node, "__ROUTE_RESOURCE_TYPE_RES_URI__");
+				filePath = "\"classpath:" + filePath + "\"";
+			}
 			filePath.replaceAll("\\\\","/");
 			sb.append("+").append(filePath);
 		} else {
@@ -329,10 +477,11 @@ for (INode node : graphicalNodes) {
 
 	} else if("cJMS".equals(componentName)) {
 		//http://jira.talendforge.org/browse/TESB-4861
-		String name = ElementParameterParser.getValue(node, "__CONNECTION_FACOTRY__");
+		String name = ElementParameterParser.getValue(node, "__ROUTE_COMPONENT_TYPE_ID__");
 		if (name == null || name.equals("")) {
 			name = "jms";
 		}
+		name = name.replace("_", "");
 		name = "\"" + name + "\"";
 		//String name = ElementParameterParser.getValue(node, "__NAME__").trim();
 		//Remove unnecessary subfix
@@ -526,10 +675,10 @@ for (INode node : graphicalNodes) {
 		String resourceUri = ElementParameterParser.getValue(node, "__URI__");
 		sb.append(resourceUri);
 
-		boolean hasParam = false;
+		boolean hasParam = resourceUri==null?false:resourceUri.contains("?");
 
 		String method = ElementParameterParser.getValue(node, "__METHOD__");
-		if("GET".equals(method)||"HEAD".equals(method)){
+		if("GET".equals(method)||"HEAD".equals(method) || "DELETE".equals(method)){
 			List<Map<String, String>> parameters = (List<Map<String, String>>) ElementParameterParser.getObjectValue(node, "__PARAMETERS__");
 			String encodeCharset = ElementParameterParser.getValue(node, "__ENCODER_CHARSET__");
 
@@ -571,93 +720,3 @@ for (INode node : graphicalNodes) {
 }
 %>
 	}
-
-	private java.util.Properties defaultProps = new java.util.Properties();
-
-	public class ContextProperties extends java.util.Properties {
-
-		public ContextProperties(java.util.Properties properties) {
-			super(properties);
-		}
-		public ContextProperties() {
-			super();
-		}
-
-		public void synchronizeContext() {
-		<% for (IContextParameter ctxParam : params){
-			String cParaName = ctxParam.getName(); %>
-			if(<%=cParaName %> != null){
-			<% if(ctxParam.getType().equals("id_Date")){ %>
-				String pattern_<%=cParaName %> = "yyyy-MM-dd HH:mm:ss";
-				String value_<%=cParaName %> = "<%=ctxParam.getValue() %>";
-				String[] parts_<%=cParaName %> = value_<%=cParaName %>.split(";");
-				if (parts_<%=cParaName %>.length > 1) {
-					pattern_<%=cParaName %> = parts_<%=cParaName %>[0];
-					this.setProperty("<%=cParaName %>", pattern_<%=cParaName %> + ";" + FormatterUtils.format_Date(<%=cParaName %>, pattern_<%=cParaName %>));
-				} else {
-					this.setProperty("<%=cParaName %>", FormatterUtils.format_Date(<%=cParaName %>, pattern_<%=cParaName %>));
-				}
-			<% } else { %>
-				this.setProperty("<%=cParaName %>", <%=cParaName %>.toString());
-			<% } %>
-			}
-		<% } %>
-		}
-
-<%
-for (IContextParameter ctxParam : params) {
-	if(ctxParam.getType().equals("id_List Of Value") || ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory")) { %>
-		public String <%=ctxParam.getName()%>;
-		public String get<%=Character.toUpperCase(ctxParam.getName().charAt(0)) + ctxParam.getName().substring(1)%>() {
-			return this.<%=ctxParam.getName()%>;
-		}
-<%	} else { %>
-		public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> <%=ctxParam.getName()%>;
-		public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Character.toUpperCase(ctxParam.getName().charAt(0)) + ctxParam.getName().substring(1)%>() {
-			return this.<%=ctxParam.getName()%>;
-		}
-<%	}
-}
-%>
-	}
-
-	private ContextProperties context = new ContextProperties();
-	public ContextProperties getContext() {
-		return this.context;
-	}
-
-
-
-<% if(stats) { %>
-
-	class MyStatThread implements Runnable {
-
-		CamelStat stats;
-		boolean isFinished;
-
-		public MyStatThread(CamelStat stats) {
-			this.stats = stats;
-		}
-
-		public void run() {
-			while (true) {
-				try {
-<%
-		for (INode node : processNodes) {
-			if (node.isActivate()) {
-				for(int i=0; i<node.getIncomingConnections().size(); i++) {
-%>
-					stats.updateStatOnConnection("<%=node.getIncomingConnections().get(i).getUniqueName()%>", 1, "<%=node.getUniqueName()%>");
-<%
-				}
-			}
-		}
-%>
-					Thread.sleep(1000);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-<% } //if stats %>

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

@@ -53,6 +53,7 @@ for (IConnection iterateConn : iterateConnSet) { //1
 	
 %>
 	NB_ITERATE_<%=iterateNodeName %>++;
+	iterateLoop++;
 <%	
 	
 	parallelIterate = "true".equals(ElementParameterParser.getValue(iterateConn, "__ENABLE_PARALLEL__"));
@@ -92,6 +93,7 @@ for (IConnection iterateConn : iterateConnSet) { //1
 		private java.util.Map<String, Object> globalMap = null;
 		boolean isRunning = false;
 		String iterateId = "";
+		int iterateLoop = 0;
 <%
 			if(!subTree.isMergeSubTree()) {
 				List< ? extends IConnection> rootConns = subTree.getRootNode().getOutgoingConnections();
@@ -155,6 +157,7 @@ for (IConnection iterateConn : iterateConnSet) { //1
 			<%}%>
 				}
 			iterateId = "." + threadID;
+			iterateLoop++;
 	<%if(isRunJob) {%>
 			//bug21906 copy context to local for mutilthread
 			context.synchronizeContext();
@@ -200,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);
 	
@@ -217,7 +217,7 @@
 <%
 	}
 %>
-		throw new java.lang.Error(error);
+		throw error;
 
 	}
 <%

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();
 					<%
@@ -983,6 +993,7 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
 			}
 			boolean isRunning = false;
 			String iterateId = "";
+			int iterateLoop = 0;
 			
 			public void run() {
 				java.util.Map threadRunResultMap = new java.util.HashMap();
@@ -999,11 +1010,12 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
 %>
 
 	String iterateId = "";
+	int iterateLoop = 0;
 	String currentComponent = "";
 				
 	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/resources/subprocess_header_route.javajet

@@ -33,8 +33,8 @@
 	boolean stat = codeGenArgument.isStatistics();
 %>
 
-public org.apache.camel.builder.RouteBuilder Route(final boolean start) throws Exception {
-
-	String iterateId = "";
-	String currentComponent = "";
-
+/**
+* please initial uri map first before using the returned RouteBuilder
+* @return RouteBuilder
+*/
+public RouteBuilder route() {

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

@@ -669,8 +669,14 @@ public class CodeGenerator implements ICodeGenerator {
 							label = (String) parameter.getValue();
 						}
 
+						/*
+						 * Fix https://jira.talendforge.org/browse/TESB-6685
+						 * label + uniqueName to make it unique
+						 */
 						if (label == null) {
 							label = node.getUniqueName();
+						}else{
+							label += "_"+node.getUniqueName();
 						}
 						List<? extends IConnection> inConnections = node
 								.getIncomingConnections();

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

@@ -48,7 +48,6 @@ public class ComponentFileChecker {
         checkFiles(currentFolder, languageSuffix);
         File xmlMainFile = new File(currentFolder, ComponentFilesNaming.getInstance().getMainXMLFileName(currentFolder.getName(),
                 languageSuffix));
-        XsdValidationCacheManager xsdValidationCacheManager = XsdValidationCacheManager.getInstance();
 
         long currentCRC = 0;
         FileInputStream fis = null;
@@ -58,9 +57,8 @@ public class ComponentFileChecker {
             // do not check anymore XSD when be in headless mode.
             // check is mainly usefull for GUI to be able to check why component is not loaded after be developped.
             // if be in headless mode (like commandline), it's supposed to use only stable components
-            if (!CommonsPlugin.isHeadless() && xsdValidationCacheManager.needCheck(xmlMainFile, currentCRC)) {
+            if (!CommonsPlugin.isHeadless()) {
                 checkXSD(xmlMainFile);
-                xsdValidationCacheManager.setChecked(xmlMainFile, currentCRC);
             }
         } catch (FileNotFoundException e) {
             ExceptionHandler.process(e);

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

@@ -14,33 +14,30 @@ package org.talend.designer.codegen.components.model;
 
 import java.io.File;
 import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
 import java.util.Set;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -53,10 +50,14 @@ import org.osgi.framework.ServiceReference;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.BusinessException;
+import org.talend.commons.ui.runtime.CommonUIPlugin;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.utils.io.FilesUtils;
+import org.talend.commons.utils.io.SHA1Util;
+import org.talend.core.CorePlugin;
 import org.talend.core.GlobalServiceRegister;
-import org.talend.core.language.ECodeLanguage;
+import org.talend.core.context.Context;
+import org.talend.core.context.RepositoryContext;
 import org.talend.core.language.LanguageManager;
 import org.talend.core.model.component_cache.ComponentCachePackage;
 import org.talend.core.model.component_cache.ComponentInfo;
@@ -67,9 +68,8 @@ import org.talend.core.model.components.ComponentUtilities;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IComponentsFactory;
 import org.talend.core.model.general.Project;
-import org.talend.core.model.properties.ComponentSetting;
 import org.talend.core.ui.branding.IBrandingService;
-import org.talend.core.utils.BrandingChecker;
+import org.talend.core.utils.TalendCacheUtils;
 import org.talend.designer.codegen.CodeGeneratorActivator;
 import org.talend.designer.codegen.i18n.Messages;
 import org.talend.designer.core.ITisLocalProviderService;
@@ -78,14 +78,7 @@ import org.talend.designer.core.model.components.EmfComponent;
 import org.talend.designer.core.model.components.manager.ComponentManager;
 import org.talend.designer.core.model.process.AbstractProcessProvider;
 import org.talend.designer.core.ui.editor.palette.TalendEntryEditPart;
-import org.talend.repository.ProjectManager;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
+import org.talend.repository.model.ComponentsFactoryProvider;
 
 /**
  * Component factory that look for each component and load their information. <br/>
@@ -107,15 +100,15 @@ public class ComponentsFactory implements IComponentsFactory {
 
     private static HashSet<IComponent> componentList = null;
 
-    private static List<IComponent> customComponentList = null;
+    private static HashSet<IComponent> customComponentList = null;
 
-    private List<IComponent> userComponentList = null;
+    private HashSet<IComponent> userComponentList = null;
 
     private IProgressMonitor monitor;
 
     private SubMonitor subMonitor;
 
-    private static Map<String, IComponent> componentsCache = new HashMap<String, IComponent>();
+    private static Map<String, Map<String, IComponent>> componentsCache = new HashMap<String, Map<String, IComponent>>();
 
     // keep a list of the current provider for the selected component, to have the family translation
     // only for components that are loaded
@@ -123,8 +116,6 @@ public class ComponentsFactory implements IComponentsFactory {
 
     private static Map<String, AbstractComponentsProvider> componentsAndProvider = new HashMap<String, AbstractComponentsProvider>();
 
-    private Map<String, String> allComponents;
-
     // 1. only the in the directory /components ,not including /resource
     // 2. include the skeleton files and external include files
     private static ArrayList<String> skeletonList = null;
@@ -133,118 +124,11 @@ public class ComponentsFactory implements IComponentsFactory {
 
     private static final String INCLUDEFILEINJET_SUFFIX = ".inc.javajet"; //$NON-NLS-1$
 
-    private static final String FAMILY_SPEARATOR = "--FAMILY--"; //$NON-NLS-1$
-
     private boolean isCreated = false;
 
-    private boolean isReset = false;
-
-    // public XmiResourceManager xmiResourceManager = new XmiResourceManager();
-
-    // this list of component is always needed, they must always be loaded at least, since they can be used for code
-    // generation indirectly.
-    // tFileInputFullRow + tSocketOutput : needed for DataViewer
-    private static final String[] COMPONENTS_ALWAYS_NEEDED = { "tPrejob", "tPostjob", //$NON-NLS-1$ //$NON-NLS-2$ 
-            "tJava", "tLibraryLoad", "tFileInputFullRow", "tSocketOutput", "tFilterRow" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ 
+    private static boolean cleanDone = false;
 
     public ComponentsFactory() {
-        if (!INCLUDEFILEINJET_SUFFIX.equals(".inc.javajet")) { //$NON-NLS-1$
-            ExceptionHandler.process(new IllegalStateException(Messages.getString("ComponentsFactory.parentNotRecompiled")), //$NON-NLS-1$
-                    Priority.WARN);
-        }
-    }
-
-    private List<ComponentSetting> getComponentsFromProject() {
-        // TODO check components used from ref projects.
-        Project currentProject = ProjectManager.getInstance().getCurrentProject();
-        if (currentProject != null && currentProject.getEmfProject() != null) {
-
-            List<ComponentSetting> components = (List<ComponentSetting>) currentProject.getEmfProject().getComponentsSettings();
-            return components;
-        }
-        return Collections.emptyList();
-    }
-
-    private boolean isComponentVisible(String componentName) {
-        Boolean visible = Boolean.TRUE;
-
-        if (ArrayUtils.contains(COMPONENTS_ALWAYS_NEEDED, componentName)) {
-            return true;
-        }
-
-        List<ComponentSetting> settingsFromCompName = new ArrayList<ComponentSetting>();
-        // here we just check if the component is visible somewhere in the settings.
-        // if it's visible in any category, we will load the component
-        // if the component is unknown (new component?), we will load also
-        // (technical components will always loaded by default as they're not saved in componentSettings)
-        // to avoid any problem, we also load by default the category named "Technical".
-
-        for (ComponentSetting componentSetting : getComponentsFromProject()) {
-            String name = componentSetting.getName();
-            if (name != null && name.equals(componentName)) {
-                settingsFromCompName.add(componentSetting);
-                // if (componentSetting.isHidden()) {
-                // // hide component only if hidden in all projects
-                // if (manager.getReferencedProjects(manager.getCurrentProject()).size() > 0
-                // && isHiddenInRefProjects(componentName)) {
-                // visible = Boolean.FALSE;
-                // } else {
-                // visible = Boolean.TRUE;
-                // componentSetting.setHidden(false);
-                // }
-                // } else {
-                // return true;
-                // }
-                if ("Technical".equals(componentSetting.getFamily())) { //$NON-NLS-1$
-                    return true;
-                }
-            }
-        }
-
-        // load components those visible in any category
-        int hideCount = 0;
-        for (ComponentSetting componentSetting : settingsFromCompName) {
-            if (componentSetting.isHidden()) {
-                // hide component only if hidden in all projects
-                if (isHiddenInRefProjects(componentSetting)) {
-                    hideCount++;
-                } else {
-                    visible = Boolean.TRUE;
-                    componentSetting.setHidden(false);
-                }
-            } else {
-                visible = Boolean.TRUE;
-            }
-        }
-        if (settingsFromCompName.size() > 0 && hideCount == settingsFromCompName.size()) {
-            visible = Boolean.FALSE;
-        }
-
-        return visible;
-    }
-
-    private boolean isHiddenInRefProjects(ComponentSetting settingInMain) {
-        if (settingInMain == null) {
-            return false;
-        }
-        int hiddenCount = 0;
-        ProjectManager manager = ProjectManager.getInstance();
-        List<Project> referencedProjects = manager.getReferencedProjects();
-        for (Project curProject : referencedProjects) {
-            List<ComponentSetting> componentsSettings = (List<ComponentSetting>) curProject.getEmfProject()
-                    .getComponentsSettings();
-            for (ComponentSetting setting : componentsSettings) {
-                if (setting.isHidden() && setting.getName().equals(settingInMain.getName())
-                        && setting.getFamily().equals(settingInMain.getFamily())) {
-                    hiddenCount++;
-                }
-            }
-        }
-        if (hiddenCount == referencedProjects.size()) {
-            return true;
-        }
-
-        return false;
     }
 
     private void init(boolean duringLogon) {
@@ -258,51 +142,38 @@ public class ComponentsFactory implements IComponentsFactory {
         // TimeMeasure.begin("initComponents");
 
         componentList = new HashSet<IComponent>();
-        customComponentList = new ArrayList<IComponent>();
+        customComponentList = new HashSet<IComponent>();
         skeletonList = new ArrayList<String>();
+        userComponentList = new HashSet<IComponent>();
         String installLocation = new Path(Platform.getConfigurationLocation().getURL().getPath()).toFile().getAbsolutePath();
         componentToProviderMap = new HashMap<IComponent, AbstractComponentsProvider>();
-        boolean isNeedClean = cleanComponentCache();
+        boolean isNeedClean = !cleanDone && TalendCacheUtils.isSetCleanComponentCache();
+        cleanDone = true; // only check this parameter one time, or it will reinitialize things all the time...
         isCreated = hasComponentFile(installLocation) && !isNeedClean;
-        if (isReset) {
-            isCreated = false;
-        }
-        ComponentsCache cache = ComponentManager.getInstance();
+        ComponentsCache cache = ComponentManager.getComponentCache();
         try {
             if (isCreated) {
-                ComponentsCache loadCache = loadComponentResource(installLocation);
-                cache.getComponentEntryMap().putAll(loadCache.getComponentEntryMap());
+                // if cache is created and empty, means we never loaded it before.
+                // if it was already loaded, then no need to go again, since it's a static variable, it's still in
+                // memory.
+                // it avoids to reload from disk again even more for commandline at each logon, since it's no use.
+                if (cache.getComponentEntryMap().isEmpty()) {
+                    ComponentsCache loadCache = loadComponentResource(installLocation);
+                    cache.getComponentEntryMap().putAll(loadCache.getComponentEntryMap());
+                }
             } else {
                 cache.getComponentEntryMap().clear();
             }
-            // check if any component is missing from any provider
-            // if yes, re-create the cache.
-            if (isCreated && isAnyComponentMissing()) {
-                cache.getComponentEntryMap().clear();
-                isCreated = false;
-            }
         } catch (IOException e) {
             ExceptionHandler.process(e);
             cache.getComponentEntryMap().clear();
             isCreated = false;
         }
 
-        XsdValidationCacheManager.getInstance().load();
+        // XsdValidationCacheManager.getInstance().load();
         // 1.Load Component from extension point: components_provider
-        if (isCreated) {
-            try {
-                reloadComponentsFromCache();
-            } catch (Exception e) {
-                ExceptionHandler.process(e);
-                // if any exception happen, reset all cache
-                cache.getComponentEntryMap().clear();
-                isCreated = false;
-            }
-        }
 
-        if (!isCreated) {
-            loadComponentsFromComponentsProviderExtension();
-        }
+        loadComponentsFromComponentsProviderExtension();
 
         // TimeMeasure.step("initComponents", "loadComponentsFromProvider");
         // 2.Load Component from extension point: component_definition
@@ -311,17 +182,11 @@ public class ComponentsFactory implements IComponentsFactory {
 
         // TimeMeasure.step("initComponents", "reloadFromCache");
 
-        if (!isCreated) {
-            XsdValidationCacheManager.getInstance().save();
-            ComponentManager.saveResource();
-            isReset = false;
-        }
         // TimeMeasure.step("initComponents", "createCache");
+
+        ComponentManager.saveResource(); // will save only if needed.
         log.debug(componentList.size() + " components loaded in " + (System.currentTimeMillis() - startTime) + " ms"); //$NON-NLS-1$ //$NON-NLS-2$
 
-        if (!duringLogon) {
-            // CorePlugin.getDefault().getRunProcessService().updateLibraries(new HashSet<String>(), null);
-        }
         // TimeMeasure.step("initComponents", "updateLibraries");
 
         // TimeMeasure.end("initComponents");
@@ -329,117 +194,23 @@ public class ComponentsFactory implements IComponentsFactory {
         // TimeMeasure.display = false;
         // TimeMeasure.displaySteps = false;
         // TimeMeasure.measureActive = false;
-    }
-
-    private boolean isAnyComponentMissing() throws IOException {
-        Iterator it = ComponentManager.getInstance().getComponentEntryMap().entrySet().iterator();
-        List<String> componentsList = new ArrayList<String>();
-        while (it.hasNext()) {
-            Map.Entry<String, ComponentInfo> entry = (Map.Entry<String, ComponentInfo>) it.next();
-            componentsList.add(entry.getKey());
-        }
-
-        ECodeLanguage currentLanguage = LanguageManager.getCurrentLanguage();
-        ComponentsProviderManager componentsProviderManager = ComponentsProviderManager.getInstance();
-        for (AbstractComponentsProvider componentsProvider : componentsProviderManager.getProviders()) {
-            if (componentsProvider.getInstallationFolder().exists()) {
-                File source = componentsProvider.getInstallationFolder();
-                File[] childDirectories;
-
-                FileFilter fileFilter = new FileFilter() {
-
-                    public boolean accept(final File file) {
-                        return file.isDirectory() && file.getName().charAt(0) != '.'
-                                && !file.getName().equals(IComponentsFactory.EXTERNAL_COMPONENTS_INNER_FOLDER)
-                                && isComponentVisible(file.getName());
-                    }
-
-                };
-                if (source == null) {
-                    continue;
-                }
-
-                childDirectories = source.listFiles(fileFilter);
-
-                for (File component : childDirectories) {
-                    if (!componentsList.contains(component.getName())) {
-                        String mainXmlFileName = ComponentFilesNaming.getInstance().getMainXMLFileName(component.getName(),
-                                currentLanguage.getName());
-                        File mainXmlFile = new File(component, mainXmlFileName);
-                        if (mainXmlFile.exists()) {
-                            return true;
-                        }
-                        // no xml file for this language, ignore it
-                    }
-                }
+        if (!CommonUIPlugin.isFullyHeadless()) {
+            RepositoryContext repositoryContext = (RepositoryContext) CorePlugin.getContext().getProperty(
+                    Context.REPOSITORY_CONTEXT_KEY);
+            if (repositoryContext == null) {
+                return;
             }
-        }
-        return false;
-    }
-
-    /**
-     * DOC guanglong.du Comment method "reloadComponentsFromCache".
-     * 
-     * @throws BusinessException
-     */
-    private void reloadComponentsFromCache() throws BusinessException {
-        Map<String, String> bundleIdToPath = new HashMap<String, String>();
-        ComponentsCache cache = ComponentManager.getInstance();
-        Iterator it = cache.getComponentEntryMap().entrySet().iterator();
-        while (it.hasNext()) {
-            Map.Entry<String, ComponentInfo> entry = (Map.Entry<String, ComponentInfo>) it.next();
-            ComponentInfo info = entry.getValue();
-            String name = entry.getKey();
-            if (!isComponentVisible(name)) {
-                continue;
+            Project project = repositoryContext.getProject();
+            if (project == null) {
+                return;
             }
-            IBrandingService service = (IBrandingService) GlobalServiceRegister.getDefault().getService(IBrandingService.class);
-            String[] availableComponents = service.getBrandingConfiguration().getAvailableComponents();
-            EmfComponent currentComp = new EmfComponent(info.getUriString(), info.getSourceBundleName(), name,
-                    info.getPathSource(), cache, true);
-            // if the component is not needed in the current branding,
-            // and that this one IS NOT a specific component for code generation
-            // just don't load it
-            if (availableComponents != null
-                    && !ArrayUtils.contains(availableComponents, currentComp.getName())
-                    && !(ArrayUtils.contains(COMPONENTS_ALWAYS_NEEDED, currentComp.getName())
-                            || currentComp.getOriginalFamilyName().contains("Technical") || currentComp.isTechnical())) {
-                continue;
+            org.talend.core.model.properties.Project emfProject = project.getEmfProject();
+            if (emfProject == null) {
+                return;
             }
-            // if the component is not needed in the current branding,
-            // and that this one IS a specific component for code generation,
-            // hide it
-            if (availableComponents != null
-                    && !ArrayUtils.contains(availableComponents, currentComp.getName())
-                    && (ArrayUtils.contains(COMPONENTS_ALWAYS_NEEDED, currentComp.getName())
-                            || currentComp.getOriginalFamilyName().contains("Technical") || currentComp.isTechnical())) {
-                currentComp.setVisible(false);
-                currentComp.setTechnical(true);
-            }
-            if (currentComp.getSourceBundleName().contains("camel")) {
-                currentComp.setPaletteType("CAMEL");
-            } else {
-                currentComp.setPaletteType("DI");
-            }
-            String applicationPath = bundleIdToPath.get(info.getSourceBundleName());
-            if (applicationPath == null) {
-                try {
-                    applicationPath = FileLocator.getBundleFile(Platform.getBundle(info.getSourceBundleName())).getPath();
-                    applicationPath = (new Path(applicationPath)).toPortableString();
-                } catch (IOException e2) {
-                    ExceptionHandler.process(e2);
-                    return;
-                }
-                bundleIdToPath.put(info.getSourceBundleName(), applicationPath);
-            }
-
-            if (!componentList.contains(currentComp)) {
-                currentComp.setResourceBundle(getComponentResourceBundle(currentComp, applicationPath + info.getUriString(),
-                        info.getPathSource(), null));
-
-                File currentFile = new File(applicationPath + info.getUriString());
-                loadIcons(currentFile.getParentFile(), currentComp);
-                componentList.add(currentComp);
+            EList list = emfProject.getComponentsSettings();
+            if (list.isEmpty()) {
+                ComponentsFactoryProvider.saveComponentVisibilityStatus();
             }
         }
     }
@@ -482,11 +253,6 @@ public class ComponentsFactory implements IComponentsFactory {
         return file.exists();
     }
 
-    private boolean cleanComponentCache() {
-        return ArrayUtils.contains(Platform.getApplicationArgs(), "--clean_component_cache")
-                || ArrayUtils.contains(Platform.getApplicationArgs(), "-clean") || BrandingChecker.isBrandingChanged();
-    }
-
     private void loadComponentsFromComponentsProviderExtension() {
         ComponentsProviderManager componentsProviderManager = ComponentsProviderManager.getInstance();
         for (AbstractComponentsProvider componentsProvider : componentsProviderManager.getProviders()) {
@@ -494,15 +260,6 @@ public class ComponentsFactory implements IComponentsFactory {
         }
     }
 
-    public void loadComponentsFromExtension(String id) {
-        ComponentsProviderManager componentsProviderManager = ComponentsProviderManager.getInstance();
-        for (AbstractComponentsProvider componentsProvider : componentsProviderManager.getProviders()) {
-            if (componentsProvider.getId() != null && componentsProvider.getId().equals(id)) {
-                loadComponents(componentsProvider);
-            }
-        }
-    }
-
     private void loadComponents(AbstractComponentsProvider componentsProvider) {
         if (componentsProvider != null) {
             try {
@@ -517,13 +274,14 @@ public class ComponentsFactory implements IComponentsFactory {
         }
     }
 
+    @Override
     public void loadUserComponentsFromComponentsProviderExtension() {
         ComponentsProviderManager.getInstance().getProviders();
         ComponentsProviderManager componentsProviderManager = ComponentsProviderManager.getInstance();
         AbstractComponentsProvider componentsProvider = componentsProviderManager.loadUserComponentsProvidersFromExtension();
         // remove old user components
-        if (this.userComponentList != null) {
-            ComponentsCache cache = ComponentManager.getInstance();
+        if (!this.userComponentList.isEmpty()) {
+            ComponentsCache cache = ComponentManager.getComponentCache();
             for (IComponent component : userComponentList) {
                 if (componentList != null && componentList.contains(component)) {
                     componentList.remove(component);
@@ -533,13 +291,12 @@ public class ComponentsFactory implements IComponentsFactory {
                 }
                 if (cache.getComponentEntryMap().get(component.getName()) != null) {
                     cache.getComponentEntryMap().remove(component.getName());
+                    ComponentManager.setModified(true);
                 }
             }
         }
         loadComponents(componentsProvider);
-        if (!CommonsPlugin.isHeadless()) {
-            ComponentManager.saveResource();
-        }
+        ComponentManager.saveResource();
     }
 
     private void removeOldComponentsUserFolder() {
@@ -560,16 +317,6 @@ public class ComponentsFactory implements IComponentsFactory {
 
     private void loadComponentsFromFolder(String pathSource, AbstractComponentsProvider provider) {
 
-        if (pathSource != null) {
-            Path userComponent = new Path(pathSource);
-            Path templatePath = new Path(IComponentsFactory.COMPONENTS_INNER_FOLDER + File.separatorChar
-                    + IComponentsFactory.EXTERNAL_COMPONENTS_INNER_FOLDER + File.separatorChar
-                    + ComponentUtilities.getExtFolder(OLD_COMPONENTS_USER_INNER_FOLDER));
-            if (userComponent.equals(templatePath)) {
-                this.userComponentList = new ArrayList<IComponent>();
-            }
-        }
-
         boolean isCustom = false;
         if ("org.talend.designer.components.model.UserComponentsProvider".equals(provider.getId())
                 || "org.talend.designer.components.exchange.ExchangeComponentsProvider".equals(provider.getId())) {
@@ -587,10 +334,10 @@ public class ComponentsFactory implements IComponentsFactory {
 
         FileFilter fileFilter = new FileFilter() {
 
+            @Override
             public boolean accept(final File file) {
                 return file.isDirectory() && file.getName().charAt(0) != '.'
-                        && !file.getName().equals(IComponentsFactory.EXTERNAL_COMPONENTS_INNER_FOLDER)
-                        && isComponentVisible(file.getName());
+                        && !file.getName().equals(IComponentsFactory.EXTERNAL_COMPONENTS_INNER_FOLDER);
             }
 
         };
@@ -607,6 +354,7 @@ public class ComponentsFactory implements IComponentsFactory {
 
         FileFilter skeletonFilter = new FileFilter() {
 
+            @Override
             public boolean accept(final File file) {
                 String fileName = file.getName();
                 return file.isFile() && fileName.charAt(0) != '.'
@@ -626,19 +374,14 @@ public class ComponentsFactory implements IComponentsFactory {
         if (context == null) {
             context = CodeGeneratorActivator.getDefault().getBundle().getBundleContext();
         }
-        // if (Platform.getProduct() != null) {
-        // context = Platform.getProduct().getDefiningBundle().getBundleContext();
-        // } else {
-        // context = CodeGeneratorActivator.getDefault().getBundle().getBundleContext();
-        // }
-        // if (context == null) {
-        // context = Platform.getProduct().getDefiningBundle().getBundleContext();
-        // if (context == null)
-        // context = CodeGeneratorActivator.getDefault().getBundle().getBundleContext();
-        // }
         ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName());
         PackageAdmin admin = (PackageAdmin) context.getService(sref);
-
+        String bundleName;
+        if (!isCustom) {
+            bundleName = admin.getBundle(provider.getClass()).getSymbolicName();
+        } else {
+            bundleName = IComponentsFactory.COMPONENTS_LOCATION;
+        }
         if (childDirectories != null) {
             if (monitor != null) {
                 this.subMonitor = SubMonitor.convert(monitor,
@@ -656,26 +399,60 @@ public class ComponentsFactory implements IComponentsFactory {
                     }
 
                     try {
-                        ComponentFileChecker.checkComponentFolder(currentFolder, getCodeLanguageSuffix());
                         File xmlMainFile = new File(currentFolder, ComponentFilesNaming.getInstance().getMainXMLFileName(
                                 currentFolder.getName(), getCodeLanguageSuffix()));
 
-                        if (CommonsPlugin.isHeadless() && componentsCache.containsKey(xmlMainFile.getAbsolutePath())) {
-                            // In headless mode, we assume the components won't change and we will use a cache
-                            componentList.add(componentsCache.get(xmlMainFile.getAbsolutePath()));
-                            if (isCustom) {
-                                customComponentList.add(componentsCache.get(xmlMainFile.getAbsolutePath()));
+                        String currentXmlSha1 = null;
+                        try {
+                            currentXmlSha1 = SHA1Util.calculateFromTextStream(new FileInputStream(xmlMainFile));
+                        } catch (FileNotFoundException e) {
+                            // nothing since exceptions are directly in the check bellow
+                        }
+                        // Need to check if this component is already in the cache or not.
+                        // if yes, then we compare the sha1... and if different we reload the component
+                        // if component is not in the cache, of course just load it!
+                        ComponentsCache cache = ComponentManager.getComponentCache();
+                        boolean foundComponentIsSame = false;
+                        ComponentInfo existingComponentInfoInCache = null;
+                        if (cache.getComponentEntryMap().containsKey(currentFolder.getName())) {
+                            EList<ComponentInfo> infos = cache.getComponentEntryMap().get(currentFolder.getName());
+                            for (ComponentInfo info : infos) {
+                                if (StringUtils.equals(bundleName, info.getSourceBundleName())) {
+                                    existingComponentInfoInCache = info;
+                                    if (StringUtils.equals(info.getSha1(), currentXmlSha1)) {
+                                        foundComponentIsSame = true;
+                                    }
+                                    break; // found component, no matter changed or not
+                                }
                             }
-                            continue;
+                        }
+                        if (foundComponentIsSame) {
+                            // check if component is already loaded in memory, if yes it will only reload existing xml
+                            // it should go here mainly for commandline or if use like ctrl+shift+f3
+                            if (componentsCache.containsKey(xmlMainFile.getAbsolutePath())) {
+                                IComponent componentFromThisProvider = null;
+                                for (IComponent component : componentsCache.get(xmlMainFile.getAbsolutePath()).values()) {
+                                    if (component instanceof EmfComponent) {
+                                        if (bundleName.equals(((EmfComponent) component).getSourceBundleName())) {
+                                            componentFromThisProvider = component;
+                                            break;
+                                        }
+                                    }
+                                }
+                                if (componentFromThisProvider != null) {
+                                    // In headless mode, we assume the components won't change and we will use a cache
+                                    componentList.add(componentFromThisProvider);
+                                    if (isCustom) {
+                                        customComponentList.add(componentFromThisProvider);
+                                    }
+                                    continue;
+                                }
+                            }
+                        }
+                        if (!foundComponentIsSame) {
+                            ComponentFileChecker.checkComponentFolder(currentFolder, getCodeLanguageSuffix());
                         }
                         String pathName = xmlMainFile.getAbsolutePath();
-
-                        String bundleName;
-                        if (!isCustom) {
-                            bundleName = admin.getBundle(provider.getClass()).getSymbolicName();
-                        } else {
-                            bundleName = IComponentsFactory.COMPONENTS_LOCATION;
-                        }
                         String applicationPath;
                         try {
                             applicationPath = FileLocator.getBundleFile(Platform.getBundle(bundleName)).getPath();
@@ -690,30 +467,38 @@ public class ComponentsFactory implements IComponentsFactory {
                         // pathName = C:\myapp\plugins\myplugin\components\mycomponent\mycomponent.xml
                         pathName = (new Path(pathName)).toPortableString();
                         // pathName = C:/myapp/plugins/myplugin/components/mycomponent/mycomponent.xml
-                        pathName = pathName.replace(applicationPath, "");
+                        pathName = pathName.replace(applicationPath, ""); //$NON-NLS-1$
 
                         // pathName = /components/mycomponent/mycomponent.xml
 
                         EmfComponent currentComp = new EmfComponent(pathName, bundleName, xmlMainFile.getParentFile().getName(),
-                                pathSource, ComponentManager.getInstance(), isCreated);
-                        // force to call some functions to update the cache. (to improve)
-                        currentComp.isVisibleInComponentDefinition();
-                        currentComp.isTechnical();
-                        currentComp.getOriginalFamilyName();
-                        currentComp.getTranslatedFamilyName();
-                        currentComp.getPluginExtension();
-                        currentComp.getVersion();
-                        currentComp.getModulesNeeded();
-                        currentComp.getPluginDependencies();
-                        // end of force cache update.
+                                pathSource, ComponentManager.getComponentCache(), foundComponentIsSame);
+                        if (!foundComponentIsSame) {
+                            // force to call some functions to update the cache. (to improve)
+                            currentComp.isVisibleInComponentDefinition();
+                            currentComp.isTechnical();
+                            currentComp.getOriginalFamilyName();
+                            currentComp.getTranslatedFamilyName();
+                            currentComp.getPluginExtension();
+                            currentComp.getVersion();
+                            currentComp.getModulesNeeded();
+                            currentComp.getPluginDependencies();
+                            // end of force cache update.
 
+                            EList<ComponentInfo> componentsInfo = cache.getComponentEntryMap().get(currentFolder.getName());
+                            for (ComponentInfo cInfo : componentsInfo) {
+                                if (cInfo.getSourceBundleName().equals(bundleName)) {
+                                    cInfo.setSha1(currentXmlSha1);
+                                    break;
+                                }
+                            }
+                            ComponentManager.setModified(true); // this will force to save the cache later.
+                        }
                         // if the component is not needed in the current branding,
                         // and that this one IS NOT a specific component for code generation
                         // just don't load it
-                        if (availableComponents != null
-                                && !ArrayUtils.contains(availableComponents, currentComp.getName())
-                                && !(ArrayUtils.contains(COMPONENTS_ALWAYS_NEEDED, currentComp.getName())
-                                        || currentComp.getOriginalFamilyName().contains("Technical") || currentComp.isTechnical())) {
+                        if (availableComponents != null && !ArrayUtils.contains(availableComponents, currentComp.getName())
+                                && !(currentComp.getOriginalFamilyName().contains("Technical") || currentComp.isTechnical())) {
                             continue;
                         }
 
@@ -722,10 +507,8 @@ public class ComponentsFactory implements IComponentsFactory {
                         // if the component is not needed in the current branding,
                         // and that this one IS a specific component for code generation,
                         // hide it
-                        if (availableComponents != null
-                                && !ArrayUtils.contains(availableComponents, currentComp.getName())
-                                && (ArrayUtils.contains(COMPONENTS_ALWAYS_NEEDED, currentComp.getName())
-                                        || currentComp.getOriginalFamilyName().contains("Technical") || currentComp.isTechnical())) {
+                        if (availableComponents != null && !ArrayUtils.contains(availableComponents, currentComp.getName())
+                                && (currentComp.getOriginalFamilyName().contains("Technical") || currentComp.isTechnical())) {
                             currentComp.setVisible(false);
                             currentComp.setTechnical(true);
                         }
@@ -756,9 +539,13 @@ public class ComponentsFactory implements IComponentsFactory {
                             }
                         }
 
-                        if (CommonsPlugin.isHeadless()) {
-                            componentsCache.put(xmlMainFile.getAbsolutePath(), currentComp);
+                        // componentsCache only used bellow in case of headless (commandline) or if use like
+                        // ctrl+shift+f3
+                        String componentName = xmlMainFile.getAbsolutePath();
+                        if (!componentsCache.containsKey(componentName)) {
+                            componentsCache.put(componentName, new HashMap<String, IComponent>());
                         }
+                        componentsCache.get(xmlMainFile.getAbsolutePath()).put(currentComp.getPaletteType(), currentComp);
                     } catch (MissingMainXMLComponentFileException e) {
                         log.trace(currentFolder.getName() + " is not a " + getCodeLanguageSuffix() + " component", e); //$NON-NLS-1$ //$NON-NLS-2$
                     } catch (BusinessException e) {
@@ -913,6 +700,7 @@ public class ComponentsFactory implements IComponentsFactory {
         component.setImageRegistry(componentsImageRegistry);
     }
 
+    @Override
     public int size() {
         if (componentList == null) {
             init(false);
@@ -920,6 +708,7 @@ public class ComponentsFactory implements IComponentsFactory {
         return componentList.size();
     }
 
+    @Override
     public IComponent get(String name) {
         if (componentList == null) {
             init(false);
@@ -933,6 +722,7 @@ public class ComponentsFactory implements IComponentsFactory {
         return null;
     }
 
+    @Override
     public void initializeComponents(IProgressMonitor monitor) {
         this.monitor = monitor;
         if (componentList == null) {
@@ -942,6 +732,7 @@ public class ComponentsFactory implements IComponentsFactory {
         this.subMonitor = null;
     }
 
+    @Override
     public void initializeComponents(IProgressMonitor monitor, boolean duringLogon) {
         this.monitor = monitor;
         if (componentList == null) {
@@ -956,6 +747,7 @@ public class ComponentsFactory implements IComponentsFactory {
      * 
      * @see org.talend.core.model.components.IComponentsFactory#getComponents()
      */
+    @Override
     public Set<IComponent> getComponents() {
         if (componentList == null) {
             init(false);
@@ -963,28 +755,12 @@ public class ComponentsFactory implements IComponentsFactory {
         return componentList;
     }
 
+    @Override
     public List<IComponent> getCustomComponents() {
         if (customComponentList == null) {
             init(false);
         }
-        return customComponentList;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.talend.core.model.components.IComponentsFactory#getComponentPath()
-     */
-    public URL getComponentPath() throws IOException {
-        String componentsPath = IComponentsFactory.COMPONENTS_LOCATION;
-        IBrandingService breaningService = (IBrandingService) GlobalServiceRegister.getDefault().getService(
-                IBrandingService.class);
-        if (breaningService.isPoweredOnlyCamel()) {
-            componentsPath = IComponentsFactory.CAMEL_COMPONENTS_LOCATION;
-        }
-        Bundle b = Platform.getBundle(componentsPath);
-        URL url = FileLocator.toFileURL(FileLocator.find(b, new Path(IComponentsFactory.COMPONENTS_INNER_FOLDER), null));
-        return url;
+        return new ArrayList<IComponent>(customComponentList);
     }
 
     /*
@@ -992,6 +768,7 @@ public class ComponentsFactory implements IComponentsFactory {
      * 
      * @see org.talend.core.model.components.IComponentsFactory#getSkeletons()
      */
+    @Override
     public List<String> getSkeletons() {
         if (skeletonList == null) {
             init(false);
@@ -999,22 +776,18 @@ public class ComponentsFactory implements IComponentsFactory {
         return skeletonList;
     }
 
+    @Override
     public void reset() {
-        componentsImageRegistry.clear();
         componentList = null;
         skeletonList = null;
         customComponentList = null;
-        allComponents = null;
-
     }
 
+    @Override
     public void resetCache() {
-        componentsImageRegistry.clear();
         componentList = null;
         skeletonList = null;
         customComponentList = null;
-        allComponents = null;
-        isReset = true;
         if (!CommonsPlugin.isHeadless()) {
             TalendEntryEditPart.resetImageCache();
         }
@@ -1026,6 +799,7 @@ public class ComponentsFactory implements IComponentsFactory {
      * @see org.talend.core.model.components.IComponentsFactory#getFamilyTranslation(IComponent component,
      * java.lang.String)
      */
+    @Override
     public String getFamilyTranslation(Object component, String text) {
         String translated = Messages.getString(text);
 
@@ -1051,156 +825,17 @@ public class ComponentsFactory implements IComponentsFactory {
         return translated;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.talend.core.model.components.IComponentsFactory#getAllComponentsCanBeProvided()
-     */
-    public Map<String, String> getAllComponentsCanBeProvided() {
-        List source = new ArrayList();
-        if (allComponents == null) {
-            allComponents = new HashMap<String, String>();
-            source.add(IComponentsFactory.COMPONENTS_INNER_FOLDER);
-            ComponentsProviderManager componentsProviderManager = ComponentsProviderManager.getInstance();
-            source.addAll(componentsProviderManager.getProviders());
-            for (int i = 0; i < source.size(); i++) {
-                String path = null;
-                AbstractComponentsProvider provider = null;
-                Object object = source.get(i);
-                if (object instanceof String) {
-                    path = (String) object;
-                } else if (object instanceof AbstractComponentsProvider) {
-                    provider = ((AbstractComponentsProvider) object);
-                    path = provider.getComponentsLocation();
-                }
-                if (path != null) {
-                    // **if the components is from provider,should get components from provider path,see bug TDI-18036
-                    File sourceFile = getComponentsLocation(path, provider);
-                    File[] childDirectories;
-
-                    FileFilter fileFilter = new FileFilter() {
-
-                        public boolean accept(final File file) {
-                            return file.isDirectory() && file.getName().charAt(0) != '.'
-                                    && !file.getName().equals(IComponentsFactory.EXTERNAL_COMPONENTS_INNER_FOLDER);
-                        }
-
-                    };
-                    if (sourceFile == null) {
-                        ExceptionHandler.process(new Exception("Component Not Found")); //$NON-NLS-1$
-                        continue;
-                    }
-
-                    childDirectories = sourceFile.listFiles(fileFilter);
-                    if (childDirectories != null) {
-                        for (File currentFolder : childDirectories) {
-                            try {
-                                ComponentFileChecker.checkComponentFolder(currentFolder, getCodeLanguageSuffix());
-                            } catch (BusinessException e) {
-                                continue;
-                            }
-                            File xmlMainFile = new File(currentFolder, ComponentFilesNaming.getInstance().getMainXMLFileName(
-                                    currentFolder.getName(), getCodeLanguageSuffix()));
-                            List<String> families = getComponentsFamilyFromXML(xmlMainFile);
-                            ComponentIconLoading cil = new ComponentIconLoading(componentsImageRegistry, currentFolder);
-                            cil.getImage32();
-                            if (families != null) {
-                                for (String family : families) {
-                                    allComponents.put(family + FAMILY_SPEARATOR + currentFolder.getName(),
-                                            currentFolder.getName() + "_32");
-                                    if (object instanceof AbstractComponentsProvider) {
-                                        if (!componentsAndProvider.containsKey(family)) {
-                                            componentsAndProvider.put(family, (AbstractComponentsProvider) object);
-                                        }
-                                    }
-                                }
-                            }
-
-                        }
-                    }
-                }
-            }
-        }
-
-        return allComponents;
-    }
-
-    private List<String> getComponentsFamilyFromXML(File xmlMainFile) {
-        final DocumentBuilderFactory fabrique = DocumentBuilderFactory.newInstance();
-        final String familysTag = "FAMILIES"; //$NON-NLS-1$
-        final String header = "HEADER"; //$NON-NLS-1$
-        final String technical = "TECHNICAL"; //$NON-NLS-1$
-
-        List<String> familyNames = new ArrayList<String>();
-
-        DocumentBuilder analyseur;
-        try {
-            analyseur = fabrique.newDocumentBuilder();
-            analyseur.setErrorHandler(new ErrorHandler() {
-
-                public void error(final SAXParseException exception) throws SAXException {
-                    throw exception;
-                }
-
-                public void fatalError(final SAXParseException exception) throws SAXException {
-                    throw exception;
-                }
-
-                public void warning(final SAXParseException exception) throws SAXException {
-                    throw exception;
-                }
-
-            });
-
-            Document document = analyseur.parse(xmlMainFile);
-            NodeList elementsByTagName = document.getElementsByTagName(header);
-            String technicalValue = null;
-            if (elementsByTagName != null && elementsByTagName.getLength() > 0) {
-                Node item = elementsByTagName.item(0);
-                NamedNodeMap attributes = item.getAttributes();
-                if (attributes != null) {
-                    Node namedItem = attributes.getNamedItem(technical);
-                    if (namedItem != null) {
-                        technicalValue = namedItem.getNodeValue();
-                    }
-                }
-            }
-            // techenical node are not visible ,so no need to return it's family
-            if (technicalValue == null || !"true".equals(technicalValue)) { //$NON-NLS-1$
-                NodeList element = document.getElementsByTagName(familysTag);
-                if (element != null && element.getLength() > 0) {
-                    Node family = element.item(0);
-                    NodeList childNodes = family.getChildNodes();
-                    for (int i = 0; i < childNodes.getLength(); i++) {
-                        final Node item = childNodes.item(i);
-                        if (item instanceof com.sun.org.apache.xerces.internal.dom.DeferredElementImpl
-                                || item instanceof org.apache.xerces.dom.DeferredElementImpl) {
-                            familyNames.add(item.getTextContent());
-                        }
-                    }
-                }
-            }
-
-        } catch (ParserConfigurationException e) {
-            ExceptionHandler.process(e);
-        } catch (SAXException e) {
-            ExceptionHandler.process(e);
-        } catch (IOException e) {
-            ExceptionHandler.process(e);
-        }
-
-        return familyNames;
-    }
-
     /*
      * (non-Javadoc)
      * 
      * @see org.talend.core.model.components.IComponentsFactory#resetSpecificComponents()
      */
+    @Override
     public void resetSpecificComponents() {
         loadComponentsFromExtensions();
     }
 
+    @Override
     public Map<String, File> getComponentsProvidersFolder() {
         Map<String, File> list = new HashMap<String, File>();
 
@@ -1217,6 +852,7 @@ public class ComponentsFactory implements IComponentsFactory {
         return list;
     }
 
+    @Override
     public Map<String, ImageDescriptor> getComponentsImageRegistry() {
         return componentsImageRegistry;
     }

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;
@@ -48,6 +50,7 @@ public class UserComponentsProvider extends AbstractComponentsProvider {
     public UserComponentsProvider() {
     }
 
+    @Override
     protected File getExternalComponentsLocation() {
         IPreferenceStore prefStore = CodeGeneratorActivator.getDefault().getPreferenceStore();
         String path = prefStore.getString(IComponentPreferenceConstant.USER_COMPONENTS_FOLDER);
@@ -75,6 +78,7 @@ public class UserComponentsProvider extends AbstractComponentsProvider {
         return path.toString();
     }
 
+    @Override
     public void preComponentsLoad() throws IOException {
         File installationFolder = getInstallationFolder();
         if (installationFolder.exists()) {
@@ -83,8 +87,9 @@ public class UserComponentsProvider extends AbstractComponentsProvider {
         FilesUtils.createFoldersIfNotExists(installationFolder.getAbsolutePath(), false);
         FileFilter ff = new FileFilter() {
 
+            @Override
             public boolean accept(File pathname) {
-                if (pathname.getName().equals(".svn")) {
+                if (FilesUtils.isSVNFolder(pathname)) {
                     return false;
                 }
                 return true;
@@ -94,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.codegen/src/main/java/org/talend/designer/codegen/components/model/XsdValidationCacheManager.java

@@ -80,20 +80,14 @@ public class XsdValidationCacheManager {
 
     public boolean needCheck(java.io.File file, long currentCRC) {
         String path = file.getAbsolutePath();
-        if (forceXSDAlreadyChecked) {
-            alreadyCheckedXsd.put(path, currentCRC);
-            return false;
-        } else {
-            Long lastCheckedCRC = alreadyCheckedXsd.get(path);
+        Long lastCheckedCRC = alreadyCheckedXsd.get(path);
 
-            if (lastCheckedCRC == null) {
-                return true;
-            }
-
-            boolean isChanged = currentCRC != lastCheckedCRC;
-
-            return isChanged;
+        if (lastCheckedCRC == null) {
+            return true;
         }
+
+        boolean isChanged = currentCRC != lastCheckedCRC;
+        return isChanged;
     }
 
     public void setChecked(File file, long currentCRC) {

org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/components/ui/ComponentsPreferencePage.java

@@ -87,6 +87,7 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
         /**
          * @see org.eclipse.jface.preference.FieldEditor#refreshValidState()
          */
+        @Override
         protected void refreshValidState() {
             super.refreshValidState();
         }
@@ -95,6 +96,7 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
          * Clears the error message from the message line if the error message is the error message from this field
          * editor.
          */
+        @Override
         protected void clearErrorMessage() {
             if (canClearErrorMessage()) {
                 super.clearErrorMessage();
@@ -122,6 +124,7 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
         addField(dbTypeField);
     }
 
+    @Override
     public void propertyChange(PropertyChangeEvent event) {
 
         if (event.getSource() == filePathTemp) {
@@ -242,6 +245,7 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
         addField(doNotShowJobletAfterDoubleClickCheckBoxField);
     }
 
+    @Override
     public void createFieldEditors() {
         final Composite parent = getFieldEditorParent();
         filePathTemp = new DirectoryFieldEditor(IComponentPreferenceConstant.USER_COMPONENTS_FOLDER,
@@ -253,10 +257,11 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
 
             String oldPath = getPreferenceStore().getString(IComponentPreferenceConstant.USER_COMPONENTS_FOLDER);
 
+            @Override
             public void modifyText(ModifyEvent e) {
                 String newPath = filePathTemp.getTextControl(parent).getText();
                 File file = new File(newPath);
-                if (!file.exists()) {
+                if (!file.exists() && !"".equals(newPath)) {
                     // getPreferenceStore().setValue(IComponentPreferenceConstant.USER_COMPONENTS_FOLDER, "");
                     filePathTemp.showErrorMessage();
                     setValid(false);
@@ -287,6 +292,7 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
 
     }
 
+    @Override
     public void init(IWorkbench workbench) {
     }
 
@@ -299,6 +305,7 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
 
             final IRunnableWithProgress runnable = new IRunnableWithProgress() {
 
+                @Override
                 public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
                     monitor.beginTask("Loading user component ......", 100);
                     Display display = Display.getCurrent();
@@ -308,6 +315,7 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
                     if (display != null) {
                         display.syncExec(new Runnable() {
 
+                            @Override
                             public void run() {
                                 IComponentsFactory components = ComponentsFactoryProvider.getInstance();
 

org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/config/CodeGeneratorProgressMonitor.java

@@ -19,6 +19,9 @@ import org.eclipse.core.runtime.ProgressMonitorWrapper;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.SWTException;
 import org.eclipse.swt.widgets.Display;
+import org.talend.commons.ui.gmf.util.DisplayUtils;
+import org.talend.commons.ui.runtime.CommonUIPlugin;
+import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 
 /**
  * DOC mhirt class global comment. Detailled comment <br/>
@@ -72,7 +75,19 @@ public class CodeGeneratorProgressMonitor extends ProgressMonitorWrapper impleme
      * @see org.eclipse.core.runtime.IProgressMonitorWithBlocking#clearBlocked()
      */
     public void clearBlocked() {
-        Dialog.getBlockedHandler().clearBlocked();
+    	 if (CommonUIPlugin.isFullyHeadless()) {
+             return;
+         }
+         final Display disp = DisplayUtils.getDisplay();
+
+         disp.syncExec(new Runnable() {
+
+             @Override
+             public void run() {
+                 Dialog.getBlockedHandler().clearBlocked();
+             }
+
+         });
     }
 
     /**
@@ -140,8 +155,20 @@ public class CodeGeneratorProgressMonitor extends ProgressMonitorWrapper impleme
      * 
      * @see org.eclipse.core.runtime.IProgressMonitorWithBlocking#setBlocked(org.eclipse.core.runtime.IStatus)
      */
-    public void setBlocked(IStatus reason) {
-        Dialog.getBlockedHandler().showBlocked(this, reason, taskName);
+    public void setBlocked(final IStatus reason) {
+    	if (CommonUIPlugin.isFullyHeadless()) {
+            return;
+        }
+        final Display disp = DisplayUtils.getDisplay();
+
+        disp.syncExec(new Runnable() {
+
+            @Override
+            public void run() {
+                Dialog.getBlockedHandler().showBlocked(CodeGeneratorProgressMonitor.this, reason, taskName);
+            }
+
+        });
     }
 
     /**

org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/config/NodesTree.java

@@ -111,7 +111,7 @@ public class NodesTree {
 
         for (INode node : nodes) {
             String componentName = node.getComponent().getName();
-            if ((node.isStart()) && (node.isActivate()) && (!componentName.equals("tPrejob")) //$NON-NLS-1$
+            if ((node.isStart()) && (node.isActivate()) &&  node.isDesignSubjobStartNode() && !node.isThereLinkWithHash() && (!componentName.equals("tPrejob")) //$NON-NLS-1$
                     && (!componentName.equals("tPostjob"))) { //$NON-NLS-1$
                 rootNodes.add(node);
             }

org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/config/TalendJetEmitter.java

@@ -14,6 +14,7 @@ package org.talend.designer.codegen.config;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
 import java.io.File;
 import java.io.InputStream;
 import java.lang.reflect.Method;
@@ -27,7 +28,6 @@ import java.util.StringTokenizer;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.log4j.Logger;
-import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IMarker;
@@ -52,12 +52,10 @@ import org.eclipse.emf.common.util.Monitor;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaModel;
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.talend.commons.debug.TalendDebugHandler;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
-import org.talend.core.model.components.ComponentCompilations;
 import org.talend.designer.codegen.i18n.Messages;
 
 /**
@@ -184,21 +182,17 @@ public class TalendJetEmitter extends JETEmitter {
                     project.create(new SubProgressMonitor(progressMonitor, 1));
                     progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETCreatingProject_message", //$NON-NLS-1$
                             new Object[] { project.getName() }));
-                    IProjectDescription description = workspace.newProjectDescription(project.getName());
-                    description.setNatureIds(new String[] { JavaCore.NATURE_ID });
-                    description.setLocation(null);
-                    project.open(new SubProgressMonitor(progressMonitor, 1));
-                    project.setDescription(description, new SubProgressMonitor(progressMonitor, 1));
-                } else {
-                    project.open(new SubProgressMonitor(progressMonitor, 5));
-                    IProjectDescription description = project.getDescription();
-                    // only in case it's one old workspace and got no nature defined.
-                    if (!ArrayUtils.contains(description.getNatureIds(), JavaCore.NATURE_ID)) {
-                        description.setNatureIds(new String[] { JavaCore.NATURE_ID });
-                        project.setDescription(description, new SubProgressMonitor(progressMonitor, 1));
-                    }
                 }
-
+                if (!project.isOpen()) {
+                    project.open(new SubProgressMonitor(progressMonitor, 5));
+                    project.refreshLocal(IResource.DEPTH_INFINITE, new SubProgressMonitor(progressMonitor, 1));
+                }
+                IProjectDescription description = project.getDescription();
+                // only in case it's one old workspace and got no nature defined.
+                if (!ArrayUtils.contains(description.getNatureIds(), JavaCore.NATURE_ID)) {
+                    description.setNatureIds(new String[] { JavaCore.NATURE_ID });
+                    project.setDescription(description, new SubProgressMonitor(progressMonitor, 1));
+                }
                 javaProject = JavaCore.create(project);
 
                 progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETInitializingProject_message", //$NON-NLS-1$
@@ -300,93 +294,107 @@ public class TalendJetEmitter extends JETEmitter {
 
                 progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETOpeningJavaProject_message", //$NON-NLS-1$
                         new Object[] { project.getName() }));
-                // javaProject.open(new SubProgressMonitor(progressMonitor, 1));
-
-                IPackageFragmentRoot[] packageFragmentRoots = javaProject.getPackageFragmentRoots();
-                IPackageFragmentRoot sourcePackageFragmentRoot = null;
-                for (int j = 0; j < packageFragmentRoots.length; ++j) {
-                    IPackageFragmentRoot packageFragmentRoot = packageFragmentRoots[j];
-                    if (packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE) {
-                        sourcePackageFragmentRoot = packageFragmentRoot;
-                        break;
-                    }
-                }
 
                 String packageName = jetCompiler.getSkeleton().getPackageName();
                 StringTokenizer stringTokenizer = new StringTokenizer(packageName, "."); //$NON-NLS-1$
                 IProgressMonitor subProgressMonitor = new SubProgressMonitor(progressMonitor, 1);
                 subProgressMonitor.beginTask("", stringTokenizer.countTokens() + 4); //$NON-NLS-1$
                 subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_CreateTargetFile_message")); //$NON-NLS-1$
-                IContainer sourceContainer = (IContainer) sourcePackageFragmentRoot.getCorrespondingResource();
+                IFolder sourceContainer = project.getFolder("src");
+
                 while (stringTokenizer.hasMoreElements()) {
                     String folderName = stringTokenizer.nextToken();
                     sourceContainer = sourceContainer.getFolder(new Path(folderName));
                     if (!sourceContainer.exists()) {
                         try {
-                            ((IFolder) sourceContainer).create(true, true, new SubProgressMonitor(subProgressMonitor, 1));
+                            sourceContainer.create(true, true, new SubProgressMonitor(subProgressMonitor, 1));
                         } catch (Exception e) {
-                            // e.printStackTrace();
                             ExceptionHandler.process(e);
                         }
                     }
                 }
+                boolean needRebuild = true;
                 IFile targetFile = sourceContainer.getFile(new Path(jetCompiler.getSkeleton().getClassName() + ".java")); //$NON-NLS-1$
                 if (!targetFile.exists()) {
                     subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETCreating_message", //$NON-NLS-1$
                             new Object[] { targetFile.getFullPath() }));
                     targetFile.create(contents, true, new SubProgressMonitor(subProgressMonitor, 1));
                 } else {
-                    subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETUpdating_message", //$NON-NLS-1$
-                            new Object[] { targetFile.getFullPath() }));
-                    targetFile.setContents(contents, true, true, new SubProgressMonitor(subProgressMonitor, 1));
-                }
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
-                subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETBuilding_message", //$NON-NLS-1$
-                        new Object[] { project.getName() }));
+                    DataInputStream dis = new DataInputStream(targetFile.getContents());
+                    int len = 0;
+                    byte[] buf = new byte[1024];
+                    while (((len = dis.read(buf))) != -1) {
+                        baos.write(buf, 0, len);
+                    }
+                    dis.close();
 
-                if (!ComponentCompilations.getMarkers()) {
-                    project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new SubProgressMonitor(subProgressMonitor, 1));
-                }
-
-                IMarker[] markers = targetFile.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
-                boolean errors = false;
-                for (int i = 0; i < markers.length; ++i) {
-                    IMarker marker = markers[i];
-                    if (marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO) == IMarker.SEVERITY_ERROR) {
-                        errors = true;
-                        subProgressMonitor.subTask(marker.getAttribute(IMarker.MESSAGE) + " : " //$NON-NLS-1$
-                                + (CodeGenPlugin.getPlugin().getString("jet.mark.file.line", new Object[] { //$NON-NLS-1$
-                                        targetFile.getLocation(), marker.getAttribute(IMarker.LINE_NUMBER) })));
-                        log.error(jetEmitter.templateURI.substring(jetEmitter.templateURI.lastIndexOf("/") + 1) //$NON-NLS-1$
-                                + Messages.getString(
-                                        "TalendJetEmitter.compileFail", //$NON-NLS-1$
-                                        marker.getAttribute(IMarker.MESSAGE),
-                                        (CodeGenPlugin.getPlugin().getString("jet.mark.file.line", new Object[] { //$NON-NLS-1$
-                                                targetFile.getLocation(), marker.getAttribute(IMarker.LINE_NUMBER) }))));
+                    String currentContent = baos.toString();
+                    String newContent = outputStream.toString();
+                    // since the build is done on linux, if use windows, it will use different rules for \r + \n
+                    // so compare without \r, at least to see if original string is the same
+                    // if yes, consider all is ok, no need to replace the content and recompile
+                    currentContent = currentContent.replace("\r", ""); //$NON-NLS-1$//$NON-NLS-2$ 
+                    newContent = newContent.replace("\r", ""); //$NON-NLS-1$//$NON-NLS-2$ 
+                    if (!newContent.equals(currentContent)) {
+                        subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETUpdating_message", //$NON-NLS-1$
+                                new Object[] { targetFile.getFullPath() }));
+                        targetFile.setContents(contents, true, true, new SubProgressMonitor(subProgressMonitor, 1));
+                    } else {
+                        needRebuild = false;
                     }
                 }
 
-                if (!errors) {
-                    subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETLoadingClass_message", //$NON-NLS-1$
-                            new Object[] { jetCompiler.getSkeleton().getClassName() + ".class" })); //$NON-NLS-1$
+                // if jetEmitter.getMethod() == null, means the class file doesn't exist anymore
+                // it should be impossible to have only the class file deleted and the .java never modified, but still
+                // handle this case.
+                if (needRebuild || jetEmitter.getMethod() == null) {
+                    subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETBuilding_message", //$NON-NLS-1$
+                            new Object[] { project.getName() }));
 
-                    // Construct a proper URL for relative lookup.
-                    //
-                    URL url = new File(project.getLocation() + "/" + javaProject.getOutputLocation().removeFirstSegments(1) + "/") //$NON-NLS-1$ //$NON-NLS-2$
-                            .toURL();
-                    URLClassLoader theClassLoader = new URLClassLoader(new URL[] { url }, jetEmitter.classLoader);
-                    Class theClass = theClassLoader.loadClass((packageName.length() == 0 ? "" : packageName + ".") //$NON-NLS-1$ //$NON-NLS-2$
-                            + jetCompiler.getSkeleton().getClassName());
-                    String methodName = jetCompiler.getSkeleton().getMethodName();
-                    Method[] methods = theClass.getDeclaredMethods();
-                    for (int i = 0; i < methods.length; ++i) {
-                        if (methods[i].getName().equals(methodName)) {
-                            jetEmitter.setMethod(methods[i]);
-                            break;
+                    project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new SubProgressMonitor(subProgressMonitor, 1));
+
+                    IMarker[] markers = targetFile.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
+                    boolean errors = false;
+                    for (int i = 0; i < markers.length; ++i) {
+                        IMarker marker = markers[i];
+                        if (marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO) == IMarker.SEVERITY_ERROR) {
+                            errors = true;
+                            subProgressMonitor.subTask(marker.getAttribute(IMarker.MESSAGE) + " : " //$NON-NLS-1$
+                                    + (CodeGenPlugin.getPlugin().getString("jet.mark.file.line", new Object[] { //$NON-NLS-1$
+                                            targetFile.getLocation(), marker.getAttribute(IMarker.LINE_NUMBER) })));
+                            log.error(jetEmitter.templateURI.substring(jetEmitter.templateURI.lastIndexOf("/") + 1) //$NON-NLS-1$
+                                    + Messages.getString(
+                                            "TalendJetEmitter.compileFail", //$NON-NLS-1$
+                                            marker.getAttribute(IMarker.MESSAGE),
+                                            (CodeGenPlugin.getPlugin().getString("jet.mark.file.line", new Object[] { //$NON-NLS-1$
+                                                    targetFile.getLocation(), marker.getAttribute(IMarker.LINE_NUMBER) }))));
+                        }
+                    }
+
+                    if (!errors) {
+                        subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETLoadingClass_message", //$NON-NLS-1$
+                                new Object[] { jetCompiler.getSkeleton().getClassName() + ".class" })); //$NON-NLS-1$
+
+                        // Construct a proper URL for relative lookup.
+                        //
+                        URL url = new File(project.getLocation()
+                                + "/" + javaProject.getOutputLocation().removeFirstSegments(1) + "/") //$NON-NLS-1$ //$NON-NLS-2$
+                                .toURL();
+                        URLClassLoader theClassLoader = new URLClassLoader(new URL[] { url }, jetEmitter.classLoader);
+                        Class theClass = theClassLoader.loadClass((packageName.length() == 0 ? "" : packageName + ".") //$NON-NLS-1$ //$NON-NLS-2$
+                                + jetCompiler.getSkeleton().getClassName());
+                        String methodName = jetCompiler.getSkeleton().getMethodName();
+                        Method[] methods = theClass.getDeclaredMethods();
+                        for (int i = 0; i < methods.length; ++i) {
+                            if (methods[i].getName().equals(methodName)) {
+                                jetEmitter.setMethod(methods[i]);
+                                break;
+                            }
                         }
                     }
                 }
-
                 subProgressMonitor.done();
             } catch (CoreException exception) {
                 TalendDebugHandler.debug(exception);

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

@@ -24,8 +24,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -37,14 +40,17 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.emf.codegen.CodeGenPlugin;
 import org.eclipse.emf.codegen.jet.JETEmitter;
 import org.eclipse.emf.codegen.jet.JETException;
 import org.eclipse.emf.common.CommonPlugin;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Display;
 import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.BusinessException;
+import org.talend.commons.ui.runtime.CommonUIPlugin;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.utils.StringUtils;
 import org.talend.commons.utils.io.IOUtils;
@@ -105,6 +111,8 @@ public final class CodeGeneratorEmittersPoolFactory {
     private static IStatus status = null;
 
     private static DelegateProgressMonitor delegateMonitor = new DelegateProgressMonitor();
+    
+    public static final String JET_PROJECT = ".JETEmitters"; //$NON-NLS-1$
 
     /***/
     private static class JobRunnable extends Thread {
@@ -114,6 +122,7 @@ public final class CodeGeneratorEmittersPoolFactory {
             initializeStart = true;
         }
 
+        @Override
         public void run() {
             status = doRun();
         }
@@ -125,17 +134,19 @@ public final class CodeGeneratorEmittersPoolFactory {
                 TimeMeasure.measureActive = CommonsPlugin.isDebugMode();
 
                 TimeMeasure.begin("initialize Jet Emitters");
-                ComponentsFactoryProvider.saveComponentVisibilityStatus();
 
                 jetFilesCompileFail.clear();
 
                 IProgressMonitor monitorWrap = null;
-                if (!CommonsPlugin.isHeadless()) {
+                boolean headless = CommonUIPlugin.isFullyHeadless();
+                if (!headless) {
                     monitorWrap = new CodeGeneratorProgressMonitor(delegateMonitor);
                 } else {
                     monitorWrap = new NullProgressMonitor();
-                }
+                }                
                 ECodeLanguage codeLanguage = LanguageManager.getCurrentLanguage();
+                
+                initializeJetEmittersProject(monitorWrap);
 
                 CodeGeneratorInternalTemplatesFactory templatesFactory = CodeGeneratorInternalTemplatesFactoryProvider
                         .getInstance();
@@ -143,8 +154,6 @@ public final class CodeGeneratorEmittersPoolFactory {
                 templatesFactory.init();
 
                 IComponentsFactory componentsFactory = ComponentsFactoryProvider.getInstance();
-                // do not call init because it may be already loaded by
-                // ComponentsFactoryProvider.saveComponentVisibilityStatus
                 componentsFactory.getComponents();
 
                 long startTime = System.currentTimeMillis();
@@ -174,11 +183,9 @@ public final class CodeGeneratorEmittersPoolFactory {
                 if (components != null) {
                     ECodePart codePart = ECodePart.MAIN;
                     for (IComponent component : new ArrayList<IComponent>(components)) {
-                        // if (component.isTechnical() || component.isVisible()) {
                         if (component.getAvailableCodeParts().size() > 0) {
                             initComponent(codeLanguage, jetBeans, codePart, component);
                         }
-                        // }
                         monitorBuffer++;
                         if (monitorBuffer % 100 == 0) {
                             monitorWrap.worked(100);
@@ -194,6 +201,7 @@ public final class CodeGeneratorEmittersPoolFactory {
                 if (!CommonsPlugin.isHeadless()) {
                     Display.getDefault().asyncExec(new Runnable() {
 
+                        @Override
                         public void run() {
                             CorePlugin.getDefault().getDesignerCoreService()
                                     .synchronizeDesignerUI(new PropertyChangeEvent(this, ComponentUtilities.NORMAL, null, null));
@@ -245,6 +253,42 @@ public final class CodeGeneratorEmittersPoolFactory {
             CorePlugin.getDefault().getRcpService().activeSwitchProjectAction();
             return Status.OK_STATUS;
         }
+        
+        private void initializeJetEmittersProject(final IProgressMonitor progressMonitor) throws CoreException {
+				final IWorkspace workspace = ResourcesPlugin.getWorkspace();
+
+	            IProject project = workspace.getRoot().getProject(JET_PROJECT);
+	            progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETPreparingProject_message", //$NON-NLS-1$
+	                    new Object[] { project.getName() }));
+	            File file = new File(workspace.getRoot().getLocation().append(JET_PROJECT).toPortableString());
+	            if (file.exists() && !project.isAccessible()) {
+	                // .metadata missing, so need to reimport project to add it in the metadata.
+	                progressMonitor.subTask("Reinitilializing project " + project.getName()); //$NON-NLS-1$
+	                project.create(new SubProgressMonitor(progressMonitor, 1));
+	                progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETCreatingProject_message", //$NON-NLS-1$
+	                        new Object[] { project.getName() }));
+	            } else if (!project.isAccessible()) {
+	                // project was deleted manually on the disk. The delete here will remove infos from metadata
+	                // then we'll be able to create a new clean project.
+	                project.delete(true, progressMonitor);
+	            }
+	            if (!project.exists()) {
+	                progressMonitor.subTask("JET creating project " + project.getName()); //$NON-NLS-1$
+	                project.create(new SubProgressMonitor(progressMonitor, 1));
+	                progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETCreatingProject_message", //$NON-NLS-1$
+	                        new Object[] { project.getName() }));
+	            }
+	            if (!project.isOpen()) {
+	                project.open(new SubProgressMonitor(progressMonitor, 5));
+	                project.refreshLocal(IResource.DEPTH_INFINITE, new SubProgressMonitor(progressMonitor, 1));
+	            }
+	            IProjectDescription description = project.getDescription();
+	            // only in case it's one old workspace and got no nature defined.
+	            if (!ArrayUtils.contains(description.getNatureIds(), JavaCore.NATURE_ID)) {
+	                description.setNatureIds(new String[] { JavaCore.NATURE_ID });
+	                project.setDescription(description, new SubProgressMonitor(progressMonitor, 1));
+	            }
+        }
 
     };
 
@@ -462,6 +506,7 @@ public final class CodeGeneratorEmittersPoolFactory {
                     if (!CommonsPlugin.isHeadless()) {
                         Display.getDefault().syncExec(new Runnable() {
 
+                            @Override
                             public void run() {
                                 MessageDialog.openError(Display.getDefault().getActiveShell(),
                                         Messages.getString("CodeGeneratorEmittersPoolFactory.operationCanceled"), //$NON-NLS-1$
@@ -620,11 +665,16 @@ public final class CodeGeneratorEmittersPoolFactory {
         } catch (Error e) {
             throw new ClassNotFoundException(e.getMessage(), e);
         }
-        Method[] methods = theClass.getDeclaredMethods();
-        for (int i = 0; i < methods.length; ++i) {
-            if (methods[i].getName().equals(methodName)) {
-                return methods[i];
+        // TDI-23079
+        try {
+            Method[] methods = theClass.getDeclaredMethods();
+            for (int i = 0; i < methods.length; ++i) {
+                if (methods[i].getName().equals(methodName)) {
+                    return methods[i];
+                }
             }
+        } catch (Exception e) {
+            return null;
         }
         return null;
     }
@@ -701,24 +751,28 @@ public final class CodeGeneratorEmittersPoolFactory {
             delegates.clear();
         }
 
+        @Override
         public void beginTask(String name, int totalWork) {
             for (IProgressMonitor delegate : delegates) {
                 delegate.beginTask(name, totalWork);
             }
         }
 
+        @Override
         public void done() {
             for (IProgressMonitor delegate : delegates) {
                 delegate.done();
             }
         }
 
+        @Override
         public void internalWorked(double work) {
             for (IProgressMonitor delegate : delegates) {
                 delegate.internalWorked(work);
             }
         }
 
+        @Override
         public boolean isCanceled() {
             for (IProgressMonitor monitor : delegates) {
                 if (monitor.isCanceled()) {
@@ -728,22 +782,26 @@ public final class CodeGeneratorEmittersPoolFactory {
             return cancelled;
         }
 
+        @Override
         public void setCanceled(boolean cancelled) {
             this.cancelled = cancelled;
         }
 
+        @Override
         public void setTaskName(String name) {
             for (IProgressMonitor delegate : delegates) {
                 delegate.setTaskName(name);
             }
         }
 
+        @Override
         public void subTask(String name) {
             for (IProgressMonitor delegate : delegates) {
                 delegate.subTask(name);
             }
         }
 
+        @Override
         public void worked(int work) {
             for (IProgressMonitor delegate : delegates) {
                 delegate.worked(work);

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

@@ -0,0 +1 @@
+RefreshComponenentsAction.Label=Componentenlijst verversen

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

@@ -0,0 +1,3 @@
+Exchange=Training
+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_es.properties

@@ -1,5 +1,6 @@
 AvailableExtensionsComposite.ViewDetail.installOperateStatus=Instalar
 AvailableExtensionsComposite.ViewDetail.WriteReview=Escribir un comentario
+DownloadedExtensionsComposite.installOperateStatus=Instalar
 MyExtensionsComposite.ModifyOperateStatus=Modificar
 MyExtensionsComposite.DeleteOperateStatus=Borrar
 MyExtensionsComposite.Form.Description=Descripción

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

@@ -1,17 +1,21 @@
 ExchangeView.Exchange=Exchange
 AvailableExtensionsComposite.ExtensionName=Nom de l'extension
 AvailableExtensionsComposite.Version=Version
+AvailableExtensionsComposite.Rating=Note
 AvailableExtensionsComposite.Author=Auteur
+AvailableExtensionsComposite.FilterTitle=Filtre
 AvailableExtensionsComposite.ViewDetail.installOperateStatus=Installer
 AvailableExtensionsComposite.ViewDetail.WriteReview=Donnez votre avis
 AvailableExtensionsComposite.ViewDetail.InsertionReviewFailureTip=Veuillez vérifier.
 DownloadedExtensionsComposite.DownloadedVersion=Version téléchargée
 DownloadedExtensionsComposite.DownloadDate=Date de téléchargement
 DownloadedExtensionsComposite.installedOperateStatus=Installé
-DownloadedExtensionsComposite.updateOperateStatus=Mettre à jour
+DownloadedExtensionsComposite.updateOperateStatus=UPDATE
+MyExtensionsComposite.Version=Version
 MyExtensionsComposite.UploadDate=Date du chargement
 MyExtensionsComposite.AddNewExtensionTitle=Ajouter une nouvelle extension
 MyExtensionsComposite.UpLoadNewVersionOperateStatus=Charger une nouvelle version
+MyExtensionsComposite.UpdateOperateStatus=UPDATE
 MyExtensionsComposite.ModifyOperateStatus=Modifier
 MyExtensionsComposite.DeleteOperateStatus=DELETE
 MyExtensionsComposite.Form.Return=Retourner
@@ -19,6 +23,7 @@ MyExtensionsComposite.Form.ExtensionTitle=Titre de l'extension
 MyExtensionsComposite.Form.InitialVersion=Version initiale
 MyExtensionsComposite.Form.Compatibility=Compatibilité
 MyExtensionsComposite.Form.Compatibility.AllVersions=Toutes les versions
+MyExtensionsComposite.Form.Compatibility.Version=Version
 MyExtensionsComposite.Form.Compatibility.AllVersionsExcept=Toutes les versions sauf :
 MyExtensionsComposite.Form.Compatibility.OnlyTheseVersions=Uniquement ces versions :
 MyExtensionsComposite.Form.Description=Description

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

@@ -4,5 +4,6 @@ MyExtensionsComposite.Version=Verzija
 MyExtensionsComposite.UpdateOperateStatus=A\u017Euriraj
 MyExtensionsComposite.DeleteOperateStatus=Obri\u0161i
 MyExtensionsComposite.Form.Compatibility.Version=Verzija
+MyExtensionsComposite.Form.Description=Opis
 ImportExchangeDialog.WARNING=Upozorenje
 ImportExchangeDialog.REFRESH_BUTTON=Osvje\u017Ei

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

@@ -2,13 +2,19 @@ AvailableExtensionsComposite.Version=Versione
 AvailableExtensionsComposite.Author=Autore
 AvailableExtensionsComposite.FilterTitle=Filtro
 DownloadedExtensionsComposite.installedOperateStatus=Installato
+DownloadedExtensionsComposite.updateOperateStatus=Aggiornato
 MyExtensionsComposite.Version=Versione
+MyExtensionsComposite.UpdateOperateStatus=Aggiornato
 MyExtensionsComposite.DeleteOperateStatus=Cancellare
 MyExtensionsComposite.Form.Compatibility.Version=Versione
 MyExtensionsComposite.Form.Description=Descrizione
+MyExtensionsComposite.Form.Upload=Carica
+MyExtensionsComposite.Form.Upload.Browse=Naviga...
 ImportExchangeDialog.dialogTitle=Seleziona oggetto da Talend Exchange
 ImportExchangeDialog.WARNING=Avvertimento
 ImportExchangeDialog.LATEST_REVISION=Ultima Revisione
 ImportExchangeDialog.EXTENSION_DESCRIPTION=Descrizione estensione
+ImportExchangeDialog.JOB_BUTTON=Progetti job
 ImportExchangeDialog.DOWNLOAD_JOB=Scarica alcuni Job Designs...
+ImportExchangeDialog.ROUTINES_BUTTON=Routine
 ImportExchangeDialog.REFRESH_BUTTON=Aggiorna

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

@@ -1 +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_sr.properties

@@ -1,5 +1,4 @@
 DownloadedExtensionsComposite.updateOperateStatus=UPDATE
 MyExtensionsComposite.UpdateOperateStatus=UPDATE
-MyExtensionsComposite.DeleteOperateStatus=DELETE
 ImportExchangeDialog.TEMPLATES_BUTTON=SQL \u0161abloni
 ImportExchangeDialog.REFRESH_BUTTON=Osve\u017Eavanje

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

@@ -2,3 +2,4 @@ AvailableExtensionsComposite.Version=Versiyon
 MyExtensionsComposite.Version=Versiyon
 MyExtensionsComposite.DeleteOperateStatus=Sil
 MyExtensionsComposite.Form.Compatibility.Version=Versiyon
+MyExtensionsComposite.Form.Description=Aç\u0131klama

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

@@ -0,0 +1,27 @@
+ExchangeView.Exchange=Training
+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=\u4E0A\u4F20
+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/content/exchange_all.html

@@ -80,6 +80,24 @@
 					checkedType = "only"
 					filtervalue = document.getElementById(checkedType).value;
 				}
+				
+				<!-- validate the createNewExtension text  start-->
+				var labelValidate = document.getElementById("extension_label").value;
+				var lastVersionAvailableValidate = document.getElementById("lastVersionAvailable").value;
+				var filename = document.getElementById("filename").value;
+				if(labelValidate==0){  
+        			alert("Extension Title is empty");  
+    			}else if(labelValidate=="null"){  
+        			alert("Extension Title can not be null");  
+    			}else if(lastVersionAvailableValidate==0){  
+        			alert("Initial Version is empty");  
+    			}else if(lastVersionAvailableValidate=="null"){  
+        			alert("Initial Version can not be null");  
+    			}else if(filename==0){
+    				alert("Please input a vaild File path");  
+    			}
+    			
+    			<!-- validate the createNewExtension text  end-->
 			
 				var listVersionCompatibles = "listVersionCompatibles:" + "'" + checkedType + "'";
 				var filter = "filter:" + "'" + filtervalue + "'";
@@ -116,6 +134,15 @@
 					checkedType = "only"
 					filtervalue = document.getElementById(checkedType + "_update").value;
 				}
+				
+				<!-- validate the updateExtension text  start-->
+				var lastVersionAvailable_updateValidate = document.getElementById("lastVersionAvailable_update").value;
+				if(lastVersionAvailable_updateValidate==0){  
+        			alert("New Version is empty");  
+    			}else if(lastVersionAvailable_updateValidate=="null"){  
+        			alert("New Version can not be null");  
+    			}
+    			<!-- validate the updateExtension text  end-->
 			
 				var listVersionCompatibles = "listVersionCompatibles:" + "'" + checkedType + "'";
 				var filter = "filter:" + "'" + filtervalue + "'";

org.talend.designer.components.exchange/src/main/java/org/talend/designer/components/exchange/ExchangeComponentsProvider.java

@@ -75,14 +75,16 @@ public class ExchangeComponentsProvider extends AbstractComponentsProvider {
     private void copyFolder(File externalComponentsLocation, File installFolder) throws IOException {
         FileFilter folderFilter = new FileFilter() {
 
+            @Override
             public boolean accept(File file) {
                 return file.isDirectory();
             }
         };
         FileFilter ff = new FileFilter() {
 
+            @Override
             public boolean accept(File pathname) {
-                if (pathname.getName().equals(".svn")) {
+                if (FilesUtils.isSVNFolder(pathname)) {
                     return false;
                 }
                 return true;