- TESB-10298: fixed. condition simplified

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

org.talend.componentdesigner.nl/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

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

@@ -46,6 +46,7 @@ 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.rcp.nl/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

org.talend.componentdesigner.rcp/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

org.talend.componentdesigner/META-INF/MANIFEST.MF

@@ -15,6 +15,7 @@ Require-Bundle: org.talend.model,
  org.apache.log4j,
  org.eclipse.jet.editor,
  org.talend.core,
+ org.talend.core.ui,
  org.talend.designer.components.localprovider,
  org.eclipse.jdt.core,
  org.eclipse.xsd,
@@ -28,3 +29,4 @@ Export-Package: org.talend.componentdesigner,
  org.talend.componentdesigner.manager,
  org.talend.componentdesigner.ui
 Bundle-ClassPath: .
+Bundle-Vendor: .Talend SA.

org.talend.componentdesigner/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

org.talend.componentdesigner/plugin.xml

@@ -99,7 +99,7 @@
 				<contentExtension
 					pattern="org.talend.componentdesigner.resourceContent" />
 				<contentExtension
-					pattern="org.eclipse.ui.navigator.resources.filters.*" />
+					pattern="org.talend.componentdesigner.ui.navigator.resources.filters.*" />
 			</includes>
 		</viewerContentBinding>
 		<viewerActionBinding
@@ -267,7 +267,7 @@
 			</filterExpression>
 			</commonFilter> -->
 		<commonFilter
-			id="org.eclipse.ui.navigator.resources.filters.nonComponentProject"
+			id="org.talend.componentdesigner.ui.navigator.resources.filters.nonComponentProject"
 			name="nonComponentProject" description="not the component project"
 			activeByDefault="true">
 			<filterExpression>

org.talend.componentdesigner/src/org/talend/componentdesigner/manager/ComponentProjectManager.java

@@ -260,7 +260,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/PushToPaletteActionProvider.java

@@ -34,6 +34,11 @@ import org.talend.componentdesigner.i18n.internal.Messages;
 import org.talend.componentdesigner.util.XSDValidator;
 import org.talend.componentdesigner.util.file.FileCopy;
 import org.talend.core.CorePlugin;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.model.components.IComponent;
+import org.talend.core.model.components.IComponentsFactory;
+import org.talend.core.service.IComponentsLocalProviderService;
+import org.talend.repository.model.ComponentsFactoryProvider;
 
 /**
  * DOC slanglois class global comment. Detailled comment
@@ -49,6 +54,7 @@ public class PushToPaletteActionProvider extends CommonActionProvider {
      * 
      * @see org.eclipse.ui.navigator.CommonActionProvider#init(org.eclipse.ui.navigator.ICommonActionExtensionSite)
      */
+    @Override
     public void init(ICommonActionExtensionSite anExtensionSite) {
 
         if (anExtensionSite.getViewSite() instanceof ICommonViewerWorkbenchSite) {
@@ -59,6 +65,7 @@ public class PushToPaletteActionProvider extends CommonActionProvider {
     /**
      * Adds a submenu to the given menu with the name "New Component".
      */
+    @Override
     public void fillContextMenu(IMenuManager menu) {
         menu.insertBefore("group.edit", copyProjectAction); //$NON-NLS-1$
         // Object obj = ((TreeSelection) this.getContext().getSelection()).getFirstElement();// need to get all
@@ -86,9 +93,16 @@ public class PushToPaletteActionProvider extends CommonActionProvider {
         /*
          * (non-Javadoc) Method declared on IAction.
          */
+        @Override
         public void run() {
-            String path = CorePlugin.getDefault().getComponentsLocalProviderService().getPreferenceStore().getString(
-                    "USER_COMPONENTS_FOLDER"); //$NON-NLS-1$
+            String path = null;
+            if (GlobalServiceRegister.getDefault().isServiceRegistered(IComponentsLocalProviderService.class)) {
+                IComponentsLocalProviderService service = (IComponentsLocalProviderService) GlobalServiceRegister.getDefault()
+                        .getService(IComponentsLocalProviderService.class);
+                if (service != null) {
+                    path = service.getPreferenceStore().getString("USER_COMPONENTS_FOLDER"); //$NON-NLS-1$
+                }
+            }
             if (path == null || path.length() == 0) {
                 new MessageDialog(
                         PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
@@ -130,6 +144,15 @@ public class PushToPaletteActionProvider extends CommonActionProvider {
                     }
                 }
 
+                // add for bug TDI-26719, clear image cash from EmfComponent
+                IComponentsFactory components = ComponentsFactoryProvider.getInstance();
+                List<IComponent> comList = components.getCustomComponents();
+                for (IComponent com : comList) {
+                    if (com.getImageRegistry() != null) {
+                        com.getImageRegistry().clear();
+                    }
+                }
+
                 MessageDialog warningMessageDialog = new MessageDialog(
                         PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
                         Messages.getString("PushToPaletteActionProvider.Information"), null, Messages.getString("PushToPaletteActionProvider.InformationMSG"), MessageDialog.INFORMATION, //$NON-NLS-1$ //$NON-NLS-2$
@@ -147,7 +170,8 @@ public class PushToPaletteActionProvider extends CommonActionProvider {
 
                 MessageDialog warningMessageDialog = new MessageDialog(
 
-                PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Messages.getString("PushToPaletteActionProvider.PushToPaletteActionProvider.result"), null, waringInfo, //$NON-NLS-1$
+                PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+                        Messages.getString("PushToPaletteActionProvider.PushToPaletteActionProvider.result"), null, waringInfo, //$NON-NLS-1$
                         MessageDialog.WARNING, new String[] { Messages.getString("PushToPaletteActionProvider.OK3") }, 0); //$NON-NLS-1$
 
                 warningMessageDialog.open();
@@ -162,6 +186,7 @@ public class PushToPaletteActionProvider extends CommonActionProvider {
             // get the correct XML file for components
             File[] list = componentFolder.listFiles(new FilenameFilter() {
 
+                @Override
                 public boolean accept(File dir, String name) {
                     // _java.xml
                     String javaXmlName = dir.getName() + "_java.xml"; //$NON-NLS-1$

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.
@@ -65,23 +69,39 @@ public class ComponentProjectPreferencePage extends FieldEditorPreferencePage im
         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)
      */
     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();

org.talend.designer-feature/feature.xml

@@ -242,7 +242,6 @@
       <import plugin="com.ibm.icu" version="4.2.1.v20100412" match="equivalent"/>
       <import plugin="org.eclipse.wst.common.core" version="1.1.201" match="compatible"/>
       <import plugin="org.eclipse.osgi.util" version="3.1.300" match="compatible"/>
-      <import plugin="org.talend.libraries.jdom"/>
       <import plugin="org.talend.common.ui.runtime"/>
       <import plugin="org.talend.libraries.jdbc.mysql"/>
       <import plugin="org.talend.libraries.jdbc.jtds"/>
@@ -1389,12 +1388,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.talend.libraries.jdom"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="org.talend.libraries.jexcel"
          download-size="0"
@@ -1420,4 +1413,19 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.talend.osgi.lib.loader"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.talend.librariesmanager.ui.nl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
 </feature>

org.talend.designer.abstractmap.nl/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

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

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

org.talend.designer.abstractmap/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

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

@@ -79,7 +79,7 @@ public abstract class AbstractMapComponent extends MapperExternalNode {
 
     protected boolean hasDataIntoExpression(Pattern pattern, PatternMatcher matcher, String expression) {
         if (expression != null) {
-            if (matcher.contains(expression, pattern)) {
+            if (matcher.matches(expression, pattern)) {
                 return true;
             }
         }

org.talend.designer.alfrescooutput.nl/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

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

@@ -14,4 +14,5 @@ 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/META-INF/MANIFEST.MF

@@ -1,11 +1,12 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Alfresco Output external component
+Bundle-Name: Alfresco Output Component Plug-in
 Bundle-SymbolicName: org.talend.designer.alfrescooutput;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: .Talend SA.
 Require-Bundle: org.eclipse.core.runtime,
  org.talend.core,
+ org.talend.core.ui,
  org.talend.commons.ui,
  org.talend.libraries.dom4j-jaxen,
  org.talend.designer.codegen,

org.talend.designer.alfrescooutput/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

org.talend.designer.business.diagram.nl/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

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

@@ -1,3 +1,3 @@
 providerName=.Talend SA.
 pluginName=\u30D3\u30B8\u30CD\u30B9 \u30D7\u30E9\u30B0\u30A4\u30F3
-repository.businessProcess=\u30D3\u30B8\u30CD\u30B9\u30E2\u30C7\u30EB
+repository.businessProcess=\u30D3\u30B8\u30CD\u30B9\u30E2\u30C7\u30EB\u56F3

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

@@ -16,6 +16,7 @@ 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

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

@@ -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

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

@@ -2,11 +2,11 @@ BusinessInitDiagramFileAction.DiagramFile=\u30C0\u30A4\u30A2\u30B0\u30E9\u30E0 \
 BusinessAbstractParser.ValueOfLongIsExpected=Long \u578B\u306E\u5024\u304C\u671F\u5F85\u3055\u308C\u3066\u3044\u307E\u3059
 BusinessAbstractParser.ValueOfFloatIsExpected=Float \u578B\u306E\u5024\u304C\u671F\u5F85\u3055\u308C\u3066\u3044\u307E\u3059
 BusinessPaletteFactory.DataComment=\u65B0\u898F\u30C7\u30FC\u30BF\u306E\u4F5C\u6210
-CreateDiagramAction.CreateBusinessModel=\u30d3\u30b8\u30cd\u30b9\u30e2\u30c7\u30eb\u306e\u4f5c\u6210
+CreateDiagramAction.CreateBusinessModel=\u30D3\u30B8\u30CD\u30B9\u30E2\u30C7\u30EB\u56F3\u306E\u4F5C\u6210
 BusinessCreationWizardPage.CreatenewBusinessDiagram=\u65B0\u898F\u30D3\u30B8\u30CD\u30B9 \u30C0\u30A4\u30A2\u30B0\u30E9\u30E0\u306E\u4F5C\u6210
 BusinessAbstractParser.StringIntegerConvertError=String \u5024\u3092 Integer \u5024\u306B\u5909\u63DB\u3067\u304D\u307E\u305B\u3093
 BusinessPaletteFactory.CreateGear=\u65B0\u898F\u6B6F\u8ECA\u306E\u4F5C\u6210
-SimpleBusinessCreationWizardPage.Title=\u65B0\u898F\u30D3\u30B8\u30CD\u30B9\u30E2\u30C7\u30EB
+SimpleBusinessCreationWizardPage.Title=\u65B0\u898F\u30D3\u30B8\u30CD\u30B9\u30E2\u30C7\u30EB\u56F3
 BusinessNewDiagramFileWizard.CreateNewDiagram={0} \u30E2\u30C7\u30EB\u30B3\u30F3\u30C6\u30F3\u30C4\u306B\u57FA\u3065\u3044\u305F\u65B0\u898F\u30C0\u30A4\u30A2\u30B0\u30E9\u30E0\u3092\u4F5C\u6210
 BusinessAbstractParser.UnknownLiteral=\u4E0D\u660E\u306A\u30EA\u30C6\u30E9\u30EB \:
 BusinessAbstractParser.StringLongConverError=String \u5024\u3092 Long \u5024\u306B\u5909\u63DB\u3067\u304D\u307E\u305B\u3093
@@ -21,7 +21,7 @@ CreateAssignmentCommand.CannotAssign=\u5272\u308A\u5F53\u3066\u3089\u308C\u307E\
 BusinessNewDiagramFileWizard.DiagramRootElement=\u30C0\u30A4\u30A2\u30B0\u30E9\u30E0 \u30EB\u30FC\u30C8 \u8981\u7D20
 BusinessNewDiagramFileWizard.NoDiagramRootElementSelectedError=\u30C0\u30A4\u30A2\u30B0\u30E9\u30E0 \u30EB\u30FC\u30C8 \u8981\u7D20\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 BusinessVisualIDRegistry.ParseError=visualID \u756A\u53F7\u3068\u3057\u3066\u30D3\u30E5\u30FC\u30BF\u30A4\u30D7\u3092\u89E3\u6790\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F \:
-OpenDiagramAction.EditBusinessModel=\u30d3\u30b8\u30cd\u30b9\u30e2\u30c7\u30eb\u306e\u7de8\u96c6
+OpenDiagramAction.EditBusinessModel=\u30D3\u30B8\u30CD\u30B9\u30E2\u30C7\u30EB\u56F3\u306E\u7DE8\u96C6
 BusinessAbstractParser.ValueOfTypeByteIsExpected=Byte \u578B\u306E\u5024\u304C\u671F\u5F85\u3055\u308C\u3066\u3044\u307E\u3059
 BusinessAbstractParser.ValueOfTypeCharacterIsExpected=Character \u578B\u306E\u5024\u304C\u671F\u5F85\u3055\u308C\u3066\u3044\u307E\u3059
 BusinessPaletteFactory.ActionComment=\u65B0\u898F\u30A2\u30AF\u30B7\u30E7\u30F3\u306E\u4F5C\u6210
@@ -33,7 +33,7 @@ BusinessPaletteFactory.TerminalComment=\u65B0\u898F\u7AEF\u672B\u306E\u4F5C\u621
 BusinessAbstractParser.ValueOfShortIsExpected=Short \u578B\u306E\u5024\u304C\u671F\u5F85\u3055\u308C\u3066\u3044\u307E\u3059
 BusinessPaletteFactory.DatabaseComment=\u65B0\u898F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u4F5C\u6210
 AssignmentPropertySection.Comment=\u30B3\u30E1\u30F3\u30C8
-SimpleBusinessCreationWizard.NewBusinessModel=\u65B0\u898F\u30D3\u30B8\u30CD\u30B9\u30E2\u30C7\u30EB
+SimpleBusinessCreationWizard.NewBusinessModel=\u65B0\u898F\u30D3\u30B8\u30CD\u30B9\u30E2\u30C7\u30EB\u56F3
 BusinessNewDiagramFileWizard.InvalidDiagramRootElementSelected=\u7121\u52B9\u306A\u30C0\u30A4\u30A2\u30B0\u30E9\u30E0 \u30EB\u30FC\u30C8\u8981\u7D20\u304C\u9078\u629E\u3055\u308C\u307E\u3057\u305F
 BusinessInitDiagramFileAction.IntialNew=\u521D\u671F\u5316
 FindAssignmentAction.FindAssignments=\u5272\u308A\u5F53\u3066\u306E\u691C\u7D22
@@ -65,7 +65,7 @@ SimpleBusinessCreationWizardPage.Super=BusinessProcessCreatePage
 BusinessInitDiagramFileAction.LoadFaild=\u30E2\u30C7\u30EB\u30D5\u30A1\u30A4\u30EB\u306E\u30ED\u30FC\u30C9\u306B\u5931\u6557\u3057\u307E\u3057\u305F
 BusinessPaletteFactory.DecisionComment=\u65B0\u898F\u5224\u5B9A\u306E\u4F5C\u6210
 BusinessAbstractParser.ValueOfDoubleIsExpected=Double \u578B\u306E\u5024\u304C\u671F\u5F85\u3055\u308C\u3066\u3044\u307E\u3059
-OpenDiagramAction.ReadBusinessModel=\u30d3\u30b8\u30cd\u30b9\u30e2\u30c7\u30eb\u306e\u8aad\u8fbc\u307f
+OpenDiagramAction.ReadBusinessModel=\u30D3\u30B8\u30CD\u30B9\u30E2\u30C7\u30EB\u56F3\u306E\u8AAD\u8FBC\u307F
 BusinessInitDiagramFileAction.UnableToLoadResource=\u30EA\u30BD\u30FC\u30B9\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093 \:
 BusinessPaletteFactory.CreateEllipse=\u65B0\u898F\u6955\u5186\u306E\u4F5C\u6210
 BusinessNewDiagramFileWizard.DiagramFile=\u30C0\u30A4\u30A2\u30B0\u30E9\u30E0 \u30D5\u30A1\u30A4\u30EB

org.talend.designer.business.diagram/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.talend.designer.business.diagram; singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.talend.designer.business.model.business.diagram.part.BusinessDiagramEditorPlugin
 Bundle-Vendor: %providerName
@@ -19,6 +19,7 @@ Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.gmf.runtime.diagram.ui.properties,
  org.apache.commons.collections,
  org.talend.core,
+ org.talend.core.ui,
  org.talend.core.repository,
  org.talend.repository,
  org.talend.model,
@@ -31,5 +32,6 @@ Require-Bundle: org.eclipse.ui.ide,
  org.apache.batik.ext.awt,
  org.talend.metadata.managment,
  com.ibm.icu,
- org.talend.libraries.apache
+ org.talend.libraries.apache,
+ org.talend.repository.items.importexport
 Eclipse-LazyStart: true

org.talend.designer.business.diagram/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

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

@@ -1,3 +1,3 @@
-pluginName=Business Plugin
+pluginName=Business Diagram Plug-in
 providerName=.Talend SA.
 repository.businessProcess=Business Models

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

@@ -590,5 +590,20 @@
             type="BUSINESS_PROCESS">
       </repositoryNode>
    </extension>
+   <extension
+         point="org.talend.repository.items.importexport.handler">
+      <importItemsProvider
+            id="org.talend.designer.business.diagram.importProvider"
+            name="Business Diagram importer"
+            priority="NORMAL">
+         <importItemsHandler
+               class="org.talend.designer.business.diagram.views.handler.BusinessDiagramImportHandler">
+            <parameter
+                  name="type"
+                  value="BUSINESS_PROCESS">
+            </parameter>
+         </importItemsHandler>
+      </importItemsProvider>
+   </extension>
    
 </plugin>

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

@@ -86,8 +86,7 @@ public class CreateDiagramAction extends AContextualAction implements IIntroActi
                 if (nodeType == ERepositoryObjectType.BUSINESS_PROCESS) {
                     enabled = true;
                 }
-                if (repositoryNode.getObject() != null
-                        && repositoryNode.getObject().getProperty().getItem().getState().isDeleted()) {
+                if (repositoryNode.getObject() != null && repositoryNode.getObject().isDeleted()) {
                     enabled = false;
                 }
             }

org.talend.designer.business.diagram/src/org/talend/designer/business/diagram/views/handler/BusinessDiagramImportHandler.java

@@ -0,0 +1,43 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2013 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.business.diagram.views.handler;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.talend.commons.emf.TalendXMIResource;
+import org.talend.repository.items.importexport.handlers.imports.ImportRepTypeHandler;
+
+/**
+ * DOC ggu class global comment. Detailled comment
+ */
+public class BusinessDiagramImportHandler extends ImportRepTypeHandler {
+
+    /**
+     * DOC ggu BusinessDiagramImportHandler constructor comment.
+     */
+    public BusinessDiagramImportHandler() {
+        super();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.talend.repository.items.importexport.handlers.imports.ImportRepTypeHandler#createItemResource(org.eclipse
+     * .emf.common.util.URI)
+     */
+    @Override
+    protected Resource createItemResource(URI pathUri) {
+        return new TalendXMIResource(pathUri);
+    }
+}

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

@@ -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;
@@ -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());

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

@@ -49,7 +49,6 @@ import org.talend.core.model.properties.ItemState;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
-import org.talend.core.model.repository.RepositoryManager;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.ui.ILastVersionChecker;
 import org.talend.designer.business.diagram.custom.actions.DiagramResourceManager;
@@ -209,7 +208,6 @@ public class BusinessDiagramEditor extends FileDiagramEditor implements IGotoMar
             }
             propertyIsDirty = false;
             firePropertyChange(IEditorPart.PROP_DIRTY);
-            RepositoryManager.refreshSavedNode(repositoryEditorInput.getRepositoryNode());
 
         }
     }

org.talend.designer.codegen.nl/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

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

@@ -21,6 +21,8 @@ CodeGeneratorEmittersPoolFactory.componentCompiled=Komponenten kompiliert in {0}
 CodeGeneratorEmittersPoolFactory.failCompail=Kompilierung der Komponenten fehlgeschlafen : \r\n
 CodeGeneratorEmittersPoolFactory.initialException=Ausnahme bei der Initialisierung
 CodeGeneratorEmittersPoolFactory.jetEmitterInitialException=Fehler bei der JetEmitter Initialisierung
+CodeGeneratorService.invalidLanguage1=Ungültiger Sprachtyp
+CodeGeneratorService.invalidLanguage2=Ungültiger Sprachtyp
 CodeGenInit.createProject=Erstelle {0} Projekt
 CodeGenInit.deleteProject=Lösche {0} Projekt
 CodeGenInit.initTemplate=Initialisiere Templates

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

@@ -132,3 +132,4 @@ FAMILY.Vertica=Vertica
 FAMILY.VtigerCRM=VtigerCRM
 FAMILY.XML=XML
 CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=Update the palette for editors
+ComponentsPreferencePage.componentAssist=Enable Component Creation Assistant

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
@@ -60,6 +60,7 @@ ComponenttRunJobPreferencePage.showCorrespondingJob=Afficher le Job correspondan
 XsdValidationCacheManager.unableLoadxsd=impossible de charger le fichier de cache de validation xsd
 XsdValidationCacheManager.unableSavexsd=impossible d'enregistrer le fichier de cache de validation xsd
 prefs.configuration.LINK_STYLE.AUTO=Auto
+prefs.configuration.LINK_STYLE.BEZIER_CURVE=Courbes
 prefs.configuration.LINK_STYLE.LINE=Lignes (rapide)
 FAMILY.AS400=AS400
 FAMILY.Access=Access
@@ -111,7 +112,7 @@ FAMILY.OLAP_Cube=Cube OLAP
 FAMILY.Oracle=Oracle
 FAMILY.Orchestration=Orchestration
 FAMILY.Output=Ecriture
-FAMILY.ParAccel=ParAccel
+FAMILY.ParAccel=Paraccel
 FAMILY.PostgreSQL=PostgreSQL
 FAMILY.PostgresPlus=PostgresPlus
 FAMILY.Processing=Transformation
@@ -131,3 +132,4 @@ FAMILY.Vertica=Vertica
 FAMILY.VtigerCRM=VtigerCRM
 FAMILY.XML=XML
 CodeGeneratorEmittersPoolFactory.updatePaletteForEditors=Mettre à jour la palette pour les éditeurs
+ComponentsPreferencePage.componentAssist=Activer l'assistant de création de composant

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

@@ -65,24 +65,24 @@ prefs.configuration.LINK_STYLE.LINE=\u76F4\u7DDA(\u6700\u901F)
 FAMILY.AS400=AS400
 FAMILY.Access=Access
 FAMILY.Alfresco=Alfresco
-FAMILY.Business=Business
-FAMILY.Business_Intelligence=Business Intelligence
+FAMILY.Business=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3
+FAMILY.Business_Intelligence=\u30D3\u30B8\u30CD\u30B9\u30A4\u30F3\u30C6\u30EA\u30B8\u30A7\u30F3\u30B9
 FAMILY.CentricCRM=CentricCRM
 FAMILY.Charts=Charts
-FAMILY.Connections=Connections
-FAMILY.Custom_Code=Custom Code
+FAMILY.Connections=\u63A5\u7D9A
+FAMILY.Custom_Code=\u30AB\u30B9\u30BF\u30E0\u30B3\u30FC\u30C9
 FAMILY.DB2=DB2
-FAMILY.DB_Generic=DB Generic
-FAMILY.DB_JDBC=DB JDBC
+FAMILY.DB_Generic=\u6C4E\u7528ODBC
+FAMILY.DB_JDBC=\u6C4E\u7528JDBC
 FAMILY.DB_SCD=DB SCD
-FAMILY.Data_Quality=Data Quality
-FAMILY.Databases=Databases
+FAMILY.Data_Quality=\u30C7\u30FC\u30BF\u30AF\u30AA\u30EA\u30C6\u30A3
+FAMILY.Databases=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
 FAMILY.ELT=ELT
 FAMILY.ESB=ESB
 FAMILY.EXASolution=EXASolution
 FAMILY.eXist=eXist
 FAMILY.FTP=FTP
-FAMILY.Fields=Fields
+FAMILY.Fields=\u9805\u76EE\u5024\u5909\u63DB
 FAMILY.File=\u30D5\u30A1\u30A4\u30EB
 FAMILY.FireBird=Firebird
 FAMILY.Greenplum=Greenplum
@@ -91,30 +91,31 @@ FAMILY.Healthcare=Healthcare
 FAMILY.Hive=Hive
 FAMILY.Informix=Informix
 FAMILY.Ingres=Ingres
-FAMILY.Input=Input
+FAMILY.Input=\u30D5\u30A1\u30A4\u30EB\u5165\u529B
 FAMILY.Interbase=Interbase
 FAMILY.Internet=Internet
 FAMILY.Jasper=Jasper
 FAMILY.JavaDB=JavaDB
-FAMILY.JDBC=JDBC
+FAMILY.JDBC=\u6C4E\u7528JDBC
 FAMILY.LDAP=LDAP
-FAMILY.Logs_Errors=Logs & Errors
+FAMILY.Logs_Errors=\u30ED\u30B0\uFF06\u30A8\u30E9\u30FC\u30CF\u30F3\u30C9\u30EA\u30F3\u30B0
 FAMILY.MS_SQL_Server=MS SQL Server
 FAMILY.MSSql=MSSql
-FAMILY.Management=Management
+FAMILY.Management=\u30D5\u30A1\u30A4\u30EB\u64CD\u4F5C
 FAMILY.MaxDB=MaxDB
 FAMILY.Microsoft_AX=Microsoft AX
 FAMILY.Microsoft_CRM=Microsoft CRM
-FAMILY.Misc=Misc
+FAMILY.Misc=\u305D\u306E\u4ED6
 FAMILY.MySQL=MySQL
 FAMILY.Netezza=Netezza
-FAMILY.OLAP_Cube=OLAP Cube
+FAMILY.OLAP_Cube=OLAP\u30AD\u30E5\u30FC\u30D6
 FAMILY.Oracle=Oracle
-FAMILY.Orchestration=Orchestration
+FAMILY.Orchestration=\u30D7\u30ED\u30BB\u30B9\u5236\u5FA1
+FAMILY.Output=\u30D5\u30A1\u30A4\u30EB\u51FA\u529B
 FAMILY.ParAccel=ParAccel
 FAMILY.PostgreSQL=PostgreSQL
 FAMILY.PostgresPlus=PostgresPlus
-FAMILY.Processing=Processing
+FAMILY.Processing=\u5909\u63DB\u51E6\u7406
 FAMILY.SAP=SAP
 FAMILY.Sas=Sas
 FAMILY.SCD=SCD

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

@@ -3,6 +3,6 @@ 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"
+Fragment-Host: org.talend.designer.codegen
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit4

org.talend.designer.codegen.test/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

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

@@ -1,19 +1,21 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Codegen Plug-in
+Bundle-Name: CodeGen Plug-in
 Bundle-SymbolicName: org.talend.designer.codegen;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.talend.core.repository,
  org.eclipse.emf.codegen,
  org.eclipse.jdt.core,
  org.talend.repository,
+ org.talend.commons.ui,
  org.eclipse.emf.ecore.xmi,
  org.talend.model,
  org.talend.metadata.managment,
  org.talend.designer.core,
  org.apache.xerces,
  org.talend.core,
+ org.talend.core.ui,
  org.eclipse.ui.workbench,
  org.apache.log4j
 Eclipse-LazyStart: true

org.talend.designer.codegen/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

org.talend.designer.codegen/plugin.xml

@@ -2,6 +2,7 @@
 <?eclipse version="3.2"?>
 <plugin>
    <extension-point id="additional_jetfile" name="Additional Jet File to generate" schema="schema/additional_jetfile.exsd"/>
+   <extension-point id="componentFilter" name="Component filter" schema="schema/componentFilter.exsd"/>
    <extension
          point="org.eclipse.ui.commands">
       <command
@@ -50,13 +51,13 @@
       <page
             category="org.talend.core.prefs"
             class="org.talend.designer.codegen.components.ui.ComponentsPreferencePage"
-            id="org.talend.designer.codegen.components.localprovider.page1"
+            id="org.talend.designer.codegen.components.preference"
             name="%components">
       </page>
       <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"
+            category="org.talend.designer.codegen.components.preference"
+            class="org.talend.designer.components.preference.ComponentsFormatPreferencePage"
+            id="org.talend.designer.codegen.components.preference.format"
             name="%format">
       </page>
    </extension>

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

@@ -72,25 +72,47 @@
 			camelContext.setRegistry(contextRegister);
 
 <%
+			boolean isStudioEEVersion = org.talend.core.PluginChecker.isTIS();
 			List<? extends INode> cxfNodes = process.getNodesOfType("cCXF");
 			if( null != cxfNodes && cxfNodes.size() >0 ){
 				boolean hasCXFConsumer = false;
+				boolean hasCXFSAMLProvider = false;
 				for(INode n: cxfNodes){
 					int incomingConnections = n.getIncomingConnections().size();
 					if(incomingConnections > 0){
 						hasCXFConsumer = true;
-						break;
+					}else{
+						String dataformat = ElementParameterParser.getValue(n, "__DATAFORMAT__");
+						
+						String useServiceRegistry = ElementParameterParser.getValue(n, "__ENABLE_REGISTRY__");
+						if(!isStudioEEVersion || "RAW".equals(dataformat) || "CXF_MESSAGE".equals(dataformat)){
+							useServiceRegistry = "false";
+						}
+						
+						String useSecurity = ElementParameterParser.getValue(n, "__ENABLE_SECURITY__");
+						if("true".equals(useServiceRegistry) || "RAW".equals(dataformat) || "CXF_MESSAGE".equals(dataformat)){
+							useSecurity = "false";
+						}
+						
+						if("true".equals(useServiceRegistry) || ("true".equals(useSecurity) && "SAML".equals(ElementParameterParser.getValue(n, "__SECURITY_TYPE__")))){
+							hasCXFSAMLProvider = true;
+						}
+						if(hasCXFConsumer && hasCXFSAMLProvider){
+							break;
+						}
 					}
 				}
 				if(hasCXFConsumer){
 %>
-					contextRegister.register("CXF_PAYLOAD_HEADER_FILTER", new CxfConsumerSoapHeaderFilter());
+					contextRegister.register("CXF_PAYLOAD_HEADER_FILTER", consumerSoapHeaderFilter);
 <%
 				}
-			}
+				if(hasCXFSAMLProvider){
 %>
-
-<%
+					contextRegister.register("DEFAULT_CXF_BINDING", new CXFProviderBinding());
+<%				}
+			}
+			
 			//then process cBeanRegister components
 			List<? extends INode> beanRegisterNodes = process.getNodesOfType("cBeanRegister");
 			if(beanRegisterNodes != null && beanRegisterNodes.size()>0){

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

@@ -311,6 +311,9 @@ end_Hash.put("<%=node.getUniqueName() %>", System.currentTimeMillis());
 		if (!status.equals("failure")) {
 			status = errorThread_<%=iterateTargetNodeName %>.status;
 		}
+		if(errorThread_<%=iterateTargetNodeName %>.exception!=null){
+			throw errorThread_<%=iterateTargetNodeName %>.exception;
+		}
 	}else{				
 		Integer threadErrorCode = mtp_<%=iterateTargetNodeName %>.getTalendThreadResult().getErrorCode();
 		String threadStatus = mtp_<%=iterateTargetNodeName %>.getTalendThreadResult().getStatus();
@@ -338,6 +341,9 @@ end_Hash.put("<%=node.getUniqueName() %>", System.currentTimeMillis());
 		if (!localStatus.equals("failure")) {
 			((java.util.Map) threadLocal.get()).put("status", errorThread_<%=iterateTargetNodeName %>.status);
 		}
+		if(errorThread_<%=iterateTargetNodeName %>.exception!=null){
+			throw errorThread_<%=iterateTargetNodeName %>.exception;
+		}		
 	}else{
 		Integer threadErrorCode = mtp_<%=iterateTargetNodeName %>.getTalendThreadResult().getErrorCode();
 		String threadStatus = mtp_<%=iterateTargetNodeName %>.getTalendThreadResult().getStatus();

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

@@ -8,6 +8,7 @@
 		org.talend.core.model.process.EConnectionType 
         org.talend.core.model.process.ElementParameterParser
 		org.talend.designer.codegen.config.CodeGeneratorArgument
+		org.talend.core.model.utils.NodeUtil
 		org.talend.core.model.process.IConnectionCategory
   		java.util.List
  		 java.util.Set
@@ -33,12 +34,12 @@
 	
 	List<IConnection> allSubProcessConnection = codeGenArgument.getAllMainSubTreeConnections();
 %>
+	
+	/**
+	 * [<%=node.getUniqueName() %> <%=codePart %> ] start
+	 */
 
-/**
- * [<%=node.getUniqueName() %> <%=codePart %> ] start
- */
-
-<%
+	<%
     //This part in order to feedback with the iterate_subprocess_header.javajet and iterate_subprocess_footer.javajet
     
 	if (codePart.equals(ECodePart.BEGIN)) {
@@ -47,139 +48,142 @@
 		for (IConnection iterateConn : iterateConnSet) { 
 			parallelIterate = "true".equals(ElementParameterParser.getValue(iterateConn, "__ENABLE_PARALLEL__"));
 	        if (parallelIterate) {
-%>
-			TalendThreadPool mtp_<%=iterateConn.getTarget().getUniqueName() %> = new TalendThreadPool(<%=ElementParameterParser.getValue(iterateConn,"__NUMBER_PARALLEL__") %>);
+			%>
+				TalendThreadPool mtp_<%=iterateConn.getTarget().getUniqueName() %> = new TalendThreadPool(<%=ElementParameterParser.getValue(iterateConn,"__NUMBER_PARALLEL__") %>);
 
-<%
-if(!hasParallelIterate){
-	hasParallelIterate = true;
-%>
+				<%
+				if(!hasParallelIterate){
+					hasParallelIterate = true;
+					%>
 					
-			final Object[] lockWrite = new Object[0];
-			int threadIdCounter =0;
-<%}%>			
+					final Object[] lockWrite = new Object[0];
+					int threadIdCounter =0;
+				<%
+				}
+				%>			
 			
-<%
+			<%
 			}
 			
 			String iterateNodeName = iterateConn.getTarget().getUniqueName();
-%>			
+			%>			
 			int NB_ITERATE_<%=iterateNodeName %> = 0; //for statistics
-<%			
+			<%			
 			continue;
 		}
 	}	
-%>
+	%>
 
-<%
+	<%
 	if (codePart.equals(ECodePart.BEGIN)) {
-%>
-<% if(trace){ %>
-globalMap.put("ENABLE_TRACES_CONNECTION_<%=startNodeCid%>",Boolean.FALSE);
-<% } %>
-ok_Hash.put("<%=node.getUniqueName() %>", false);
-start_Hash.put("<%=node.getUniqueName() %>", System.currentTimeMillis());
-<%
+	%>
+		<%
+		if(trace){ 
+		%>
+			globalMap.put("ENABLE_TRACES_CONNECTION_<%=startNodeCid%>",Boolean.FALSE);
+		<%
+		}
+		%>
+		ok_Hash.put("<%=node.getUniqueName() %>", false);
+		start_Hash.put("<%=node.getUniqueName() %>", System.currentTimeMillis());
+		<%
 		String statCatcher = ElementParameterParser.getValue(node,"__TSTATCATCHER_STATS__");
 		if ((node.getProcess().getNodesOfType("tStatCatcher").size() > 0) && (statCatcher.equals("true"))) {
 			for (INode statCatcherNode : node.getProcess().getNodesOfType("tStatCatcher")) {
-%>
-<%=statCatcherNode.getUniqueName() %>.addMessage("begin","<%=node.getUniqueName() %>");
-<%=statCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
-<%
+			%>
+				<%=statCatcherNode.getUniqueName() %>.addMessage("begin","<%=node.getUniqueName() %>");
+				<%=statCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
+			<%
 			}
 		}
 	}
 	if(codePart.equals(ECodePart.MAIN)) {
 		List<INode> meterCatchers = (List<INode>)node.getProcess().getNodesOfType("tFlowMeterCatcher");	
-	    if ((node.getProcess().getNodesOfType("tFlowMeter").size() > 0))
-	    {
-        	for(IConnection temp_conn : node.getIncomingConnections(EConnectionType.FLOW_MAIN))
-        	{
+	    if ((node.getProcess().getNodesOfType("tFlowMeter").size() > 0)){
+        	for(IConnection temp_conn : node.getIncomingConnections(EConnectionType.FLOW_MAIN)){
         	    String name_conn = temp_conn.getUniqueName();
-        	    if(temp_conn.isUseByMetter())
-        	    { 	    	
-%>
-    <%
-            if (meterCatchers != null) {
-        		for (INode meterCatcher : meterCatchers) {
-    %>
-    	<%=meterCatcher.getUniqueName() %>.addLineToRow("<%=name_conn%>_count");
-    <%
-        		}
-        	}
-    %> 
-<%
+        	    if(temp_conn.isUseByMetter()){ 	    	
+				%>
+    				<%
+		            if (meterCatchers != null) {
+		        		for (INode meterCatcher : meterCatchers) {
+    					%>
+    						<%=meterCatcher.getUniqueName() %>.addLineToRow("<%=name_conn%>_count");
+    					<%
+		        		}
+		        	}
 				}
 			}
 			
-			for(IConnection temp_conn : node.getIncomingConnections(EConnectionType.FLOW_MERGE))
-        	{
+			for(IConnection temp_conn : node.getIncomingConnections(EConnectionType.FLOW_MERGE)){
         	    String name_conn = temp_conn.getUniqueName();
-        	    if(name_conn == incomingName && temp_conn.isUseByMetter())
-        	    { 	    	
-%>
-    <%
-            if (meterCatchers != null) {
-        		for (INode meterCatcher : meterCatchers) {
-    %>
-    	<%=meterCatcher.getUniqueName() %>.addLineToRow("<%=name_conn%>_count");
-    <%
-        		}
-        	}
-    %> 
-<%
+        	    if(name_conn == incomingName && temp_conn.isUseByMetter()){ 	    	
+            		if (meterCatchers != null) {
+		        		for (INode meterCatcher : meterCatchers) {
+    					%>
+    						<%=meterCatcher.getUniqueName() %>.addLineToRow("<%=name_conn%>_count");
+    					<%
+		        		}
+		        	}
 				}
 			}			
 	    }
 	}
-%>
-currentComponent="<%=node.getUniqueName() %>";
+	%>
+	<%
+	if(node.isVirtualGenerateNode()){
+	%>
+		currentVirtualComponent = "<%=NodeUtil.getVirtualUniqueName(node)%>";
+	<%
+	}
+	%>
+	currentComponent="<%=node.getUniqueName() %>";
 
-<%
+	<%
 	connSet =  new HashSet<IConnection>();
 	connSet.addAll(node.getIncomingConnections(EConnectionType.FLOW_MAIN));
 	connSet.addAll(node.getIncomingConnections(EConnectionType.FLOW_MERGE));
 
 	if ((codePart.equals(ECodePart.BEGIN))&&(stat)&&connSet.size()>0) {
 		for(IConnection con:connSet){
-%>
+		%>
 
-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);
-} 
+			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);
+			} 
 
-<%		}
+		<%
+		}
 	}
 	
 	if((codePart.equals(ECodePart.MAIN))&&(stat)&&connSet.size()>0){
 		for(IConnection con:connSet){
-%>
+		%>
 
-//<%=con.getUniqueName()%>
-//<%=(String)codeGenArgument.getIncomingName()%>
+			//<%=con.getUniqueName()%>
+			//<%=(String)codeGenArgument.getIncomingName()%>
 
 
-<%if (!node.getComponent().useMerge()) {%>
-if(execStat){
-  runStat.updateStatOnConnection("<%=con.getUniqueName() %>"+iterateId,1, 1);
- } 
-<%
-	} else if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){
-%>
-if(execStat){
- runStat.updateStatOnConnection("<%=con.getUniqueName() %>"+iterateId,1, 1);
-} 
-<%}%>
+			<%if (!node.getComponent().useMerge()) {%>
+				if(execStat){
+					runStat.updateStatOnConnection("<%=con.getUniqueName() %>"+iterateId,1, 1);
+				} 
+			<%
+			} else if(con.getUniqueName().equals((String)codeGenArgument.getIncomingName())){
+			%>
+				if(execStat){
+					runStat.updateStatOnConnection("<%=con.getUniqueName() %>"+iterateId,1, 1);
+				} 
+			<%}%>
 
-<%
+		<%
 		}
 	}
-%>
+	%>
 
-<%if(codePart.equals(ECodePart.BEGIN)){ %>
-	int tos_count_<%=node.getUniqueName() %> = 0;
-<%}%>
+	<%if(codePart.equals(ECodePart.BEGIN)){ %>
+		int tos_count_<%=node.getUniqueName() %> = 0;
+	<%}%>

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

@@ -33,6 +33,7 @@
     List<IContextParameter> params = new ArrayList<IContextParameter>();
     params=process.getContextManager().getDefaultContext().getContextParameterList();
     String jobFolderName = JavaResourcesHelper.getJobFolderName(process.getName(), process.getVersion());
+    boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));
 
     boolean exist_tParallelize = false;
     List<? extends INode> tParallelizeList = process.getNodesOfType("tParallelize");
@@ -90,6 +91,7 @@
     public String fatherNode = null;
     public long startTime = 0;
     public boolean isChildJob = false;
+    public String log4jLevel = "";
 
     private boolean execStat = true;
 
@@ -104,9 +106,9 @@
 
 <% if (hasSAM4RS) { %>
     // ESB Service Activity Monitor Feature
-    private org.apache.cxf.feature.AbstractFeature eventFeature;
+    private org.apache.cxf.feature.Feature eventFeature;
 
-    public void setEventFeature(org.apache.cxf.feature.AbstractFeature eventFeature) {
+    public void setEventFeature(org.apache.cxf.feature.Feature eventFeature) {
         this.eventFeature = eventFeature;
     }
 <% } %>
@@ -142,6 +144,12 @@
         final <%=process.getName() %> <%=process.getName() %>Class = new <%=process.getName() %>();
 
         int exitCode = <%=process.getName() %>Class.runJobInTOS(args);
+        <%if(isLog4jEnabled){%>
+	        if(exitCode==0){
+		        log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Done.");
+	        }
+        <%}%>
+
         System.exit(exitCode);
     }
 
@@ -169,7 +177,7 @@
     public int runJobInTOS(String[] args) {
 	   	// reset status
 	   	status = "";
-	   	
+
         String lastStr = "";
         for (String arg : args) {
             if (arg.equalsIgnoreCase("--context_param")) {
@@ -182,6 +190,28 @@
             }
         }
 
+        <%if(isLog4jEnabled){%>
+	        if(!"".equals(log4jLevel)){
+				if("trace".equalsIgnoreCase(log4jLevel)){
+					log.setLevel(org.apache.log4j.Level.TRACE);
+				}else if("debug".equalsIgnoreCase(log4jLevel)){
+					log.setLevel(org.apache.log4j.Level.DEBUG);
+				}else if("info".equalsIgnoreCase(log4jLevel)){
+					log.setLevel(org.apache.log4j.Level.INFO);
+				}else if("warn".equalsIgnoreCase(log4jLevel)){
+					log.setLevel(org.apache.log4j.Level.WARN);
+				}else if("error".equalsIgnoreCase(log4jLevel)){
+					log.setLevel(org.apache.log4j.Level.ERROR);
+				}else if("fatal".equalsIgnoreCase(log4jLevel)){
+					log.setLevel(org.apache.log4j.Level.FATAL);
+				}else if ("off".equalsIgnoreCase(log4jLevel)){
+					log.setLevel(org.apache.log4j.Level.OFF);
+				}
+				org.apache.log4j.Logger.getRootLogger().setLevel(log.getLevel());
+    	    }
+        	log.info("TalendJob: '<%=codeGenArgument.getJobName()%>' - Start.");
+    	<%}%>
+
         if(clientHost == null) {
             clientHost = defaultClientHost;
         }
@@ -710,7 +740,9 @@ if (execStat) {
                     context_param.put(keyValue.substring(0, index), keyValue.substring(index + 1) );
                 }
             }
-        }
+        }else if (arg.startsWith("--log4jLevel=")) {
+            log4jLevel = arg.substring(13);
+		}
 
     }
 

org.talend.designer.codegen/resources/footer_java.skeleton

@@ -35,9 +35,10 @@ public class CLASS
 //            toReturn +=  failure_singleThread;
 //        }
         
+        toReturn += "globalMap.put(\""+rootNode.getUniqueName()+ "_SUBPROCESS_STATE\", -1);\n";
+        
         toReturn += "\ne_" + rootNode.getUniqueName() + ".printStackTrace();\n";
         
-        toReturn += "globalMap.put(\""+rootNode.getUniqueName()+ "_SUBPROCESS_STATE\", -1);\n";
       
        //List< ? extends IConnection> onSubJobErrorConns = rootNode.getOutgoingConnections(EConnectionType.ON_SUBJOB_ERROR);
        //if(onSubJobErrorConns!=null){
@@ -47,8 +48,8 @@ public class CLASS
        //}            
         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 += "\ne_" + rootNode.getUniqueName() + ".printStackTrace();\n";
         }
        toReturn += "\n}"; 
        return toReturn;

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

@@ -41,13 +41,15 @@ protected void doStart() throws java.lang.Exception {
 		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);
+		CamelContext camelContext = getCamelContexts().get(0);
+		// add notifier
+		java.util.Set<JmxNotificationEventNotifier> jmxEventNotifiers = camelContext
+				.getRegistry().findByType(
+						JmxNotificationEventNotifier.class);
+		if (jmxEventNotifiers != null && !jmxEventNotifiers.isEmpty()) {
+			camelContext.getManagementStrategy().addEventNotifier(
+					jmxEventNotifiers.iterator().next());
+		}
 
 <%
 StringBuilder librariesSb = new StringBuilder();
@@ -80,18 +82,27 @@ if(librariesSb.length()>0){
 		}
 <%
 }
-%>
-		//start camel context	
-		getCamelContexts().get(0).start();
-
-
-<% if(stats) { %>
+	if(stats) { %>
 
 		// add statistics which shows on the connection
-		routines.system.CamelStat runStat = new routines.system.CamelStat(getCamelContexts().get(0));
-
-		runStat.setParams();
+		final routines.system.CamelStat runStat = new routines.system.CamelStat(camelContext);
+		<%
+		for (INode node : processNodes) {
+			if (node.isActivate()) {
+				for(int i=0; i<node.getIncomingConnections().size(); i++) {
+%>
+		runStat.addConnectionMapping("<%=node.getUniqueName()%>", "<%=node.getIncomingConnections().get(i).getUniqueName()%>");
+<%
+				}
+			}
+		}
+%>
 
+		runStat.initStatisticsInterceptor();
+<% } //if stats %>
+		//start camel context	
+		camelContext.start();
+<% if(stats) { %>
 		runStat.openSocket(true);
 		runStat.setAllPID(pid, pid, pid, jobName);
 		runStat.startThreadStat(clientHost, portStats);
@@ -408,62 +419,68 @@ for (IContextParameter ctxParam : params) {
 	}
 }
 
-class <%=process.getName()%>_Registry implements Registry {
-
-	private Map<String, Object> map = new HashMap<String, Object>();
+class <%=process.getName()%>_Registry extends SimpleRegistry {
 
 	private Registry wrapped = null;
 
 	public <%=process.getName()%>_Registry() {
-		this(null);
+		this(new SimpleRegistry());
 	}
 
 	public <%=process.getName()%>_Registry(Registry wrapped) {
 		this.wrapped = wrapped;
 	}
 
-	public Object lookup(String name) {
+	@Override
+	public Object lookupByName(String name) {
 		Object obj = null;
 		if (wrapped != null) {
-			obj = wrapped.lookup(name);
+			obj = wrapped.lookupByName(name);
 		}
 		if (obj == null) {
-			obj = map.get(name);
+			obj = super.lookupByName(name);
 		}
 		return obj;
 	}
 
-	public <T> T lookup(String name, Class<T> type) {
+	@Override
+	public <T> T lookupByNameAndType(String name, Class<T> type) {
 		T t = null;
 		if (wrapped != null) {
-			t = wrapped.lookup(name, type);
+			t = wrapped.lookupByNameAndType(name, type);
 		}
 		if (t == null) {
-			t = (T) map.get(name);
+			t = super.lookupByNameAndType(name, type);
 		}
 		return t;
 	}
-
-	public <T> Map<String, T> lookupByType(Class<T> type) {
+	
+	@Override
+	public <T> Map<String, T> findByTypeWithName(Class<T> type) {
 		Map<String, T> result = null;
 		if (wrapped != null) {
-			result = wrapped.lookupByType(type);
+			result = wrapped.findByTypeWithName(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()));
-				}
-			}
+			result = super.findByTypeWithName(type);
 		}
 		return result;
 	}
 
+	@Override
+	public <T> Set<T> findByType(Class<T> type){
+		Set<T> result = null;
+		if (wrapped != null) {
+			result = wrapped.findByType(type);
+		}
+		if (result == null) {
+			result = super.findByType(type);
+		}
+		return result;
+	}
+	
 	public void register(String name, Object instance) {
-		map.put(name, instance);
+		put(name, instance);
 	}
 
 }

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

@@ -118,6 +118,8 @@ boolean actAsConsumer = !process.getNodesOfType("tESBConsumer").isEmpty();
 boolean talendEsbJob = actAsProvider || actAsConsumer || !process.getNodesOfType("tRouteInput").isEmpty();
 boolean talendEsbJobFactory = actAsProvider || !process.getNodesOfType("tRouteInput").isEmpty();
 
+boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));
+
 if (talendMdmJob) {
 	talendJobInterfaces += ", TalendMDMJob"; // Talend MDM job
 }
@@ -129,6 +131,10 @@ if (talendEsbJobFactory) {
 }
 %>
 public class <%=process.getName()%> implements <%=talendJobInterfaces%> {
+<%if(isLog4jEnabled){%>
+	static {System.setProperty("TalendJob.log", "<%=process.getName() %>.log");}
+	private static org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(<%=process.getName() %>.class);
+<%}%>
 
 <% if (talendEsbJob) { %>
 	private ESBEndpointRegistry registry = null;
@@ -260,23 +266,38 @@ public <%=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true)%> get<%=Ch
 	private final String projectName = "<%=codeGenArgument.getCurrentProjectName() %>";
 	public Integer errorCode = null;
 	private String currentComponent = "";
-<%
-	if(!isRunInMultiThread ){
-%>
-	private final java.util.Map<String, Long> start_Hash = new java.util.HashMap<String, Long>();
-	private final java.util.Map<String, Long> end_Hash = new java.util.HashMap<String, Long>();
-	private final java.util.Map<String, Boolean> ok_Hash = new java.util.HashMap<String, Boolean>();
-	private final java.util.Map<String, Object> globalMap = new java.util.HashMap<String, Object>();
-	public  final java.util.List<String[]> globalBuffer = new java.util.ArrayList<String[]>();
-<%
-	} else {
-%>
-	private final java.util.Map<String, Long> start_Hash = java.util.Collections.synchronizedMap(new java.util.HashMap<String, Long>());
-	private final java.util.Map<String, Long> end_Hash = java.util.Collections.synchronizedMap(new java.util.HashMap<String, Long>());
-	private final java.util.Map<String, Boolean> ok_Hash = java.util.Collections.synchronizedMap(new java.util.HashMap<String, Boolean>());
-	private final java.util.Map<String, Object> globalMap = java.util.Collections.synchronizedMap(new java.util.HashMap<String, Object>());
-	public  final java.util.List<String[]> globalBuffer = java.util.Collections.synchronizedList(new java.util.ArrayList<String[]>());
-<% } %>
+	<%
+	//tParallelize will wrap globalMap with synchronizedMap
+	if(!isRunInMultiThread){
+	%>
+		private final java.util.Map<String, Object> globalMap = new java.util.HashMap<String, Object>();
+	<%
+	}else{
+	%>
+		private final java.util.Map<String, Object> globalMap = java.util.Collections.synchronizedMap(new java.util.HashMap<String, Object>());
+	<%
+	}
+	boolean exist_tParallelize = false;
+    List<? extends INode> tParallelizeList = process.getNodesOfType("tParallelize");
+    if(tParallelizeList != null && tParallelizeList.size() > 0){
+        exist_tParallelize = true;
+    }
+	if(!isRunInMultiThread && !exist_tParallelize){
+	%>
+		private final java.util.Map<String, Long> start_Hash = new java.util.HashMap<String, Long>();
+		private final java.util.Map<String, Long> end_Hash = new java.util.HashMap<String, Long>();
+		private final java.util.Map<String, Boolean> ok_Hash = new java.util.HashMap<String, Boolean>();
+		public  final java.util.List<String[]> globalBuffer = new java.util.ArrayList<String[]>();
+	<%
+	}else{
+	%>
+		private final java.util.Map<String, Long> start_Hash = java.util.Collections.synchronizedMap(new java.util.HashMap<String, Long>());
+		private final java.util.Map<String, Long> end_Hash = java.util.Collections.synchronizedMap(new java.util.HashMap<String, Long>());
+		private final java.util.Map<String, Boolean> ok_Hash = java.util.Collections.synchronizedMap(new java.util.HashMap<String, Boolean>());
+		public  final java.util.List<String[]> globalBuffer = java.util.Collections.synchronizedList(new java.util.ArrayList<String[]>());
+	<%
+	}
+	%>
 
 <%
 	if (stats) {
@@ -359,6 +380,11 @@ private class TalendException extends java.lang.Exception {
 	private java.util.Map<String, Object> globalMap = null;
 	private java.lang.Exception e = null;
 	private String currentComponent = null;
+	private String virtualComponentName = null;
+	
+	public void setVirtualComponentName (String virtualComponentName){
+		this.virtualComponentName = virtualComponentName;
+	}
 
 	private TalendException(java.lang.Exception e, String errorComponent, final java.util.Map<String, Object> globalMap) {
 		this.currentComponent= errorComponent;
@@ -374,10 +400,32 @@ private class TalendException extends java.lang.Exception {
 		return this.currentComponent;
 	}
 
+	<%//For TDI-27789%>
+    public String getExceptionCauseMessage(java.lang.Exception e){
+        Throwable cause = e;
+        String message = null;
+        int i = 10;
+        while (null != cause && 0 < i--) {
+            message = cause.getMessage();
+            if (null == message) {
+                cause = cause.getCause();
+            } else {
+                break;          
+            }
+        }
+        if (null == message) {
+            message = e.getClass().getName();
+        }   
+        return message;
+    }
+
 	@Override
 	public void printStackTrace() {
 		if (!(e instanceof TalendException || e instanceof TDieException)) {
-			 globalMap.put(currentComponent+"_ERROR_MESSAGE",e.getMessage());
+			if(virtualComponentName!=null && currentComponent.indexOf(virtualComponentName+"_")==0){
+				globalMap.put(virtualComponentName+"_ERROR_MESSAGE",getExceptionCauseMessage(e));
+			}
+			 globalMap.put(currentComponent+"_ERROR_MESSAGE",getExceptionCauseMessage(e));
 			System.err.println("Exception in component " + currentComponent);
 		}
 		if (!(e instanceof TDieException)) {
@@ -514,7 +562,11 @@ private class TalendException extends java.lang.Exception {
 								// 1) add the message to the stack
 								%>
 								if(!(exception instanceof TDieException)){
-									<%=assertCatcher.getUniqueName()%>.addMessage(pid, projectName, jobName, "java", null, "Failed", "Job execution error", exception.getMessage());
+									<%if("true".equals(ElementParameterParser.getValue(assertCatcher, "__GET_ORIGINAL_EXCEPTION__"))){%>
+										<%=assertCatcher.getUniqueName()%>.addMessage(pid, projectName, jobName, "java", null, "Failed", "Job execution error", exception);
+									<%}else{%>
+										<%=assertCatcher.getUniqueName()%>.addMessage(pid, projectName, jobName, "java", null, "Failed", "Job execution error", exception.getMessage());
+									<%}%>
 									<%=assertCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
 								}
 								<%

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

@@ -34,6 +34,8 @@
 	IProcess process = (IProcess) v.get(0);
 	String version = (String) v.get(1);
 
+	boolean isStudioEEVersion = org.talend.core.PluginChecker.isTIS();
+	
 	List<? extends INode> processNodes = (List<? extends INode>) process.getGeneratingNodes();
 	List<? extends INode> graphicalNodes = (List<? extends INode>) process.getGraphicalNodes();
 	boolean stats = codeGenArgument.isStatistics();
@@ -85,6 +87,8 @@ package <%= packageName %>;
 	importsSet.add("import  java.util.Properties");
 	importsSet.add("import  org.apache.camel.management.JmxNotificationEventNotifier");
 	importsSet.add("import  org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext");
+	importsSet.add("import  org.apache.camel.impl.SimpleRegistry");
+	importsSet.add("import  java.util.Set");
 	
 	String headerImports = ElementParameterParser.getValue(process, "__HEADER_IMPORT__");
 	if(headerImports!=null && !"".equals(headerImports.trim())){
@@ -162,16 +166,49 @@ package <%= packageName %>;
 %>
 
 <%
+
 	for (INode node : graphicalNodes) {
+		String useRegistry = "false";
+		String dataFormat = ElementParameterParser.getValue(node, "__DATAFORMAT__");
+		if(isStudioEEVersion && !"RAW".equals(dataFormat) && !"CXF_MESSAGE".equals(dataFormat)){
+		 	useRegistry = ElementParameterParser.getValue(node, "__ENABLE_REGISTRY__");
+		}
 		if("cCXF".equals(node.getComponent().getName()) 
 							&& "true".equals(ElementParameterParser.getValue(node, "__ENABLE_SAM__"))  
-							&& !"RAW".equals(ElementParameterParser.getValue(node, "__DATAFORMAT__"))) { %>
+							&& !"RAW".equals(ElementParameterParser.getValue(node, "__DATAFORMAT__"))&& !"true".equals(useRegistry) ) { %>
 			//ESB Service Activity Monitor Feature
-			private org.apache.cxf.feature.AbstractFeature eventFeature;
+			private org.apache.cxf.feature.Feature eventFeature;
 
-			public void setEventFeature(org.apache.cxf.feature.AbstractFeature eventFeature) {
+			public void setEventFeature(org.apache.cxf.feature.Feature eventFeature) {
 				this.eventFeature = eventFeature;
 			}
+
+// https://issues.apache.org/jira/browse/CAMEL-6783
+static class FeatureWrapper extends org.apache.cxf.feature.AbstractFeature {
+
+	private final org.apache.cxf.feature.Feature f;
+
+	public FeatureWrapper(org.apache.cxf.feature.Feature f) {
+		this.f = f;
+	}
+
+	public void initialize(org.apache.cxf.endpoint.Server server, org.apache.cxf.Bus bus) {
+		f.initialize(server, bus);
+	}
+
+	public void initialize(org.apache.cxf.endpoint.Client client, org.apache.cxf.Bus bus) {
+		f.initialize(client, bus);
+	}
+
+	public void initialize(org.apache.cxf.interceptor.InterceptorProvider interceptorProvider, org.apache.cxf.Bus bus) {
+		f.initialize(interceptorProvider, bus);
+	}
+
+	public void initialize(org.apache.cxf.Bus bus) {
+		f.initialize(bus);
+	}
+}
+
 			<% break;
 		}
 	}
@@ -278,6 +315,35 @@ for (INode node : graphicalNodes) {
 				uri = uri + sb.toString();
 			}
 		}
+	}else if("cDirectVM".equals(componentName)){
+		boolean inputName= getBoolValue(node, "____INPUT_ENDPOINT_NAME____");
+		boolean isProducer = node.getIncomingConnections().size()>0;
+		
+		INode consumerNode = node;
+		if(isProducer && !inputName){
+			String desNodeName= (String)getValue(node, "____ROUTE_COMPONENT_TYPE_ID____");
+			if(desNodeName!=null){
+				List<? extends INode> allNodes = node.getProcess().getGraphicalNodes();
+				for(INode aNode : allNodes){
+					if(aNode.getUniqueName().equals(desNodeName)){
+						consumerNode=aNode;
+						break;
+					}
+				}
+			}
+		}
+		
+		String endpointName=getValue(consumerNode, "__ENDPOINT_NAME__");
+		
+		uri="\"direct-vm:\"+" + endpointName;
+		
+		if(isProducer){
+			boolean isBlock= getBoolValue(node, "____BLOCK____");
+			if(isBlock){
+				uri += "+\"?block=true&timeout="+getValue(consumerNode, "__TIMEOUT__")+"\"";
+			}
+		}
+			
 	}else if("cTimer".equals(componentName)){
 		uri = "\"timer:\"+\""+node.getUniqueName()+"\"";
 		StringBuilder sb = new StringBuilder();
@@ -297,7 +363,7 @@ for (INode node : graphicalNodes) {
 			}
 		}
 		String delay = ElementParameterParser.getValue(node, "__DELAY__");
-		if(delay!=null && !delay.trim().equals("") && !"1000".equals(delay)){
+		if(delay!=null && !delay.trim().equals("")){
 			if(sb.length()==0){
 				sb.append("+\"?delay=\"+");
 				sb.append(delay);
@@ -442,16 +508,26 @@ for (INode node : graphicalNodes) {
 
 	} else if ("cCXF".equals(componentName)) {
 		String url = ElementParameterParser.getValue(node, "__ADDRESS__").trim();
-
+		
+		
+		String dataformat = ElementParameterParser.getValue(node, "__DATAFORMAT__");
+		
+		String useServiceRegistry = ElementParameterParser.getValue(node, "__ENABLE_REGISTRY__");
+		if(!isStudioEEVersion || "RAW".equals(dataformat) || "CXF_MESSAGE".equals(dataformat)){
+			useServiceRegistry = "false";
+		}
+		
+		String useSecurity = ElementParameterParser.getValue(node, "__ENABLE_SECURITY__");
+		if("true".equals(useServiceRegistry) || "RAW".equals(dataformat) || "CXF_MESSAGE".equals(dataformat)){
+			useSecurity = "false";
+		}
+		
 		List<? extends IConnection> conns = node.getIncomingConnections();
-		if ("true".equals(ElementParameterParser.getValue(node, "__ENABLE_SL__"))) {
+		if ("true".equals(ElementParameterParser.getValue(node, "__ENABLE_SL__")) 
+				&&  "false".equals(useServiceRegistry)) {
 			if (!conns.isEmpty()) {
-				INode source = conns.get(0).getSource();
-				if (!("cErrorHandler".equals(source.getComponent().getName())
-						&& source.getIncomingConnections().isEmpty())) {
-					// consumer role
-					url = "((null == bundleContext) ? " + url + " : \"locator://locator/\")";
-				}
+				// consumer role
+				url = "((null == bundleContext) ? " + url + " : \"locator://locator/\")";
 			}
 		}
 
@@ -479,7 +555,7 @@ for (INode node : graphicalNodes) {
 		}
 
 
-		String dataformat = ElementParameterParser.getValue(node, "__DATAFORMAT__");
+
 		sb.append("+\"&dataFormat=" + dataformat + "\"");
 
 		String specifyService = ElementParameterParser.getValue(node, "__SPECIFY_SERVICE__");
@@ -497,6 +573,11 @@ for (INode node : graphicalNodes) {
 		
 		if(!conns.isEmpty()){
 			sb.append("+\"&headerFilterStrategy=#CXF_PAYLOAD_HEADER_FILTER\"");
+			sb.append("+\"&properties.id=\"+\"");
+			sb.append(node.getUniqueName());
+			sb.append("\"");
+		}else if("true".equals(useServiceRegistry) || ("true".equals(useSecurity) && "SAML".equals(ElementParameterParser.getValue(node, "__SECURITY_TYPE__")))) {
+			sb.append("+\"&cxfBinding=#DEFAULT_CXF_BINDING\"");
 		}
 		uri = sb.toString();
 
@@ -589,7 +670,11 @@ for (INode node : graphicalNodes) {
 		}
 
 		StringBuffer sb = new StringBuffer();
-		sb.append("\"log:").append(cid);
+		sb.append("\"log:");
+		String logName = ElementParameterParser.getValue(node, "__LOGGING_CATEGORY__");
+		if(logName != null) {
+			sb.append("\"+").append(logName).append("+\"");
+		}
 
 		String level = ElementParameterParser.getValue(node, "__LEVEL_TYPE__");
 		sb.append("?").append("level=").append(level);

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

@@ -12,16 +12,20 @@
 		org.talend.designer.codegen.config.NodesSubTree
 		org.talend.core.model.utils.NodeUtil 
   		java.util.List
- 		 java.util.Set
+ 		java.util.Set
   		java.util.HashSet
 		java.util.Iterator
+		java.util.Vector	
 	"
 	class="IterateSubProcessFooter" 
 	skeleton="subprocess_header_java.skeleton"
 %>
 <%
 	CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
-	INode node = (INode)codeGenArgument.getArgument();
+	Vector v = (Vector) codeGenArgument.getArgument();
+    INode node = (INode) v.get(0);
+    String finallyPart = v.get(1).toString();
+	
 	ECodePart codePart = codeGenArgument.getCodePart();
 	//boolean trace = codeGenArgument.isTrace();
 	boolean stat = codeGenArgument.isStatistics();
@@ -51,57 +55,74 @@
     				schemaInstanceDeclaration = "," + schemaInstanceDeclaration.substring(0,schemaInstanceDeclaration.length()-1); 
     			}
 				if(stat){
-%>
-if(execStat){
-				runStat.updateStatOnConnection("<%=iterateConn.getUniqueName() %>",2,"exec"+iterateId);
-}				
-<%
+				%>
+					if(execStat){
+						runStat.updateStatOnConnection("<%=iterateConn.getUniqueName() %>",2,"exec"+iterateId);
+					}				
+				<%
 				}
-%>
-			} catch (java.lang.Exception e) {
-					this.status = "failure";
-					Integer localErrorCode = (Integer) (((java.util.Map) threadLocal.get()).get("errorCode"));
-					if (localErrorCode != null) {
-						if (this.errorCode == null || localErrorCode.compareTo(this.errorCode) > 0) {
-							this.errorCode = localErrorCode;
-						}
-					}					
-		            talendThreadPool.setErrorThread(this);
-		            talendThreadPool.stopAllWorkers();		            
-
-                    new TalendException(e, currentComponent, globalMap).printStackTrace();
-
-			}
-			this.isRunning = false;
-			
-			Integer localErrorCode = (Integer) (((java.util.Map) threadLocal.get()).get("errorCode"));
-			String localStatus = (String) (((java.util.Map) threadLocal.get()).get("status"));
-			if (localErrorCode != null) {
-				if (this.errorCode == null || localErrorCode.compareTo(this.errorCode) > 0) {
-					this.errorCode = localErrorCode;
-				}
-			} 
-			if (!this.status.equals("failure")) {
-				this.status = localStatus;
-			}
-			
-			talendThreadPool.getTalendThreadResult().setErrorCode(this.errorCode);
-			talendThreadPool.getTalendThreadResult().setStatus(this.status);						
-		}
-	}
-
-	<%=node.getUniqueName() %>Thread bt_<%=node.getUniqueName() %> = new <%=node.getUniqueName() %>Thread(globalMap<%=schemaInstanceDeclaration %>,threadIdCounter++);
-	mtp_<%=node.getUniqueName() %>.execute(bt_<%=node.getUniqueName() %>);
+				%>
+						} catch (java.lang.Exception e) {
+							this.status = "failure";
+							Integer localErrorCode = (Integer) (((java.util.Map) threadLocal.get()).get("errorCode"));
+							if (localErrorCode != null) {
+								if (this.errorCode == null || localErrorCode.compareTo(this.errorCode) > 0) {
+									this.errorCode = localErrorCode;
+								}
+							}					
+				            		            
+		                    TalendException te = new TalendException(e, currentComponent, globalMap);
+							<%
+							if(NodeUtil.hasVirtualComponent(subTree.getNodes())){
+							%>
+								te.setVirtualComponentName(currentVirtualComponent);
+							<%
+							}
+							%>
+							this.exception = te;
+							talendThreadPool.setErrorThread(this);
+				            talendThreadPool.stopAllWorkers();
 	
-<%
+						} finally {
+							try{
+								<%=finallyPart%>
+							}catch(java.lang.Exception e){	
+								//ignore
+							}catch(java.lang.Error error){
+								//ignore
+							}
+							resourceMap = null;
+						}
+						this.isRunning = false;
+				
+						Integer localErrorCode = (Integer) (((java.util.Map) threadLocal.get()).get("errorCode"));
+						String localStatus = (String) (((java.util.Map) threadLocal.get()).get("status"));
+						if (localErrorCode != null) {
+							if (this.errorCode == null || localErrorCode.compareTo(this.errorCode) > 0) {
+								this.errorCode = localErrorCode;
+							}
+						} 
+						if (!this.status.equals("failure")) {
+							this.status = localStatus;
+						}
+						
+						talendThreadPool.getTalendThreadResult().setErrorCode(this.errorCode);
+						talendThreadPool.getTalendThreadResult().setStatus(this.status);						
+					}
+				}
+
+				<%=node.getUniqueName() %>Thread bt_<%=node.getUniqueName() %> = new <%=node.getUniqueName() %>Thread(globalMap<%=schemaInstanceDeclaration %>,threadIdCounter++);
+				mtp_<%=node.getUniqueName() %>.execute(bt_<%=node.getUniqueName() %>);
+
+				<%
 				continue;
 			}else {//3
 	      		if(stat){
-%>
-if(execStat){
-				runStat.updateStatOnConnection("<%=iterateConn.getUniqueName() %>", 2, "exec" + NB_ITERATE_<%=iterateNodeName %>);
-}				
-<%
+				%>
+					if(execStat){
+						runStat.updateStatOnConnection("<%=iterateConn.getUniqueName() %>", 2, "exec" + NB_ITERATE_<%=iterateNodeName %>);
+					}				
+				<%
 		  		}
 		  	}//3				
 		}//2

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

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

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

@@ -10,21 +10,27 @@
 		org.talend.core.model.process.ElementParameterParser
 		java.util.List
 		java.util.Iterator
+        java.util.Vector		
+        org.talend.core.model.process.IProcess
+        org.talend.core.model.utils.NodeUtil
 	" 
 	class="SubProcessFooter" 
 %>
 <%
 	CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
+	Vector v = (Vector) codeGenArgument.getArgument();
+    NodesSubTree subTree = (NodesSubTree) v.get(0);
+    String finallyPart = v.get(1).toString();
 	boolean stat = codeGenArgument.isStatistics();
-	NodesSubTree subTree = (NodesSubTree) codeGenArgument.getArgument();
-	
-	for (INode node : subTree.getNodes()) {
+	IProcess process = subTree.getRootNode().getProcess();
+    boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(process, "__LOG4J_ACTIVATE__"));
+	for(INode node : subTree.getNodes()){
 		List<IMetadataTable> metadatas = node.getMetadataList();
 		List< ? extends IConnection> conns = node.getOutgoingConnections();
 	}
 
 	boolean isParallelize = false;
-	for (INode node : subTree.getNodes()) {
+	for(INode node : subTree.getNodes()){
 		if(node!=null){
 			String parallelize = ElementParameterParser.getValue(node, "__PARALLELIZE__");
 			if(parallelize!=null &&parallelize.equals("true")){
@@ -34,7 +40,7 @@
 		}
 	}
 	if(isParallelize){
-%>
+	%>
 
 					} catch (java.lang.Exception e) {
 						this.status = "failure";
@@ -76,7 +82,7 @@
 				}
 			} else {
 				// Start a new thread
-				<%=subTree.getName() %>_ParallelThread pt = new <%=subTree.getName()%>_ParallelThread(
+				<%=subTree.getName()%>_ParallelThread pt = new <%=subTree.getName()%>_ParallelThread(
 						globalMap, (Object[]) globalMap
 								.get("PARALLEL_FLOW_LOCK_<%=(subTree.getName()).replaceAll("tAsyncIn", "tAsyncOut")%>"));
 				pt.putBuffer(buffer);
@@ -87,199 +93,210 @@
 		} catch (java.lang.Exception te) {
 			throw new TalendException(te, currentComponent, globalMap);
 		}
-<%
+	<%
 	}else{
-%>
+	%>
+				}//end the resume
 
-
-
-<%
-//this part for "Resume Management"
-{
-    INode firstNode = subTree.getNode(subTree.getName());
-    
-    List<String> beforeSubProcesses = subTree.getBeforeSubProcesses();
-    
-    //System.out.println(firstNode.getUniqueName());
-    List<? extends IConnection> outConns = firstNode.getOutgoingConnections();
-    
-    //System.out.println(inConns.size());
-    for(IConnection conn : outConns){
-    
-//    	boolean activeResume = "true".equals(ElementParameterParser.getValue(conn, "__RESUMING_CHECKPOINT__"));
-    	boolean activeResume = true;
-    	
-    	//System.out.println("Test:" + ElementParameterParser.getValue(conn, "__RESUMING_CHECKPOINT__"));
-    	
-    	String uniqueNameTargetNode = conn.getTarget().getUniqueName();
-    	
-   		EConnectionType lineStyle = conn.getLineStyle();
-
-    }
-}
-%>
-}//end the resume
-
-<%
-//this part for "Resume Management"
-{
-    INode firstNode = subTree.getNode(subTree.getName());
-    
-    List<String> beforeSubProcesses = subTree.getBeforeSubProcesses();
-    
-    //System.out.println(firstNode.getUniqueName());
-    List<? extends IConnection> outConns = firstNode.getOutgoingConnections();
-    
-    //System.out.println(inConns.size());
-    for(IConnection conn : outConns){
-    
-//    	boolean activeResume = "true".equals(ElementParameterParser.getValue(conn, "__RESUMING_CHECKPOINT__"));
-    	boolean activeResume = true;
-    	
-    	//System.out.println("Test:" + ElementParameterParser.getValue(conn, "__RESUMING_CHECKPOINT__"));
-    	
-    	String uniqueNameTargetNode = conn.getTarget().getUniqueName();
-    	
-   		EConnectionType lineStyle = conn.getLineStyle();
-
-		if(beforeSubProcesses.indexOf(uniqueNameTargetNode) != -1) {   		
-	    	if(activeResume){
-	    		%>
-	    			if( resumeEntryMethodName == null || globalResumeTicket){
-	    				resumeUtil.addLog("CHECKPOINT", "CONNECTION:<%=lineStyle.getName() %>:<%=subTree.getName() %>:<%=conn.getName() %><%=conn.getOutputId() > 0 ? conn.getOutputId() : "" %>", "", Thread.currentThread().getId() + "", "", "", "", "", "");
-					}	    				    			
-	    		<%
-	    	}
-	    	%>
-    		<%
-			if(stat){
-			%>
-				if(execStat){    	
-					runStat.updateStatOnConnection("<%=conn.getUniqueName() %>", 0, "ok");
-				} 
-			<%
-			}
-%>
-			<%= uniqueNameTargetNode %>Process(globalMap); 
-<%
-    	}
-    }
-}
-%>
-
-<%	
-	if (subTree.getRootNode().getProcess().getNodesOfType("tFlowMeterCatcher").size() > 0 
-		&& subTree.getRootNode().getProcess().getNodesOfType("tFlowMeter").size() >0 ) {
-		List<INode> metterCatchers = (List<INode>)subTree.getRootNode().getProcess().getNodesOfType("tFlowMeterCatcher");
-		List<INode> metters = (List<INode>)subTree.getRootNode().getProcess().getNodesOfType("tFlowMeter");
-		List<INode> nodes = (List<INode>)subTree.getNodes();
-		
-		boolean hasMetterProcess = false;
-		for(INode tmp : nodes)
-		{
-			for(INode metter : metters)
-			{
-				if(tmp.getUniqueName().equals(metter.getUniqueName()))
-				{
-					hasMetterProcess = true;
-					break;
+				<%	
+				if(subTree.getRootNode().getProcess().getNodesOfType("tFlowMeterCatcher").size() > 0 
+				  && subTree.getRootNode().getProcess().getNodesOfType("tFlowMeter").size() > 0){
+					List<INode> metterCatchers = (List<INode>)subTree.getRootNode().getProcess().getNodesOfType("tFlowMeterCatcher");
+					List<INode> metters = (List<INode>)subTree.getRootNode().getProcess().getNodesOfType("tFlowMeter");
+					List<INode> nodes = (List<INode>)subTree.getNodes();
+					
+					boolean hasMetterProcess = false;
+					for(INode tmp : nodes){
+						for(INode metter : metters){
+							if(tmp.getUniqueName().equals(metter.getUniqueName())){
+								hasMetterProcess = true;
+								break;
+							}
+						}
+						if(hasMetterProcess){
+							break;
+						}
+					}
+					if(hasMetterProcess){
+						for(INode metterCatcher : metterCatchers){
+						%>
+							<%=metterCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
+						<%      
+						}
+					}
 				}
-			}
-			if(hasMetterProcess)
-			{
-				break;
-			}
-		}
-		if(hasMetterProcess)
-		{
-			for (INode metterCatcher : metterCatchers) {
 				
-%>
-	<%=metterCatcher.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
-<%      
-
-			}
-		}
-	}
-%>
-
-	
-	} catch(java.lang.Exception e) {	
-
-		throw new TalendException(e, currentComponent, globalMap);
-	
-	} catch(java.lang.Error error) {
-	
-<%
-	if(stat){
-%>
-		runStat.stopThreadStat();
-<%
-	}
-%>
-		throw error;
-
-	}
-<%
-	//generate the code to free memory for lookup link and virtual component buffered datas 
-	boolean firstIn = true;
-	boolean needGc = false;
-	List<INode> nodes = subTree.getNodes();
-	for(INode node:nodes){
-	
-	boolean isVirtualGenerateNode = node.isVirtualGenerateNode();
-	
-	//check the virtual component generate node
-	if(isVirtualGenerateNode){
-		String origin  = ElementParameterParser.getValue(node, "__ORIGIN__");
-		if(origin != null && !"".equals(origin)){
-			if(!needGc) needGc = true;
-	%>
-				<%if(firstIn){%> finally{ <% firstIn = false;}%>
-				//free memory for "<%=node.getUniqueName() %>"
-				globalMap.remove("<%=origin %>");
-	<%
-		}
-	}else{
-	//check the Lookup link
-		List<? extends IConnection> lookupInput = node.getIncomingConnections(EConnectionType.FLOW_REF);
-		if(lookupInput!=null && lookupInput.size()>0){
-			if(!needGc) needGc = true;
-			//check the tMap like this, instanceof can't work			
-			if(node.getClass().getName().equals("org.talend.designer.mapper.MapperComponent")){
-				for(IConnection connection:lookupInput){						
-     %>
-     			<%if(firstIn){%> finally{ <% firstIn = false;}%>
-     			//free memory for "<%=node.getUniqueName() %>"
-     			globalMap.remove("tHash_Lookup_<%=connection.getName() %>"); 
-     <%
-            	}
-            }else{
-            	for(IConnection connection:lookupInput){
-      %>      	
-      			<%if(firstIn){%> finally{ <% firstIn = false;}%>
-      			//free memory for "<%=node.getUniqueName() %>"
-				globalMap.remove("tHash_<%=connection.getName() %>");
-      <%      		 
-				} 
-			} 
-		}
-	}
-}
-
-	if(needGc) {
-	%>		
+				//this part for "Resume Management"
+				{
+				    INode firstNode = subTree.getNode(subTree.getName());
+				    
+				    List<String> beforeSubProcesses = subTree.getBeforeSubProcesses();
+				    
+				    //System.out.println(firstNode.getUniqueName());
+				    List<? extends IConnection> outConns = firstNode.getOutgoingConnections();
+				    
+				    //System.out.println(inConns.size());
+				    for(IConnection conn : outConns){
+				    
+						//boolean activeResume = "true".equals(ElementParameterParser.getValue(conn, "__RESUMING_CHECKPOINT__"));
+				    	boolean activeResume = true;
+				    	
+				    	//System.out.println("Test:" + ElementParameterParser.getValue(conn, "__RESUMING_CHECKPOINT__"));
+				    	
+				    	String uniqueNameTargetNode = conn.getTarget().getUniqueName();
+				    	
+				   		EConnectionType lineStyle = conn.getLineStyle();
 				
-		}		
-	<%
-	}
-}//isParallelize
-	%>
+						if(beforeSubProcesses.indexOf(uniqueNameTargetNode) != -1){   		
+					    	if(activeResume){
+					    	%>
+				    			if(resumeEntryMethodName == null || globalResumeTicket){
+				    				resumeUtil.addLog("CHECKPOINT", "CONNECTION:<%=lineStyle.getName() %>:<%=subTree.getName() %>:<%=conn.getName() %><%=conn.getOutputId() > 0 ? conn.getOutputId() : "" %>", "", Thread.currentThread().getId() + "", "", "", "", "", "");
+								}	    				    			
+					    	<%
+					    	}
+							if(stat){
+							%>
+								if(execStat){    	
+									runStat.updateStatOnConnection("<%=conn.getUniqueName() %>", 0, "ok");
+								} 
+							<%
+							}
+							%>
+							<%= uniqueNameTargetNode %>Process(globalMap); 
+						<%
+				    	}
+				    }
+				}
+				%>
+
+
+
 	
-	globalMap.put("<%=subTree.getName() %>_SUBPROCESS_STATE", 1);
-}
-<% if (subTree.isMethodSizeNeeded()){ %>
-/**
- * End of Function: <%=subTree.getName() %>Process 
- */
- <% } %>
+			}catch(java.lang.Exception e){	
+				<%
+				if(isLog4jEnabled){
+				%>
+					log.error(currentComponent + " " + e.getMessage());
+				<%
+				}
+				%>
+				TalendException te = new TalendException(e, currentComponent, globalMap);
+				<%
+				if(NodeUtil.hasVirtualComponent(subTree.getNodes())){
+				%>
+					te.setVirtualComponentName(currentVirtualComponent);
+				<%
+				}
+				for(INode node : subTree.getNodes()){
+					if(node!=null){
+						if("tDepartitioner".equals(node.getComponent().getName())){
+							String cid = node.getUniqueName();
+							%>
+							if(resourceMap.get("finish_<%=cid%>") == null){
+								if(resourceMap.get("start_<%=cid%>") != null){
+									<%if(isLog4jEnabled){%>
+										log.error("<%=cid%>[" + Thread.currentThread().getName() + "] - " + e.getMessage());
+									<%}%>
+									globalMap.put("THREADS_HAVE_ERROR", e);
+									return;
+								}
+							}
+						<%	
+						}
+					}
+				}
+				%>
+				throw te;
+			}catch(java.lang.Error error){	
+				<%
+				if(stat){
+				%>
+					runStat.stopThreadStat();
+				<%
+				}
+				for(INode node : subTree.getNodes()){
+					if(node!=null){
+						if("tDepartitioner".equals(node.getComponent().getName())){
+							String cid = node.getUniqueName();
+							%>
+							if(resourceMap.get("finish_<%=cid%>") == null){
+								if(resourceMap.get("start_<%=cid%>") != null){
+									<%if(isLog4jEnabled){%>
+										log.error("<%=cid%>[" + Thread.currentThread().getName() + "] - " + error.getMessage());
+									<%}%>
+									globalMap.put("THREADS_HAVE_ERROR",error);
+									return;
+								}
+							}
+						<%	
+						}
+					}
+				}
+				%>
+				throw error;
+			}finally{
+				<%
+				//generate the code to free memory for lookup link and virtual component buffered datas 
+				List<INode> nodes = subTree.getNodes();
+				for(INode node:nodes){
+				
+					boolean isVirtualGenerateNode = node.isVirtualGenerateNode();
+					
+					//check the virtual component generate node
+					if(isVirtualGenerateNode){
+						String origin  = ElementParameterParser.getValue(node, "__ORIGIN__");
+						if(origin != null && !"".equals(origin)){
+						%>
+							//free memory for "<%=node.getUniqueName()%>"
+							globalMap.remove("<%=origin%>");
+						<%
+						}
+					}else{
+					//check the Lookup link
+						List<? extends IConnection> lookupInput = node.getIncomingConnections(EConnectionType.FLOW_REF);
+						if(lookupInput!=null && lookupInput.size()>0){
+							//check the tMap like this, instanceof can't work			
+							if(node.getClass().getName().equals("org.talend.designer.mapper.MapperComponent")){
+								for(IConnection connection:lookupInput){						
+				     			%>
+					     			//free memory for "<%=node.getUniqueName()%>"
+					     			globalMap.remove("tHash_Lookup_<%=connection.getName()%>"); 
+				     			<%
+				            	}
+				            }else{
+				            	for(IConnection connection:lookupInput){
+				      			%>      	
+					      			//free memory for "<%=node.getUniqueName()%>"
+									globalMap.remove("tHash_<%=connection.getName()%>");
+				      			<%      		 
+								} 
+							} 
+						}
+					}
+				}
+				%>
+				try{
+					<%=finallyPart%>
+				}catch(java.lang.Exception e){	
+					//ignore
+				}catch(java.lang.Error error){
+					//ignore
+				}
+				resourceMap = null;
+			}
+		<%
+		}//isParallelize
+		%>
+
+		globalMap.put("<%=subTree.getName() %>_SUBPROCESS_STATE", 1);
+	}
+	<%
+	if(subTree.isMethodSizeNeeded()){ 
+	%>
+		/**
+		 * End of Function: <%=subTree.getName() %>Process 
+			 */
+ 		<%
+ 		}
+ 		%>

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

@@ -58,10 +58,15 @@
 						hSet.add(conn.getName() + templateOrigin);
 						IMetadataTable metadata = conn.getMetadataTable();
 						
-						
+						boolean changeHashAndEqualsForBigDecimal = false;
 						Set<String> hashableColumnsNames = new HashSet<String>();
-						if(conn.getTarget() instanceof IHashableInputConnections) {
-							IHashableInputConnections target = (IHashableInputConnections) conn.getTarget();
+						
+						INode targetNode = conn.getTarget();
+						if(targetNode instanceof IHashableInputConnections) {
+							if(targetNode.getUniqueName().startsWith("tMap")) {
+								changeHashAndEqualsForBigDecimal = "true".equals(ElementParameterParser.getValue(targetNode, "__CHANGE_HASH_AND_EQUALS_FOR_BIGDECIMAL__"));
+							}
+							IHashableInputConnections target = (IHashableInputConnections)targetNode;
 							IHashConfiguration hashConfiguration = target.getHashConfiguration(conn.getName());
 							if(hashConfiguration != null) {
 								for(IHashableColumn hashableColumn : hashConfiguration.getHashableColumns()) {
@@ -195,6 +200,10 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 						result = prime * result + java.util.Arrays.hashCode(this.<%=column.getLabel() %>);
 						<%
 					
+					} else if((javaType == JavaTypesManager.BIGDECIMAL) && changeHashAndEqualsForBigDecimal) {
+						%>
+						result = prime * result + ((this.<%=column.getLabel() %> == null) ? 0 : new Double(this.<%=column.getLabel() %>.doubleValue()).hashCode());
+						<%
 					} else {
 					%>
 						result = prime * result + ((this.<%=column.getLabel() %> == null) ? 0 : this.<%=column.getLabel() %>.hashCode());
@@ -240,7 +249,11 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 						if (this.<%=column.getLabel() %> == null) {
 							if (other.<%=column.getLabel() %> != null) 
 								return false;
-						} else if (!this.<%=column.getLabel() %>.equals(other.<%=column.getLabel() %>)) 
+						<%if((javaType == JavaTypesManager.BIGDECIMAL) && changeHashAndEqualsForBigDecimal) {%>
+						} else if ((other.<%=column.getLabel() %> == null) || (this.<%=column.getLabel() %>.compareTo(other.<%=column.getLabel() %>)!=0))
+						<%} else {%>
+						} else if (!this.<%=column.getLabel() %>.equals(other.<%=column.getLabel() %>))
+						<%}%> 
 							return false;
 					<%
 					}
@@ -1007,12 +1020,18 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
 	
 <%
 	}else{//isParallelize
+	if(NodeUtil.hasVirtualComponent(subTree.getNodes())){
+%>
+		String currentVirtualComponent = null;
+<%
+	}
 %>
 
 	String iterateId = "";
 	int iterateLoop = 0;
 	String currentComponent = "";
-				
+	java.util.Map<String, Object> resourceMap = new java.util.HashMap<String, Object>();
+					
 	try {
 	
 			String currentMethodName = new java.lang.Exception().getStackTrace()[0].getMethodName();

org.talend.designer.codegen/schema/componentFilter.exsd

@@ -0,0 +1,102 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.talend.designer.codegen" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.talend.designer.codegen" id="componentFilter" name="Component filter"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="Filter"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="Filter">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.talend.designer.codegen.components.model.IComponentFactoryFilter"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>

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

@@ -50,6 +50,7 @@ ComponentsFactory.parentNotRecompiled=Warning\: parents of *.inc.javajet are not
 ComponentsLocalProviderService.componentLoadError=Component load error
 ComponentsLocalProviderService.talendExchangeError=Talend Exchange Error
 ComponentsPreferencePage.ButtonLabel0=Ok 
+ComponentsPreferencePage.componentAssist=Enable Component Creation Assistant
 ComponentsPreferencePage.configuration.LINK_STYLE=Default mapping links display as :
 ComponentsPreferencePage.rowLimit=Row limit
 ComponentsPreferencePage.WarningMsg=Need to restart Talend Open Studio to load extral components !

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

@@ -45,6 +45,7 @@ import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.repository.model.RepositoryFactoryProvider;
 import org.talend.core.repository.utils.ProjectHelper;
 import org.talend.designer.codegen.i18n.Messages;
+import org.talend.repository.model.RepositoryConstants;
 
 /***/
 public class CodeGenInit implements IApplication {
@@ -157,7 +158,8 @@ public class CodeGenInit implements IApplication {
         Context ctx = CorePlugin.getContext();
         ctx.putProperty(Context.REPOSITORY_CONTEXT_KEY, repositoryContext);
 
-        repositoryFactory.setRepositoryFactoryFromProvider(RepositoryFactoryProvider.getRepositoriyById("local")); //$NON-NLS-1$
+        repositoryFactory.setRepositoryFactoryFromProvider(RepositoryFactoryProvider
+                .getRepositoriyById(RepositoryConstants.REPOSITORY_LOCAL_ID));
         repositoryFactory.initialize();
     }
 

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

@@ -31,6 +31,7 @@ import org.talend.core.language.ECodeLanguage;
 import org.talend.core.model.components.IComponentFileNaming;
 import org.talend.core.model.components.IComponentsFactory;
 import org.talend.core.model.process.EConnectionType;
+import org.talend.core.model.process.ElementParameterParser;
 import org.talend.core.model.process.IConnection;
 import org.talend.core.model.process.IConnectionCategory;
 import org.talend.core.model.process.IContext;
@@ -98,7 +99,7 @@ public class CodeGenerator implements ICodeGenerator {
 
     private String exportAsOSGI = "false";
 
-    private static final long INIT_TIMEOUT = 15000; // 15s
+    private static final long INIT_TIMEOUT = 15 * 60 * 1000; // 15s
 
     private static final long INIT_PAUSE = 1000; // 1s
 
@@ -205,6 +206,7 @@ public class CodeGenerator implements ICodeGenerator {
      * @return the generated code
      * @throws CodeGeneratorException if an error occurs during Code Generation
      */
+    @Override
     @SuppressWarnings("unchecked")
     public String generateProcessCode() throws CodeGeneratorException {
         // Parse Process, generate Code for Individual Components
@@ -273,14 +275,12 @@ public class CodeGenerator implements ICodeGenerator {
                         // Fix bug TESB-2951 Generated Codes error when Route
                         // starts with cFile/cFTP/cActiveMQ/cFTP/cJMS
                         // LiXiaopeng 2011-09-05
-						INode subProcessStartNode = subTree.getRootNode()
-								.getSubProcessStartNode(true);
-						String startNodeName = subProcessStartNode
-								.getComponent().getName();
-						IElementParameter family = subProcessStartNode.getElementParameter("FAMILY");
-						if(subProcessStartNode.isStart() && null != family && "Messaging".equals(family.getValue())){
+                        INode subProcessStartNode = subTree.getRootNode().getSubProcessStartNode(true);
+                        String startNodeName = subProcessStartNode.getComponent().getName();
+                        IElementParameter family = subProcessStartNode.getElementParameter("FAMILY");
+                        if (subProcessStartNode.isStart() && null != family && "Messaging".equals(family.getValue())) {
                             nodeSubTreeList.add(subTree);
-						} else if ("cConfig".equals(startNodeName)) {
+                        } else if ("cConfig".equals(startNodeName)) {
                             // Customized remove the cConfig routeId codes.
                             // TESB-2825 LiXP 20110823
                             // Do nothing.
@@ -327,8 +327,15 @@ public class CodeGenerator implements ICodeGenerator {
                             componentsCode.append(generateTypedComponentCode(EInternalTemplate.PART_ENDMAIN,
                                     subTree.getRootNode()));
                             componentsCode.append(generateComponentsCode(subTree, subTree.getRootNode(), ECodePart.END, null));
-                            componentsCode.append(generateTypedComponentCode(EInternalTemplate.SUBPROCESS_FOOTER, subTree));
+                            StringBuffer finallyPart = new StringBuffer();
+                            finallyPart.append(generateComponentsCode(subTree, subTree.getRootNode(), ECodePart.FINALLY, null));
+                            Vector subprocess_footerArgument = new Vector(2);
+                            subprocess_footerArgument.add(subTree);
+                            subprocess_footerArgument.add(finallyPart.toString());
+                            componentsCode.append(generateTypedComponentCode(EInternalTemplate.SUBPROCESS_FOOTER,
+                                    subprocess_footerArgument));
                         } else {
+                            StringBuffer finallyPart = new StringBuffer();
                             componentsCode.append(generateTypedComponentCode(EInternalTemplate.SUBPROCESS_HEADER, subTree));
                             componentsCode.append(generateComponentsCode(subTree, subTree.getMergeNode(), ECodePart.BEGIN, null));
 
@@ -341,13 +348,17 @@ public class CodeGenerator implements ICodeGenerator {
                                         subTree.getRootNode()));
 
                                 componentsCode.append(generateComponentsCode(subTree, startNode, ECodePart.END, null));
+                                finallyPart.append(generateComponentsCode(subTree, startNode, ECodePart.FINALLY, null));
                             }
 
                             componentsCode.append(generateComponentsCode(subTree, subTree.getMergeNode(), ECodePart.END, null));
-
-                            componentsCode.append(generateTypedComponentCode(EInternalTemplate.SUBPROCESS_FOOTER, subTree));
+                            finallyPart.append(generateComponentsCode(subTree, subTree.getMergeNode(), ECodePart.FINALLY, null));
+                            Vector subprocess_footerArgument = new Vector(2);
+                            subprocess_footerArgument.add(subTree);
+                            subprocess_footerArgument.add(finallyPart.toString());
+                            componentsCode.append(generateTypedComponentCode(EInternalTemplate.SUBPROCESS_FOOTER,
+                                    subprocess_footerArgument));
                         }
-
                     }
                 }
             }
@@ -355,10 +366,11 @@ public class CodeGenerator implements ICodeGenerator {
             Vector footerArgument = new Vector(2);
             footerArgument.add(process);
             footerArgument.add(processTree.getRootNodes());
-            if (isCamel)
+            if (isCamel) {
                 componentsCode.append(generateTypedComponentCode(EInternalTemplate.FOOTER_ROUTE, footerArgument));
-            else
+            } else {
                 componentsCode.append(generateTypedComponentCode(EInternalTemplate.FOOTER, footerArgument));
+            }
             componentsCode.append(generateTypedComponentCode(EInternalTemplate.PROCESSINFO, componentsCode.length()));
             // ####
             return componentsCode.toString();
@@ -404,6 +416,7 @@ public class CodeGenerator implements ICodeGenerator {
      * @return the generated code
      * @throws CodeGeneratorException if an error occurs during Code Generation
      */
+    @Override
     public String generateContextCode(IContext designerContext) throws CodeGeneratorException {
         if (process != null) {
             if (designerContext == null) {
@@ -444,20 +457,22 @@ public class CodeGenerator implements ICodeGenerator {
         }
         return ""; //$NON-NLS-1$
     }
-    
+
     /*
      * ADDED for TESB-7887 By GangLiu(non-Javadoc)
+     * 
      * @see org.talend.designer.codegen.ICodeGenerator#generateSpringContent()
      */
+    @Override
     public String generateSpringContent() throws CodeGeneratorException {
-    	if (process == null || !( process instanceof IProcess2) ){
-    		return null;
-    	}
-    	IProcess2 process2 = (IProcess2) process;
-    	if(!process2.needsSpring() || process2.getSpringContent() == null){
-    		return null;
-    	}
-    	return process2.getSpringContent();
+        if (process == null || !(process instanceof IProcess2)) {
+            return null;
+        }
+        IProcess2 process2 = (IProcess2) process;
+        if (!process2.needsSpring() || process2.getSpringContent() == null) {
+            return null;
+        }
+        return process2.getSpringContent();
     }
 
     /**
@@ -627,8 +642,16 @@ public class CodeGenerator implements ICodeGenerator {
 
                     codeComponent.append(generateComponentCode(subProcess, node, ECodePart.END, incomingName, typeGen));
                     codeComponent.append(generatesTreeCode(subProcess, node, ECodePart.END, typeGen));
-                    codeComponent.append(generateTypedComponentCode(EInternalTemplate.ITERATE_SUBPROCESS_FOOTER, node,
-                            ECodePart.END, incomingName, subProcess));
+
+                    StringBuffer finallyPart = new StringBuffer();
+                    // if iterate with parallel
+                    finallyPart.append(generateComponentsCode(subProcess, node, ECodePart.FINALLY, incomingName, typeGen));
+                    Vector iterate_Argument = new Vector(2);
+                    iterate_Argument.add(node);
+                    iterate_Argument.add(finallyPart.toString());
+
+                    codeComponent.append(generateTypedComponentCode(EInternalTemplate.ITERATE_SUBPROCESS_FOOTER,
+                            iterate_Argument, ECodePart.END, incomingName, subProcess));
                 } else {
                     if (ETypeGen.CAMEL == typeGen) {
                         if (node.getIncomingConnections() != null && node.getIncomingConnections().size() > 0) {
@@ -639,32 +662,28 @@ public class CodeGenerator implements ICodeGenerator {
                     }
                     codeComponent.append(generateComponentCode(subProcess, node, ECodePart.MAIN, incomingName, typeGen));
                     if (ETypeGen.CAMEL == typeGen) {
-                    	if (node.getIncomingConnections().size() < 1 && node.isStart()){
-                    		// http://jira.talendforge.org/browse/TESB-4086 XiaopengLi
-                    		String label = null;
-                    		IElementParameter parameter = node
-                    				.getElementParameter("LABEL");
-                    		if (parameter != null
-                    				&& !"__UNIQUE_NAME__".equals(parameter
-                    						.getValue())) {
-                    			label = (String) parameter.getValue();
-                    		}
+                        if (node.getIncomingConnections().size() < 1 && node.isStart()) {
+                            // http://jira.talendforge.org/browse/TESB-4086 XiaopengLi
+                            String label = null;
+                            IElementParameter parameter = node.getElementParameter("LABEL");
+                            if (parameter != null && !"__UNIQUE_NAME__".equals(parameter.getValue())) {
+                                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();
-                    		}
-                    		if(!"cErrorHandler".equals(node.getComponent().getName())){
-                    			codeComponent.append(".routeId(\"" + label + "\")");
-                    		}
-                    	}else{
-                        	codeComponent.append(".id(\"" + node.getUniqueName() + "\")");
-						}
+                            /*
+                             * Fix https://jira.talendforge.org/browse/TESB-6685 label + uniqueName to make it unique
+                             */
+                            if (label == null) {
+                                label = node.getUniqueName();
+                            } else {
+                                label += "_" + node.getUniqueName();
+                            }
+                            if (!"cErrorHandler".equals(node.getComponent().getName())) {
+                                codeComponent.append(".routeId(\"" + label + "\")");
+                            }
+                        } else {
+                            codeComponent.append(".id(\"" + node.getUniqueName() + "\")");
+                        }
                     }
                     codeComponent.append(generatesTreeCode(subProcess, node, ECodePart.MAIN, typeGen));
                 }
@@ -692,6 +711,10 @@ public class CodeGenerator implements ICodeGenerator {
                     // }
                 }
                 break;
+            case FINALLY:
+                codeComponent.append(generateComponentCode(subProcess, node, ECodePart.FINALLY, incomingName, typeGen));
+                codeComponent.append(generatesTreeCode(subProcess, node, ECodePart.FINALLY, typeGen));
+                break;
             default:
                 // do nothing
             }
@@ -764,24 +787,21 @@ public class CodeGenerator implements ICodeGenerator {
             }
 
             if (ETypeGen.ETL == typeGen) {
-                /**
-                 * fix for bug: TDI-8508 aim: change the order of end parts to be the opposite order of begin parts
-                 */
-                // for (IConnection connection : node.getOutgoingConnections()) {
-                for (int i = 0; i < node.getOutgoingConnections().size(); i++) {
+                for (IConnection connection : node.getOutgoingConnections()) {
 
-                    IConnection connection = null;
-                    if (part == ECodePart.END) {
-                        connection = node.getOutgoingConnections().get(node.getOutgoingConnections().size() - (i + 1));
-                    } else {
-                        connection = node.getOutgoingConnections().get(i);
-                    }
-
-                    if ((connection.getLineStyle() == EConnectionType.ITERATE) && (part != ECodePart.MAIN)) {
+                    if ((connection.getLineStyle() == EConnectionType.ITERATE) && (part != ECodePart.MAIN)
+                            && (part != ECodePart.FINALLY)) {
                         continue;
                     }
 
-                    if ((connection.getLineStyle() == EConnectionType.ON_ROWS_END) && (part != ECodePart.END)) {
+                    if ((connection.getLineStyle() == EConnectionType.ITERATE)
+                            && ("true".equals(ElementParameterParser.getValue(connection, "__ENABLE_PARALLEL__"))) //$NON-NLS-1$//$NON-NLS-2$
+                            && part == ECodePart.FINALLY) {
+                        continue;
+                    }
+
+                    if ((connection.getLineStyle() == EConnectionType.ON_ROWS_END) && (part != ECodePart.END)
+                            && (part != ECodePart.FINALLY)) {
                         continue;
                     }
 
@@ -864,8 +884,9 @@ public class CodeGenerator implements ICodeGenerator {
 
         StringBuffer content = new StringBuffer();
         try {
-            if (typeGen == ETypeGen.ETL)
+            if (typeGen == ETypeGen.ETL) {
                 content.append(generateTypedComponentCode(EInternalTemplate.PART_HEADER, node, part, incomingName, subProcess));
+            }
 
             IComponentFileNaming componentFileNaming = ComponentsFactoryProvider.getFileNamingInstance();
             String templateURI = node.getComponent().getPathSource() + TemplateUtil.DIR_SEP + node.getComponent().getName()
@@ -875,8 +896,12 @@ public class CodeGenerator implements ICodeGenerator {
             jetBean.setTemplateRelativeUri(templateURI);
             JetProxy proxy = new JetProxy(jetBean);
             content.append(proxy.generate());
-            if (typeGen == ETypeGen.ETL)
+            if (jetBean.getGenerationError() != null) {
+                throw new CodeGeneratorException(jetBean.getGenerationError());
+            }
+            if (typeGen == ETypeGen.ETL) {
                 content.append(generateTypedComponentCode(EInternalTemplate.PART_FOOTER, node, part, incomingName, subProcess));
+            }
 
         } catch (JETException jetException) {
             log.error(jetException.getMessage(), jetException);
@@ -897,6 +922,7 @@ public class CodeGenerator implements ICodeGenerator {
      * @return the generated code
      * @throws CodeGeneratorException if an error occurs during Code Generation
      */
+    @Override
     public String generateComponentCode(INode node, ECodePart part) throws CodeGeneratorException {
         CodeGeneratorArgument argument = new CodeGeneratorArgument();
         argument.setNode(node);
@@ -980,6 +1006,7 @@ public class CodeGenerator implements ICodeGenerator {
      * @see org.talend.designer.codegen.ICodeGenerator#generateComponentCodeWithRows (java.lang.String,
      * java.lang.Object)
      */
+    @Override
     public String generateComponentCodeWithRows(String nodeName, IAloneProcessNodeConfigurer nodeConfigurer) {
         StringBuffer componentsCode = new StringBuffer();
 
@@ -1010,6 +1037,7 @@ public class CodeGenerator implements ICodeGenerator {
                         // nodeConfigurer.configure(subTreeNode);
                         // }
                         componentsCode.append(generateTypedComponentCode(EInternalTemplate.SUBPROCESS_HEADER, subTree));
+                        StringBuffer finallyPart = new StringBuffer();
                         if (subTreeNode != null) {
 
                             if (!subTree.isMergeSubTree()) {
@@ -1029,6 +1057,8 @@ public class CodeGenerator implements ICodeGenerator {
                                 // generateTypedComponentCode
                                 // (EInternalTemplate.SUBPROCESS_FOOTER,
                                 // subTree));
+                                finallyPart
+                                        .append(generateComponentsCode(subTree, subTree.getRootNode(), ECodePart.FINALLY, null));
                             } else {
                                 // componentsCode.append(
                                 // generateTypedComponentCode
@@ -1043,6 +1073,8 @@ public class CodeGenerator implements ICodeGenerator {
                                     componentsCode.append(generateComponentsCode(subTree, startNode, ECodePart.MAIN, null));
 
                                     componentsCode.append(generateComponentsCode(subTree, startNode, ECodePart.END, null));
+
+                                    finallyPart.append(generateComponentsCode(subTree, startNode, ECodePart.FINALLY, null));
                                 }
 
                                 componentsCode.append(generateTypedComponentCode(EInternalTemplate.PART_ENDMAIN,
@@ -1051,13 +1083,20 @@ public class CodeGenerator implements ICodeGenerator {
                                 componentsCode
                                         .append(generateComponentsCode(subTree, subTree.getMergeNode(), ECodePart.END, null));
 
+                                finallyPart.append(generateComponentsCode(subTree, subTree.getMergeNode(), ECodePart.FINALLY,
+                                        null));
+
                                 // componentsCode.append(
                                 // generateTypedComponentCode
                                 // (EInternalTemplate.SUBPROCESS_FOOTER,
                                 // subTree));
                             }
                         }
-                        componentsCode.append(generateTypedComponentCode(EInternalTemplate.SUBPROCESS_FOOTER, subTree));
+                        Vector subprocess_footerArgument = new Vector(2);
+                        subprocess_footerArgument.add(subTree);
+                        subprocess_footerArgument.add(finallyPart.toString());
+                        componentsCode.append(generateTypedComponentCode(EInternalTemplate.SUBPROCESS_FOOTER,
+                                subprocess_footerArgument));
                     }
                     Vector footerArgument = new Vector(2);
                     footerArgument.add(process);
@@ -1093,6 +1132,7 @@ public class CodeGenerator implements ICodeGenerator {
         return null;
     }
 
+    @Override
     public void setContextName(String contextName) {
         this.contextName = contextName;
     }

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

@@ -13,17 +13,21 @@
 package org.talend.designer.codegen;
 
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.ui.PlatformUI;
+import org.talend.commons.ui.runtime.CommonUIPlugin;
 import org.talend.core.CorePlugin;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ILibraryManagerService;
 import org.talend.core.language.ECodeLanguage;
 import org.talend.core.language.LanguageManager;
 import org.talend.core.model.components.ComponentCompilations;
+import org.talend.core.model.process.Element;
 import org.talend.core.model.process.IProcess;
 import org.talend.designer.codegen.i18n.Messages;
 import org.talend.designer.codegen.model.CodeGeneratorEmittersPoolFactory;
 import org.talend.designer.core.ICamelDesignerCoreService;
 import org.talend.designer.core.IDesignerCoreService;
+import org.talend.designer.core.ui.views.properties.IComponentSettingsView;
 import org.talend.repository.model.ComponentsFactoryProvider;
 
 /**
@@ -137,18 +141,38 @@ public class CodeGeneratorService implements ICodeGeneratorService {
      */
     @Override
     public Job refreshTemplates() {
-        // this will force to refresh all components libs when install run ctrl+f3
+        Element oldComponent = null;
+        IComponentSettingsView viewer = null;
+        if (!CommonUIPlugin.isFullyHeadless()) {
+            // TDI-25866:In case select a component and sctrl+shift+f3,need clean its componentSetting view
+            viewer = (IComponentSettingsView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+                    .findView(IComponentSettingsView.ID);
+
+            if (viewer != null) {
+                oldComponent = viewer.getElement();
+                viewer.cleanDisplay();
+            }
+        }
+        ComponentCompilations.deleteMarkers();
+        ComponentsFactoryProvider.getInstance().resetCache();
         ILibraryManagerService librairesManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault().getService(
                 ILibraryManagerService.class);
         librairesManagerService.clearCache();
-        ComponentCompilations.deleteMarkers();
-        ComponentsFactoryProvider.getInstance().resetCache();
-        Job job = CodeGeneratorEmittersPoolFactory.initialize();
         CorePlugin.getDefault().getLibrariesService().syncLibraries();
+        Job job = CodeGeneratorEmittersPoolFactory.initialize();
+        // achen modify to record ctrl+shift+f3 is pressed to fix bug 0006107
         IDesignerCoreService designerCoreService = (IDesignerCoreService) GlobalServiceRegister.getDefault().getService(
                 IDesignerCoreService.class);
         designerCoreService.getLastGeneratedJobsDateMap().clear();
 
+        if (oldComponent != null) {
+            viewer.setElement(oldComponent);
+        }
         return job;
     }
+
+    @Override
+    public boolean isInitializingJet() {
+        return !CodeGeneratorEmittersPoolFactory.isInitialized() && CodeGeneratorEmittersPoolFactory.isInitializeStart();
+    }
 }

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

@@ -23,11 +23,11 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.talend.commons.exception.BusinessException;
 import org.talend.core.language.ECodeLanguage;
+import org.talend.core.service.IComponentsLocalProviderService;
 import org.talend.designer.codegen.components.model.ComponentFileChecker;
 import org.talend.designer.codegen.components.ui.ComponenttRunJobPreferencePage;
 import org.talend.designer.codegen.components.ui.IComponentPreferenceConstant;
 import org.talend.designer.codegen.i18n.Messages;
-import org.talend.designer.components.IComponentsLocalProviderService;
 
 /**
  * DOC Administrator class global comment. Detailled comment <br/>

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

@@ -13,15 +13,6 @@
 package org.talend.designer.codegen;
 
 import org.eclipse.jface.action.Action;
-import org.eclipse.ui.PlatformUI;
-import org.talend.core.CorePlugin;
-import org.talend.core.GlobalServiceRegister;
-import org.talend.core.model.components.ComponentCompilations;
-import org.talend.core.model.process.Element;
-import org.talend.designer.codegen.model.CodeGeneratorEmittersPoolFactory;
-import org.talend.designer.core.IDesignerCoreService;
-import org.talend.designer.core.ui.views.properties.IComponentSettingsView;
-import org.talend.repository.model.ComponentsFactoryProvider;
 
 /**
  * DOC mhirt class global comment. Detailled comment <br/>
@@ -43,28 +34,8 @@ public class RefreshTemplatesAction extends Action {
      */
     @Override
     public void run() {
-        // TDI-25866:In case select a component and sctrl+shift+f3,need clean its componentSetting view
-        IComponentSettingsView viewer = (IComponentSettingsView) PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                .getActivePage().findView(IComponentSettingsView.ID);
-
-        Element oldComponent = null;
-
-        if (viewer != null) {
-            oldComponent = viewer.getElement();
-            viewer.cleanDisplay();
-        }
-        ComponentCompilations.deleteMarkers();
-        ComponentsFactoryProvider.getInstance().resetCache();
-        CorePlugin.getDefault().getLibrariesService().syncLibraries();
-        CodeGeneratorEmittersPoolFactory.initialize();
-        // achen modify to record ctrl+shift+f3 is pressed to fix bug 0006107
-        IDesignerCoreService designerCoreService = (IDesignerCoreService) GlobalServiceRegister.getDefault().getService(
-                IDesignerCoreService.class);
-        designerCoreService.getLastGeneratedJobsDateMap().clear();
-
-        if (oldComponent != null) {
-            viewer.setElement(oldComponent);
-        }
+        CodeGeneratorService service = new CodeGeneratorService();
+        service.refreshTemplates();
     }
 
 }

org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/additionaljet/ComponentsFactoryProviderManager.java

@@ -0,0 +1,73 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2010 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.additionaljet;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.log4j.Logger;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.designer.codegen.components.model.IComponentFactoryFilter;
+import org.talend.designer.codegen.i18n.Messages;
+
+/**
+ * DOC zwzhao class global comment. Detailled comment
+ */
+public class ComponentsFactoryProviderManager {
+
+    private static Logger log = Logger.getLogger(ComponentsFactoryProviderManager.class);
+
+    private static final ComponentsFactoryProviderManager INSTANCE = new ComponentsFactoryProviderManager();
+
+    private Collection<IComponentFactoryFilter> filters;
+
+    private ComponentsFactoryProviderManager() {
+    }
+
+    public static ComponentsFactoryProviderManager getInstance() {
+        return INSTANCE;
+    }
+
+    public Collection<IComponentFactoryFilter> getProviders() {
+        if (filters == null) {
+            loadFromExtension();
+        }
+        return filters;
+    }
+
+    private void loadFromExtension() {
+        filters = new ArrayList<IComponentFactoryFilter>();
+
+        IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
+        IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint("org.talend.designer.codegen.componentFilter"); //$NON-NLS-1$
+        IExtension[] extensions = extensionPoint.getExtensions();
+        for (IExtension extension : extensions) {
+            IConfigurationElement[] configurationElements = extension.getConfigurationElements();
+            for (IConfigurationElement configurationElement : configurationElements) {
+                try {
+                    IComponentFactoryFilter filter = (IComponentFactoryFilter) configurationElement
+                            .createExecutableExtension("class"); //$NON-NLS-1$
+                    filters.add(filter);
+                } catch (CoreException e) {
+                    ExceptionHandler.process(e);
+                }
+            }
+        }
+    }
+}

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

@@ -64,6 +64,7 @@ import org.talend.core.model.component_cache.ComponentsCache;
 import org.talend.core.model.component_cache.util.ComponentCacheResourceFactoryImpl;
 import org.talend.core.model.components.AbstractComponentsProvider;
 import org.talend.core.model.components.ComponentCategory;
+import org.talend.core.model.components.ComponentManager;
 import org.talend.core.model.components.ComponentUtilities;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IComponentsFactory;
@@ -73,13 +74,13 @@ import org.talend.core.ui.branding.IBrandingService;
 import org.talend.core.ui.images.CoreImageProvider;
 import org.talend.core.utils.TalendCacheUtils;
 import org.talend.designer.codegen.CodeGeneratorActivator;
+import org.talend.designer.codegen.additionaljet.ComponentsFactoryProviderManager;
 import org.talend.designer.codegen.i18n.Messages;
 import org.talend.designer.core.ITisLocalProviderService;
 import org.talend.designer.core.ITisLocalProviderService.ResClassLoader;
 import org.talend.designer.core.model.components.ComponentBundleToPath;
 import org.talend.designer.core.model.components.ComponentFilesNaming;
 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.repository.model.ComponentsFactoryProvider;
 
@@ -274,6 +275,7 @@ public class ComponentsFactory implements IComponentsFactory {
 
     @Override
     public void loadUserComponentsFromComponentsProviderExtension() {
+        getComponents();
         ComponentsProviderManager.getInstance().getProviders();
         ComponentsProviderManager componentsProviderManager = ComponentsProviderManager.getInstance();
         AbstractComponentsProvider componentsProvider = componentsProviderManager.loadUserComponentsProvidersFromExtension();
@@ -347,7 +349,7 @@ public class ComponentsFactory implements IComponentsFactory {
 
         IBrandingService service = (IBrandingService) GlobalServiceRegister.getDefault().getService(IBrandingService.class);
 
-        String[] availableComponents = service.getBrandingConfiguration().getAvailableComponents();
+        // String[] availableComponents = service.getBrandingConfiguration().getAvailableComponents();
 
         FileFilter skeletonFilter = new FileFilter() {
 
@@ -470,7 +472,7 @@ public class ComponentsFactory implements IComponentsFactory {
                         // if the component is already existing in cache and if it's the same, it won't reload all (cf
                         // flag: foundComponentIsSame)
                         EmfComponent currentComp = new EmfComponent(pathName, bundleName, xmlMainFile.getParentFile().getName(),
-                                pathSource, cache, foundComponentIsSame);
+                                pathSource, cache, foundComponentIsSame, provider);
                         if (!foundComponentIsSame) {
                             // force to call some functions to update the cache. (to improve)
                             currentComp.isVisibleInComponentDefinition();
@@ -493,10 +495,21 @@ public class ComponentsFactory implements IComponentsFactory {
                             ComponentManager.setModified(true); // this will force to save the cache later.
                         }
 
+                        boolean hiddenComponent = false;
+
+                        Collection<IComponentFactoryFilter> filters = ComponentsFactoryProviderManager.getInstance()
+                                .getProviders();
+                        for (IComponentFactoryFilter filter : filters) {
+                            if (!filter.isAvailable(currentComp.getName())) {
+                                hiddenComponent = true;
+                                break;
+                            }
+                        }
+
                         // 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())
+                        if (hiddenComponent
                                 && !(currentComp.getOriginalFamilyName().contains("Technical") || currentComp.isTechnical())) {
                             continue;
                         }
@@ -506,7 +519,7 @@ 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())
+                        if (hiddenComponent
                                 && (currentComp.getOriginalFamilyName().contains("Technical") || currentComp.isTechnical())) {
                             currentComp.setVisible(false);
                             currentComp.setTechnical(true);
@@ -520,8 +533,10 @@ public class ComponentsFactory implements IComponentsFactory {
                         if (componentList.contains(currentComp)) {
                             log.warn("Component " + currentComp.getName() + " already exists. Cannot load user version."); //$NON-NLS-1$ //$NON-NLS-2$
                         } else {
-                            currentComp.setResourceBundle(getComponentResourceBundle(currentComp, source.toString(), null,
-                                    provider));
+                            // currentComp.setResourceBundle(getComponentResourceBundle(currentComp, source.toString(),
+                            // null,
+                            // provider));
+                            currentComp.setProvider(provider);
                             componentList.add(currentComp);
                             if (isCustom) {
                                 customComponentList.add(currentComp);

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

@@ -0,0 +1,22 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2010 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.components.model;
+
+/**
+ * DOC zwzhao class global comment. Detailled comment
+ */
+public interface IComponentFactoryFilter {
+
+    public boolean isAvailable(String componentName);
+
+}

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

@@ -43,10 +43,13 @@ import org.talend.commons.ui.utils.workbench.preferences.ComboFieldEditor;
 import org.talend.core.CorePlugin;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.PluginChecker;
-import org.talend.core.model.components.ComponentUtilities;
+import org.talend.core.model.components.ComponentPaletteUtilities;
 import org.talend.designer.codegen.CodeGeneratorActivator;
 import org.talend.designer.codegen.ICodeGeneratorService;
 import org.talend.designer.codegen.i18n.Messages;
+import org.talend.designer.core.DesignerPlugin;
+import org.talend.designer.core.assist.TalendEditorComponentCreationUtil;
+import org.talend.designer.core.ui.preferences.TalendDesignerPrefConstants;
 
 /**
  * This class represents a preference page that is contributed to the Preferences dialog. By subclassing
@@ -62,6 +65,8 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
 
     private CheckBoxFieldEditor doNotShowJobletAfterDoubleClickCheckBoxField;
 
+    private CheckBoxFieldEditor enableComponentAssistCheckBoxField;
+
     private DirectoryFieldEditor filePathTemp;
 
     private final String dataViewer = "Data Viewer"; //$NON-NLS-1$
@@ -72,6 +77,8 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
 
     private final String joblet = "Joblet"; //$NON-NLS-1$
 
+    private final String assist = "Component Assist"; //$NON-NLS-1$
+
     private static String oldPath = null;
 
     /**
@@ -190,6 +197,16 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
         return group;
     }
 
+    protected Composite createForComponentAssist(Composite parent) {
+        Group group = createGroup(parent);
+        group.setText(assist);
+        Composite composite = createComposite(group);
+        addFontAndColorFieldsForAssist(composite);
+        GridLayout layout = createLayout();
+        composite.setLayout(layout);
+        return group;
+    }
+
     protected Group createGroup(Composite parent) {
         Group group = new Group(parent, SWT.NONE);
         GridData layoutData = new GridData(GridData.FILL_HORIZONTAL);
@@ -222,6 +239,7 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
     protected void addFontAndColorFieldsForDataViewer(Composite composite) {
         IntegerFieldEditor rowLimit = new IntegerFieldEditor(IComponentPreferenceConstant.LIMIT,
                 Messages.getString("ComponentsPreferencePage.rowLimit"), composite);//$NON-NLS-1$ 
+        rowLimit.setValidRange(1, 1000);
         addField(rowLimit);
         Text textControl = rowLimit.getTextControl(composite);
         GridData layoutData = new GridData();
@@ -245,6 +263,12 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
         addField(doNotShowJobletAfterDoubleClickCheckBoxField);
     }
 
+    protected void addFontAndColorFieldsForAssist(Composite composite) {
+        enableComponentAssistCheckBoxField = new CheckBoxFieldEditor(TalendDesignerPrefConstants.COMPONENT_ASSIST,
+                Messages.getString("ComponentsPreferencePage.componentAssist"), composite); //$NON-NLS-1$
+        addField(enableComponentAssistCheckBoxField);
+    }
+
     @Override
     public void createFieldEditors() {
         final Composite parent = getFieldEditorParent();
@@ -261,7 +285,7 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
             public void modifyText(ModifyEvent e) {
                 String newPath = filePathTemp.getTextControl(parent).getText();
                 File file = new File(newPath);
-                if (!file.exists()) {
+                if (!file.exists() && !"".equals(newPath)) { //$NON-NLS-1$
                     // getPreferenceStore().setValue(IComponentPreferenceConstant.USER_COMPONENTS_FOLDER, "");
                     filePathTemp.showErrorMessage();
                     setValid(false);
@@ -280,6 +304,7 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
         if (PluginChecker.isJobLetPluginLoaded()) {
             createForJoblet(parent);
         }
+        createForComponentAssist(parent);
         parent.pack();
     }
 
@@ -294,6 +319,35 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
 
     @Override
     public void init(IWorkbench workbench) {
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.preference.FieldEditorPreferencePage#initialize()
+     */
+    @Override
+    protected void initialize() {
+        super.initialize();
+        // Because should save the value of TalendDesignerPrefConstants.COMPONENT_ASSIST in
+        // DesignerPlugin.getDefault().getPreferenceStore()
+        enableComponentAssistCheckBoxField.setPreferenceStore(DesignerPlugin.getDefault().getPreferenceStore());
+        enableComponentAssistCheckBoxField.load();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.jface.preference.FieldEditorPreferencePage#performDefaults()
+     */
+    @Override
+    protected void performDefaults() {
+        super.performDefaults();
+        // Because should save the value of TalendDesignerPrefConstants.COMPONENT_ASSIST in
+        // DesignerPlugin.getDefault().getPreferenceStore(), also PreferenceInitializer
+        enableComponentAssistCheckBoxField.setPreferenceStore(DesignerPlugin.getDefault().getPreferenceStore());
+        enableComponentAssistCheckBoxField.loadDefault();
     }
 
     @Override
@@ -301,19 +355,22 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
         boolean flag = super.performOk();
         String newPath = CodeGeneratorActivator.getDefault().getPreferenceStore()
                 .getString(IComponentPreferenceConstant.USER_COMPONENTS_FOLDER);
-        if ("".equals(oldPath)) {
+        if ("".equals(oldPath)) { //$NON-NLS-1$
             oldPath = null;
         }
-        if ("".equals(newPath)) {
+        if ("".equals(newPath)) { //$NON-NLS-1$
             newPath = null;
         }
+        DesignerPlugin.getDefault().getPreferenceStore()
+                .setValue(TalendDesignerPrefConstants.COMPONENT_ASSIST, enableComponentAssistCheckBoxField.getBooleanValue());
+        TalendEditorComponentCreationUtil.updateAssistListener();
         if (this.oldPath != newPath) {
 
             final IRunnableWithProgress runnable = new IRunnableWithProgress() {
 
                 @Override
                 public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-                    monitor.beginTask("Loading user component ......", 100);
+                    monitor.beginTask("Loading user component ......", 100); //$NON-NLS-1$
                     Display display = Display.getCurrent();
                     if (display == null) {
                         display = Display.getDefault();
@@ -336,7 +393,7 @@ public class ComponentsPreferencePage extends FieldEditorPreferencePage implemen
 
                                     @Override
                                     public void done(org.eclipse.core.runtime.jobs.IJobChangeEvent event) {
-                                        ComponentUtilities.updatePalette();
+                                        ComponentPaletteUtilities.updatePalette();
                                         monitor.worked(100);
                                         monitor.done();
                                     };

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

@@ -52,6 +52,7 @@ public enum EInternalTemplate {
     MR_COMPONENT_MRCONFIG_HEADER("mr_component_mrconfig_header", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
     MR_COMPONENT_MRCONFIG_FOOTER("mr_component_mrconfig_footer", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
     MR_SUBPROCESS_HEADER("mr_subprocess_header", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
+    MR_SUBPROCESS_RUN("mr_subprocess_run", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
     MR_SUBPROCESS_FOOTER("mr_subprocess_footer", "0.0.1"), //$NON-NLS-1$ //$NON-NLS-2$
 
     HEADER_ADDITIONAL("header_additional", "0.0.1"); //$NON-NLS-1$ //$NON-NLS-2$

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

@@ -48,6 +48,8 @@ public class JetBean {
 
     private String family = "common"; //$NON-NLS-1$
 
+    private String generationError;
+
     private static Map<String, String> pluginIdToBundle = new HashMap<String, String>();
 
     private long crc = 0;
@@ -394,4 +396,12 @@ public class JetBean {
         return Platform.getPlugin(getJetPluginRepository()).getDescriptor().getInstallURL().toString() + getTemplateRelativeUri();
     }
 
+    public String getGenerationError() {
+        return generationError;
+    }
+
+    public void setGenerationError(String generationError) {
+        this.generationError = generationError;
+    }
+
 }

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

@@ -0,0 +1,159 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2013 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.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.talend.core.model.process.IConnection;
+import org.talend.core.model.process.IConnectionCategory;
+import org.talend.core.model.process.INode;
+
+/**
+ * Use for wrap a {@link INode} to provide faster and convenient methods to get
+ * connections, such as {@link #inputConn}, {@link #connResponse},
+ * {@link #connFault}, {@link #dataOutputs}.
+ * 
+ * @author GaoZone
+ * @update 2013-9-12 [TESB-11028]
+ */
+public class NodeConnectionsHelper {
+
+	/** The node. */
+	private final INode node;
+
+	/** The input conn. */
+	private IConnection inputConn;
+
+	/** The conn response. */
+	private IConnection connResponse;
+
+	/** The conn fault. */
+	private IConnection connFault;
+
+	/** The data outputs. */
+	private List<IConnection> dataOutputs;
+
+	/**
+	 * Gets the input conn.
+	 * 
+	 * @return the input conn
+	 */
+	public IConnection getInputConn() {
+		return inputConn;
+	}
+
+	/**
+	 * Gets the output conn response.
+	 * 
+	 * @return the output conn response
+	 */
+	public IConnection getOutputConnResponse() {
+		return connResponse;
+	}
+
+	/**
+	 * Gets the output conn fault.
+	 * 
+	 * @return the output conn fault
+	 */
+	public IConnection getOutputConnFault() {
+		return connFault;
+	}
+
+	/**
+	 * Gets the data outputs.
+	 * 
+	 * @return the data outputs
+	 */
+	public List<IConnection> getDataOutputs() {
+		return dataOutputs;
+	}
+
+	/**
+	 * Instantiates a new node connections helper.
+	 * 
+	 * @param node
+	 *            the node
+	 */
+	public NodeConnectionsHelper(INode node) {
+		this(node, false);
+	}
+
+	/**
+	 * Instantiates a new node connections helper.
+	 * 
+	 * @param node
+	 *            the node
+	 * @param stopInitialWhenNoInput
+	 *            the stop initial when no input
+	 */
+	public NodeConnectionsHelper(INode node, boolean stopInitialWhenNoInput) {
+		this.node = node;
+		initConnections(stopInitialWhenNoInput);
+	}
+
+	/**
+	 * Inits the connections.
+	 * 
+	 * @param stopInitialWhenNoInput
+	 *            the stop initial when no input
+	 */
+	private void initConnections(boolean stopInitialWhenNoInput) {
+		initInputConnection();
+		if (!(stopInitialWhenNoInput && inputConn == null)) {
+			initOutputConnections();
+		}
+	}
+
+	/**
+	 * Inits the {@link #inputConn} connection.
+	 */
+	private void initInputConnection() {
+		List<? extends IConnection> incomingConnections = node.getIncomingConnections();
+		if (incomingConnections != null) {
+			for (IConnection conn : incomingConnections) {
+				if (conn.getLineStyle().hasConnectionCategory(IConnectionCategory.DATA)) {
+					inputConn = conn;
+					break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Inits the {@link #dataOutputs}, {@link #connResponse}, {@link #connFault}
+	 * connections.
+	 */
+	private void initOutputConnections() {
+		List<? extends IConnection> conns = node.getOutgoingSortedConnections();
+		dataOutputs = new ArrayList<IConnection>();
+		if (conns != null) {
+			for (IConnection conn : conns) {
+				if (conn.getLineStyle().hasConnectionCategory(IConnectionCategory.DATA)) {
+					dataOutputs.add(conn);
+				}
+			}
+		}
+
+		List<? extends IConnection> connsResponse = node.getOutgoingConnections("RESPONSE");
+		List<? extends IConnection> connsFault = node.getOutgoingConnections("FAULT");
+		if (connsResponse.size() == 1) {
+			connResponse = connsResponse.get(0);
+		}
+		if (connsFault.size() == 1) {
+			connFault = connsFault.get(0);
+		}
+	}
+
+}

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

@@ -0,0 +1,232 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2013 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.config;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.talend.core.model.process.ElementParameterParser;
+import org.talend.core.model.process.IElementParameter;
+import org.talend.core.model.process.INode;
+
+/**
+ * Use for wrap a {@link INode} to provide faster and convenient methods to get
+ * parameters.
+ * 
+ * @author GaoZone
+ * @update 2013-9-12 [TESB-11028]
+ */
+public class NodeParamsHelper {
+
+    /** The node use to wrap. */
+    private final INode node;
+
+    /** The parameter map use to cache params by name. */
+    private final HashMap<String, IElementParameter> parameterMap;
+
+    /**
+     * Use for method return property(K-V) entries in list/map.
+     */
+    private class PropEntry implements Map.Entry<String, String> {
+
+        /** The key. */
+        private final String key;
+
+        /** The value. */
+        private final String value;
+
+        /**
+         * Instantiates a new prop entry.
+         * 
+         * @param key
+         *            the key
+         * @param value
+         *            the value
+         */
+        public PropEntry(String key, String value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        @Override
+        public String getKey() {
+            return key;
+        }
+
+        @Override
+        public String getValue() {
+            return value;
+        }
+
+        @Override
+        public String setValue(String value) {
+            throw new UnsupportedOperationException();
+        }
+
+    }
+
+    /**
+     * Instantiates a new node params helper.
+     * 
+     * @param node
+     *            the node
+     */
+    public NodeParamsHelper(INode node) {
+        this.node = node;
+
+        // cache ParameterMap
+        parameterMap = new HashMap<String, IElementParameter>();
+        for (IElementParameter parameter : node.getElementParametersWithChildrens()) {
+            parameterMap.put(parameter.getVariableName(), parameter);
+        }
+    }
+
+    /**
+     * Gets the parameter from cached name map.
+     * 
+     * @param key
+     *            the key
+     * @return the parameter
+     */
+    private IElementParameter getParameter(String key) {
+        return parameterMap.get(key);
+    }
+
+    /**
+     * Gets the boolean parameter by {@code key}. If no {@code key} provided
+     * 
+     * @param key
+     *            the key
+     * @return the boolean parameter
+     */
+    public boolean getBoolParam(String key) {
+        return "true".equals(getStringParam(key));
+    }
+
+    /**
+     * Gets the string parameter by {@code key}.
+     * 
+     * @param key
+     *            the key
+     * @return the parameter value in String
+     */
+    public String getStringParam(String key) {
+        // return ElementParameterParser.getValue(node, key);
+        try {
+            IElementParameter param = getParameter(key);
+            return getDisplayValue(param);
+        } catch (Throwable e) {
+            // ignore and return "";
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    /**
+     * Gets string parameter by {@code key}. Especially, if the parameter's
+     * controller is not visible, then also return {@code ""}.
+     * 
+     * @param key
+     *            the key
+     * @return the parameter value
+     */
+    public String getVisibleStringParam(String key) {
+        String value = getStringParam(key);
+        if (!("").equals(value)) {
+            IElementParameter param = getParameter(key);
+            if (param.isShow(node.getElementParametersWithChildrens())) {
+                return value;
+            }
+        }
+        return "";
+    }
+
+    /**
+     * Gets the object param. </br>//TODO Not used name map yet, and be improve
+     * by expose methods from {@link ElementParameterParser}
+     * 
+     * @param <T>
+     *            the generic type
+     * @param key
+     *            the key
+     * @return the object param
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T getObjectParam(String key) {
+        return (T) ElementParameterParser.getObjectValue(node, key);
+    }
+
+
+    /**
+     * Gets boolean parameter by {@code key}. Especially, if the parameter's
+     * controller is not visible, then also return {@code false}.
+     * 
+     * @param key
+     *            the key
+     * @return the parameter value
+     */
+    public boolean getVisibleBoolParam(final String key) {
+        if (key == null) {
+            return false;
+        }
+        if (getBoolParam(key)) {
+            // value is true, then check visible
+            // no need null check, has true value must not null.
+            IElementParameter param = getParameter(key);
+            return param.isShow(node.getElementParametersWithChildrens());
+        }
+        return false;
+    }
+
+    /**
+     * Gets the properties pram.
+     * 
+     * @param key
+     *            the key
+     * @return the properties pram
+     */
+    public List<Entry<String, String>> getPropertiesPram(String key) {
+        try {
+            List<Map<String, String>> paramValue = getObjectParam(key);
+            List<Entry<String, String>> properties = new ArrayList<Entry<String, String>>(paramValue.size());
+            for (Map<String, String> map : paramValue) {
+                properties.add(new PropEntry(map.get("PROP_NAME"), map.get("PROP_VALUE")));
+            }
+            return properties;
+        } catch (Throwable e) {
+            // ignore and return empty list.
+            e.printStackTrace();
+            return Collections.emptyList();
+        }
+    }
+
+    /**
+	 * Gets the display value.
+	 * 
+	 * @param param
+	 *            the param
+	 * @return the display value
+	 *         {@code ElementParameterParser.getDisplayValue(final IElementParameter param)}
+	 */
+    private static String getDisplayValue(final IElementParameter param) {
+		if (param == null) {
+			return "";
+		}
+		return ElementParameterParser.getStringElementParameterValue(param);
+    }
+
+}

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

@@ -51,6 +51,8 @@ public class NodesSubTree {
 
     HashMap<INode, Integer> visitedNodesEndCode;
 
+    HashMap<INode, Integer> visitedNodesFinallyCode;
+
     private static final boolean DEBUG = false;
 
     boolean isMergeSubTree = false;
@@ -88,6 +90,7 @@ public class NodesSubTree {
         this.visitedNodesMainCode = new HashMap<INode, Integer>();
         this.visitedNodesBeginCode = new HashMap<INode, Integer>();
         this.visitedNodesEndCode = new HashMap<INode, Integer>();
+        this.visitedNodesFinallyCode = new HashMap<INode, Integer>();
         this.isMergeSubTree = node.isThereLinkWithMerge();
         allMainSubTreeConnections = new ArrayList<IConnection>();
 
@@ -105,7 +108,7 @@ public class NodesSubTree {
         }
 
     }
-    
+
     public NodesSubTree(INode node, List<? extends INode> nodes, ETypeGen typeGen) {
         this.rootNode = node;
         this.name = node.getUniqueName();
@@ -115,7 +118,6 @@ public class NodesSubTree {
 
         buildCamelSubTree(node, false);
     }
-    
 
     /**
      * unite all the relative merge nodes to this subTree
@@ -204,6 +206,7 @@ public class NodesSubTree {
         visitedNodesMainCode.put(node, 0);
         visitedNodesBeginCode.put(node, 0);
         visitedNodesEndCode.put(node, 0);
+        visitedNodesFinallyCode.put(node, 0);
         nodes.add(node);
     }
 
@@ -237,6 +240,13 @@ public class NodesSubTree {
             } else {
                 return false;
             }
+        case FINALLY:
+            Integer countFinally = visitedNodesFinallyCode.get(node);
+            if (countFinally == null) {
+                return null;
+            } else {
+                return false;
+            }
         default:
             return result;
         }
@@ -259,6 +269,8 @@ public class NodesSubTree {
         case END:
             visitedNodesEndCode.put(node, visitedNodesEndCode.get(node) + 1);
             break;
+        case FINALLY:
+            visitedNodesFinallyCode.put(node, visitedNodesFinallyCode.get(node) + 1);
         default:
             // do nothing
         }
@@ -368,6 +380,7 @@ public class NodesSubTree {
 
             Collections.sort(mergeBranchStarts, new Comparator<INode>() {
 
+                @Override
                 public int compare(INode node1, INode node2) {
                     if (node1.getLinkedMergeInfo().get(mergeNode) > node2.getLinkedMergeInfo().get(mergeNode)) {
                         return 1;

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

@@ -47,7 +47,7 @@ public class NodesTree {
             buildSubTrees(true);
         }
     }
-    
+
     public NodesTree(IProcess process, List<? extends INode> treeNodes, boolean init, ETypeGen typeGen) {
         this.nodes = treeNodes;
         buildRootNodes(process);
@@ -111,7 +111,8 @@ 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.isSubtreeStart() || node.isELTComponent())
+                    && (!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

@@ -16,32 +16,34 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Properties;
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import org.apache.commons.lang.ArrayUtils;
 import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IMarker;
 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;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.emf.codegen.CodeGenPlugin;
 import org.eclipse.emf.codegen.jet.JETCompiler;
@@ -50,14 +52,20 @@ import org.eclipse.emf.codegen.jet.JETException;
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.BasicMonitor;
 import org.eclipse.emf.common.util.Monitor;
+import org.eclipse.jdt.core.IClasspathAttribute;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaModel;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.compiler.CompilationProgress;
+import org.eclipse.jdt.core.compiler.batch.BatchCompiler;
+import org.osgi.framework.Bundle;
 import org.talend.commons.debug.TalendDebugHandler;
 import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.utils.generation.JavaUtils;
 import org.talend.designer.codegen.i18n.Messages;
+import org.talend.designer.core.model.components.ComponentBundleToPath;
 
 /**
  * DOC mhirt class global comment. Detailled comment <br/>
@@ -162,7 +170,7 @@ public class TalendJetEmitter extends JETEmitter {
 
         IProject project;
 
-        IJavaProject javaProject;
+        JetBean helperJetBean;
 
         public TalendEclipseHelper(IProgressMonitor progressMonitor, TalendJetEmitter jetEmitter, boolean rebuild)
                 throws JETException {
@@ -191,26 +199,6 @@ public class TalendJetEmitter extends JETEmitter {
                     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$
-                        new Object[] { project.getName() }));
-                IClasspathEntry classpathEntry = JavaCore.newSourceEntry(new Path("/" + project.getName() + "/src")); //$NON-NLS-1$ //$NON-NLS-2$
-
-                IClasspathEntry jreClasspathEntry = JavaCore
-                        .newContainerEntry(new Path("org.eclipse.jdt.launching.JRE_CONTAINER")); //$NON-NLS-1$
-
-                Set<IClasspathEntry> classpath = new HashSet<IClasspathEntry>();
-                classpath.add(classpathEntry);
-                classpath.add(jreClasspathEntry);
-                classpath.addAll(jetEmitter.getClasspathEntries());
 
                 IFolder sourceFolder = project.getFolder(new Path("src")); //$NON-NLS-1$
                 if (!sourceFolder.exists()) {
@@ -221,14 +209,6 @@ public class TalendJetEmitter extends JETEmitter {
                     runtimeFolder.create(false, true, new SubProgressMonitor(progressMonitor, 1));
                 }
 
-                if (isClasspathDifferent(javaProject, classpath)) {
-                    IClasspathEntry[] classpathEntryArray = classpath.toArray(new IClasspathEntry[classpath.size()]);
-                    javaProject.setRawClasspath(classpathEntryArray, new SubProgressMonitor(progressMonitor, 1));
-                    javaProject.setOutputLocation(new Path("/" + project.getName() + "/runtime"), new SubProgressMonitor( //$NON-NLS-1$ //$NON-NLS-2$
-                            progressMonitor, 1));
-                    javaProject.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-                }
-
                 progressMonitor.done();
             } catch (CoreException exception) {
                 throw new JETException(exception);
@@ -319,7 +299,8 @@ public class TalendJetEmitter extends JETEmitter {
                     }
                 }
                 boolean needRebuild = true;
-                IFile targetFile = sourceContainer.getFile(new Path(jetCompiler.getSkeleton().getClassName() + ".java")); //$NON-NLS-1$
+                String targetFileName = jetCompiler.getSkeleton().getClassName() + ".java"; //$NON-NLS-1$
+                IFile targetFile = sourceContainer.getFile(new Path(targetFileName));
                 if (!targetFile.exists()) {
                     subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETCreating_message", //$NON-NLS-1$
                             new Object[] { targetFile.getFullPath() }));
@@ -360,26 +341,22 @@ public class TalendJetEmitter extends JETEmitter {
                 if (needRebuild || jetEmitter.method == null) {
                     subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETBuilding_message", //$NON-NLS-1$
                             new Object[] { project.getName() }));
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    compileSingleClass(project, targetFile, baos);
+                    String output = baos.toString();
+                    // project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new
+                    // SubProgressMonitor(subProgressMonitor, 1));
 
-                    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) }))));
-                            classAvailable = false;
+                    if (!output.isEmpty()) {
+                        errors = true;
+                        if (this.helperJetBean != null) {
+                            this.helperJetBean.setGenerationError(output);
                         }
+                        log.error(output);
+                        setClassAvailable(false);
+                    } else if (this.helperJetBean != null) {
+                        this.helperJetBean.setGenerationError(null);
                     }
 
                     if (!errors) {
@@ -388,8 +365,7 @@ public class TalendJetEmitter extends JETEmitter {
 
                         // Construct a proper URL for relative lookup.
                         //
-                        URL url = new File(project.getLocation()
-                                + "/" + javaProject.getOutputLocation().removeFirstSegments(1) + "/") //$NON-NLS-1$ //$NON-NLS-2$
+                        URL url = new File(project.getLocation() + "/" + "runtime" + "/") //$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$
@@ -429,6 +405,171 @@ public class TalendJetEmitter extends JETEmitter {
                 progressMonitor.done();
             }
         }
+
+        public JetBean getHelperJetBean() {
+            return helperJetBean;
+        }
+
+        public void setHelperJetBean(JetBean helperJetBean) {
+            this.helperJetBean = helperJetBean;
+        }
+    }
+
+    private void compileSingleClass(IProject project, IFile javaFile, OutputStream errorMsgStream) {
+        compileSingleClass(project, javaFile, null, errorMsgStream, null);
+    }
+
+    /**
+     * DOC ycbai Comment method "compileSingleClass".
+     * <p>
+     * Compile one class directly.
+     * 
+     * @param project
+     * @param javaFile
+     * @param standardMsgStream
+     * @param errorMsgStream
+     * @param progress
+     */
+    private void compileSingleClass(IProject project, IFile javaFile, OutputStream standardMsgStream,
+            OutputStream errorMsgStream, CompilationProgress progress) {
+        OutputStream msgStream = standardMsgStream;
+        OutputStream errorStream = errorMsgStream;
+        if (msgStream == null) {
+            msgStream = System.out;
+        }
+        if (errorStream == null) {
+            errorStream = System.err;
+        }
+        BatchCompiler.compile(getBatchCompilerCmd(project, javaFile), new PrintWriter(msgStream), new PrintWriter(errorStream),
+                progress);
+    }
+
+    /**
+     * DOC ycbai Comment method "getBatchCompilerCmd".
+     * 
+     * @param project
+     * @param javaFile
+     * @return
+     */
+    private String[] getBatchCompilerCmd(IProject project, IFile javaFile) {
+        List<String> cmdList = new ArrayList<String>();
+        cmdList.add(javaFile.getLocation().toPortableString());
+        String classpathStr = getClasspathStr();
+        if (!classpathStr.isEmpty()) {
+            cmdList.add("-classpath"); //$NON-NLS-1$
+            cmdList.add(classpathStr);
+        }
+        //cmdList.add("-time"); //$NON-NLS-1$
+        cmdList.add("-g"); //$NON-NLS-1$
+        cmdList.add("-warn:none"); //$NON-NLS-1$
+        cmdList.add("-1.5"); //$NON-NLS-1$
+        cmdList.add("-d"); //$NON-NLS-1$
+        cmdList.add(getClassOutputPath(project, javaFile));
+
+        return cmdList.toArray(new String[0]);
+    }
+
+    /**
+     * DOC ycbai Comment method "getClassOutputPath".
+     * <p>
+     * Get class output folder of project.
+     * 
+     * @param project
+     * @param javaFile
+     * @return
+     */
+    private String getClassOutputPath(IProject project, IFile javaFile) {
+        IFolder runtimeFolder = project.getFolder("runtime"); //$NON-NLS-1$
+        return runtimeFolder.getLocation().toPortableString();
+    }
+
+    /**
+     * DOC ycbai Comment method "getClasspathStr".
+     * <p>
+     * Get character string of classpath with separator.
+     * 
+     * @return
+     */
+    private String getClasspathStr() {
+        StringBuffer cps = new StringBuffer();
+        String classPathSeparator = JavaUtils.JAVA_CLASSPATH_SEPARATOR;
+        List<IClasspathEntry> cpes = getClasspathEntries();
+        for (IClasspathEntry cpe : cpes) {
+            String classpath = getClasspathFromEntry(cpe);
+            cps.append(classpath).append(classPathSeparator);
+        }
+        if (cps.length() > 0) {
+            cps.deleteCharAt(cps.length() - 1);
+        }
+
+        return cps.toString();
+    }
+
+    /**
+     * DOC ycbai Comment method "getClasspathFromEntry".
+     * <p>
+     * Get the absolute classpath.
+     * 
+     * @param entry
+     * @return
+     */
+    private String getClasspathFromEntry(IClasspathEntry entry) {
+        if (entry == null) {
+            return null;
+        }
+        IClasspathAttribute[] extraAttributes = entry.getExtraAttributes();
+        if (extraAttributes.length > 0) {
+            for (IClasspathAttribute ca : extraAttributes) {
+                if ("plugin_id".equals(ca.getName())) { //$NON-NLS-1$
+                    String pluginId = ca.getValue();
+                    if (pluginId != null) {
+                        File plugin = new File(ComponentBundleToPath.getPathFromBundle(pluginId));
+                        String pluginPath = plugin.getAbsolutePath();
+                        if (Platform.inDevelopmentMode() && plugin.isDirectory()) {
+                            String output;
+                            try {
+                                output = getIdeOutputSubDir(Platform.getBundle(pluginId));
+                                if (output != null) {
+                                    pluginPath = pluginPath + File.separator + output;
+                                }
+                            } catch (IOException e) {
+                                // for dev only so just keep a print stacktrace
+                                e.printStackTrace();
+                            }
+                        }
+                        return pluginPath;
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * DOC ycbai Comment method "getIdeOutputSubDir".
+     * <p>
+     * Get class folder path of bundle. Just use for development environment.
+     * 
+     * @param bundle
+     * @return
+     * @throws IOException
+     */
+    private String getIdeOutputSubDir(Bundle bundle) throws IOException {
+        String outputSubDir = null;
+        // get output folder path in case we are running from the IDE
+        URL buildPropUrl = bundle.getEntry("/build.properties"); //$NON-NLS-1$
+        if (buildPropUrl != null) {
+            Properties buildProp = new Properties();
+            InputStream buildPropStream = buildPropUrl.openStream();
+            try {
+                buildProp.load(buildPropStream);
+                outputSubDir = buildProp.getProperty("output..", null); //$NON-NLS-1$
+            } finally {
+                buildPropStream.close();
+            }
+        }
+        return outputSubDir;
     }
 
     /*
@@ -517,6 +658,10 @@ public class TalendJetEmitter extends JETEmitter {
         return this.classAvailable;
     }
 
+    public void setClassAvailable(boolean classAvailable) {
+        this.classAvailable = classAvailable;
+    }
+
     /*
      * (non-Javadoc)
      * 
@@ -525,7 +670,17 @@ public class TalendJetEmitter extends JETEmitter {
      */
     @Override
     public String generate(Monitor progressMonitor, Object[] arguments, String lineDelimiter) throws JETException {
+        List list = new ArrayList();
+        for (Object o : arguments) {
+            if (o instanceof JetBean) {
+                list.add(((JetBean) o).getArgument());
+                talendEclipseHelper.setHelperJetBean((JetBean) o);
+            } else {
+                list.add(o);
+            }
+        }
+
         getMethod(); // force to load the method before generate in case it was not set before.
-        return super.generate(progressMonitor, arguments, lineDelimiter);
+        return super.generate(progressMonitor, list.toArray(), lineDelimiter);
     }
 }

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

@@ -22,13 +22,10 @@ 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;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -36,37 +33,37 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 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.model.components.IComponentConstants;
 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;
 import org.talend.commons.utils.time.TimeMeasure;
 import org.talend.core.CorePlugin;
 import org.talend.core.GlobalServiceRegister;
+import org.talend.core.IService;
 import org.talend.core.PluginChecker;
 import org.talend.core.language.ECodeLanguage;
 import org.talend.core.language.LanguageManager;
 import org.talend.core.model.components.ComponentCompilations;
-import org.talend.core.model.components.ComponentUtilities;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IComponentFileNaming;
 import org.talend.core.model.components.IComponentsFactory;
 import org.talend.core.model.temp.ECodePart;
 import org.talend.core.ui.branding.IBrandingService;
-import org.talend.core.utils.AccessingEmfJob;
 import org.talend.designer.codegen.CodeGeneratorActivator;
-import org.talend.designer.codegen.config.CodeGeneratorProgressMonitor;
+import org.talend.designer.codegen.ICodeGeneratorService;
 import org.talend.designer.codegen.config.EInternalTemplate;
 import org.talend.designer.codegen.config.JetBean;
 import org.talend.designer.codegen.config.LightJetBean;
@@ -136,23 +133,18 @@ public final class CodeGeneratorEmittersPoolFactory {
                 jetFilesCompileFail.clear();
 
                 IProgressMonitor monitorWrap = null;
-                boolean headless = CommonUIPlugin.isFullyHeadless();
-                if (!headless) {
-                    monitorWrap = new CodeGeneratorProgressMonitor(delegateMonitor);
-                } else {
-                    monitorWrap = new NullProgressMonitor();
-                }
+                monitorWrap = new NullProgressMonitor();
                 ECodeLanguage codeLanguage = LanguageManager.getCurrentLanguage();
 
                 initializeJetEmittersProject(monitorWrap);
 
+                TimeMeasure.step("initialize Jet Emitters", "initialize JET Project"); //$NON-NLS-1$ //$NON-NLS-2$
                 CodeGeneratorInternalTemplatesFactory templatesFactory = CodeGeneratorInternalTemplatesFactoryProvider
                         .getInstance();
                 templatesFactory.setCurrentLanguage(codeLanguage);
                 templatesFactory.init();
 
                 IComponentsFactory componentsFactory = ComponentsFactoryProvider.getInstance();
-                componentsFactory.getComponents();
 
                 long startTime = System.currentTimeMillis();
 
@@ -163,6 +155,7 @@ public final class CodeGeneratorEmittersPoolFactory {
 
                 List<TemplateUtil> templates = templatesFactory.getTemplates();
                 Set<IComponent> components = componentsFactory.getComponents();
+                TimeMeasure.step("initialize Jet Emitters", "getComponents"); //$NON-NLS-1$ //$NON-NLS-2$
 
                 monitorWrap.beginTask(Messages.getString("CodeGeneratorEmittersPoolFactory.initMessage"), //$NON-NLS-1$
                         (2 * templates.size() + 5 * components.size()));
@@ -177,6 +170,7 @@ public final class CodeGeneratorEmittersPoolFactory {
                         monitorBuffer = 0;
                     }
                 }
+                TimeMeasure.step("initialize Jet Emitters", "initialize jet beans from templates"); //$NON-NLS-1$ //$NON-NLS-2$
 
                 if (components != null) {
                     ECodePart codePart = ECodePart.MAIN;
@@ -191,10 +185,12 @@ public final class CodeGeneratorEmittersPoolFactory {
                         }
                     }
                 }
+                TimeMeasure.step("initialize Jet Emitters", "initialize jet beans from components"); //$NON-NLS-1$ //$NON-NLS-2$
                 monitorWrap.worked(monitorBuffer);
 
                 initializeEmittersPool(jetBeans, codeLanguage, monitorWrap);
                 monitorWrap.done();
+                TimeMeasure.step("initialize Jet Emitters", "initialize and generate each jet emitters"); //$NON-NLS-1$ //$NON-NLS-2$
 
                 if (!CommonUIPlugin.isFullyHeadless()) {
                     Job job = new Job(Messages.getString("CodeGeneratorEmittersPoolFactory.updatePaletteForEditors")) { //$NON-NLS-1$
@@ -202,7 +198,7 @@ public final class CodeGeneratorEmittersPoolFactory {
                         @Override
                         protected IStatus run(IProgressMonitor monitor) {
                             CorePlugin.getDefault().getDesignerCoreService()
-                                    .synchronizeDesignerUI(new PropertyChangeEvent(this, ComponentUtilities.NORMAL, null, null));
+                                    .synchronizeDesignerUI(new PropertyChangeEvent(this, IComponentConstants.NORMAL, null, null));
                             return Status.OK_STATUS;
                         }
 
@@ -227,15 +223,17 @@ public final class CodeGeneratorEmittersPoolFactory {
                 TimeMeasure.measureActive = false;
                 return new Status(IStatus.ERROR, CodeGeneratorActivator.PLUGIN_ID,
                         Messages.getString("CodeGeneratorEmittersPoolFactory.initialException"), e); //$NON-NLS-1$
-            } finally {
-                try {
-                    IWorkspace workspace = ResourcesPlugin.getWorkspace();
-                    IProject project = workspace.getRoot().getProject(JET_PROJECT);
-                    project.build(IncrementalProjectBuilder.AUTO_BUILD, null);
-                } catch (CoreException e) {
-                    ExceptionHandler.process(e);
-                }
             }
+            // finally {
+            // try {
+            // IWorkspace workspace = ResourcesPlugin.getWorkspace();
+            // IProject project = workspace.getRoot().getProject(JET_PROJECT);
+            // project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
+            //                    TimeMeasure.step("initialize Jet Emitters", "build project .JETEmitters"); //$NON-NLS-1$ //$NON-NLS-2$
+            // } catch (CoreException e) {
+            // ExceptionHandler.process(e);
+            // }
+            // }
             TimeMeasure.end("initialize Jet Emitters"); //$NON-NLS-1$
             TimeMeasure.display = false;
             TimeMeasure.displaySteps = false;
@@ -290,21 +288,15 @@ public final class CodeGeneratorEmittersPoolFactory {
                 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));
-            }
         }
 
     };
 
     public static Job initialize() {
-        Job job = new AccessingEmfJob(Messages.getString("CodeGeneratorEmittersPoolFactory.initMessage")) { //$NON-NLS-1$
+        Job job = new Job(Messages.getString("CodeGeneratorEmittersPoolFactory.initMessage")) { //$NON-NLS-1$
 
             @Override
-            protected IStatus doRun(IProgressMonitor monitor) {
+            protected IStatus run(IProgressMonitor monitor) {
                 synchronized (delegateMonitor) {
                     if (jobRunnable == null) {
                         jobRunnable = new JobRunnable(Messages.getString("CodeGeneratorEmittersPoolFactory.codeThread")); //$NON-NLS-1$
@@ -332,8 +324,8 @@ public final class CodeGeneratorEmittersPoolFactory {
             }
 
         };
-        job.setUser(true);
-        job.setPriority(Job.INTERACTIVE);
+        job.setUser(false);
+        job.setPriority(Job.LONG);
         job.schedule();
         job.wakeUp(); // start as soon as possible
 
@@ -424,9 +416,15 @@ public final class CodeGeneratorEmittersPoolFactory {
             if (component.getAvailableCodeParts().contains(ECodePart.END)) {
                 initComponent(codeLanguage, jetBeans, ECodePart.END, component);
             }
+            if (component.getAvailableCodeParts().contains(ECodePart.FINALLY)) {
+                initComponent(codeLanguage, jetBeans, ECodePart.FINALLY, component);
+            }
             if (component.getAvailableCodeParts().contains(ECodePart.MRCODE)) {
                 initComponent(codeLanguage, jetBeans, ECodePart.MRCODE, component);
             }
+            if (component.getAvailableCodeParts().contains(ECodePart.MRJOBFOOTER)) {
+                initComponent(codeLanguage, jetBeans, ECodePart.MRJOBFOOTER, component);
+            }
             if (component.getAvailableCodeParts().contains(ECodePart.MRCONFIG)) {
                 initComponent(codeLanguage, jetBeans, ECodePart.MRCONFIG, component);
             }
@@ -665,7 +663,12 @@ public final class CodeGeneratorEmittersPoolFactory {
      */
     public static JETEmitter getJETEmitter(JetBean jetBean) {
         if (emitterPool == null || (!isInitialized() && !isInitializeStart())) {
-            initialize();
+            try {
+                new CodeGeneratorManager().initTemplate();
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
         }
 
         // only for components, not for /resources jet file, if it compile error, it will get the
@@ -775,4 +778,37 @@ public final class CodeGeneratorEmittersPoolFactory {
     public static boolean isInitializeStart() {
         return initializeStart;
     }
+
+    static class CodeGeneratorManager {
+
+        private IStatus status;
+
+        public IStatus initTemplate() throws InterruptedException {
+            final Job initializeTemplatesJob = initialize();
+            Job.getJobManager().addJobChangeListener(new JobChangeAdapter() {
+
+                @Override
+                public void done(IJobChangeEvent event) {
+                    if (event.getJob().equals(initializeTemplatesJob)) {
+                        setStatus(event.getResult());
+                    }
+                }
+            });
+
+            while (status == null) {
+                Thread.sleep(10);
+            }
+
+            return status;
+        }
+
+        private void setStatus(IStatus result) {
+            this.status = result;
+        }
+
+        private ICodeGeneratorService getCodeGenerationService() {
+            IService service = GlobalServiceRegister.getDefault().getService(ICodeGeneratorService.class);
+            return (ICodeGeneratorService) service;
+        }
+    }
 }

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

@@ -17,7 +17,6 @@ import java.io.File;
 import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -25,7 +24,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.emf.codegen.CodeGenPlugin;
-import org.eclipse.jdt.core.JavaCore;
 import org.talend.core.language.ECodeLanguage;
 
 /**
@@ -77,11 +75,7 @@ public final class EmfEmittersPersistenceFactory {
                 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));
             }
         } catch (CoreException e) {
             log.error(e.getMessage(), e);

org.talend.designer.codegen/src/main/java/org/talend/designer/codegen/proxy/JetProxy.java

@@ -51,7 +51,7 @@ public class JetProxy {
         IProgressMonitor sub = new SubProgressMonitor(monitor, 1);
         String result = ""; //$NON-NLS-1$
         if (emitter != null) {
-            result = emitter.generate(sub, new Object[] { jetBean.getArgument() });
+            result = emitter.generate(sub, new Object[] { jetBean });
             sub.worked(1);
         }
         return result;

org.talend.designer.components.exchange.nl/META-INF/eclipse.inf

@@ -0,0 +1 @@
+jarprocessor.exclude.children=true

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

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

@@ -1,4 +1,7 @@
 AvailableExtensionsComposite.FilterTitle=Filter
+AvailableExtensionsComposite.ViewDetail.installOperateStatus=Installieren
+AvailableExtensionsComposite.ViewDetail.WriteReview=Bericht schreiben
+AvailableExtensionsComposite.ViewDetail.InsertionReviewFailureTip=Sie sollten es prüfen.
 DownloadedExtensionsComposite.installedOperateStatus=Installiert
 DownloadedExtensionsComposite.updateOperateStatus=Update
 MyExtensionsComposite.UpdateOperateStatus=Update
@@ -6,12 +9,10 @@ MyExtensionsComposite.ModifyOperateStatus=Modifiziere
 MyExtensionsComposite.DeleteOperateStatus=Löschen
 MyExtensionsComposite.Form.Description=Beschreibung
 MyExtensionsComposite.Form.Upload.Browse=Durchsuchen...
+DeleteExtensionJob.DeleteFailure=Löschung fehlgeschlagen
+DeleteExtensionJob.DeleteFailureTip=Sie sollten es prüfen.
 DownloadComponenentsAction.DownloadTaskName=Lade Datei von URL:
 ImportExchangeDialog.WARNING=Warnung
 ImportExchangeDialog.AUTHOR_NAME=Name des Autors
 ImportExchangeDialog.LATEST_REVISION=Aktuellste Revision
-ImportExchangeDialog.JOB_BUTTON=Job-Design
-ImportExchangeDialog.ROUTINES_BUTTON=Routinen
-ImportExchangeDialog.ROUTINES_PROGRESSBAR=Lade einige Routinen...
-ImportExchangeDialog.TEMPLATES_BUTTON=SQL Templates
 ImportExchangeDialog.OPERATION_CANCELLED=Operation wurde abgebrochen

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

@@ -19,12 +19,5 @@ ImportExchangeDialog.EXTENSION_NAME=\u038C\u03BD\u03BF\u03BC\u03B1 \u0395\u03C0\
 ImportExchangeDialog.AUTHOR_NAME=\u038C\u03BD\u03BF\u03BC\u03B1 \u03A3\u03C5\u03B3\u03B3\u03C1\u03B1\u03C6\u03AD\u03B1
 ImportExchangeDialog.LATEST_REVISION=\u03A4\u03B5\u03BB\u03B5\u03C5\u03C4\u03B1\u03AF\u03B1 \u0391\u03BD\u03B1\u03B8\u03B5\u03CE\u03C1\u03B7\u03C3\u03B7
 ImportExchangeDialog.EXTENSION_DESCRIPTION=\u03A0\u03B5\u03C1\u03B9\u03B3\u03C1\u03B1\u03C6\u03AE \u0395\u03C0\u03AD\u03BA\u03C4\u03B1\u03C3\u03B7\u03C2
-ImportExchangeDialog.JOB_BUTTON=\u03A3\u03C7\u03AD\u03B4\u03B9\u03B1 \u0395\u03C1\u03B3\u03B1\u03C3\u03B9\u03CE\u03BD
-ImportExchangeDialog.DOWNLOAD_JOB=\u039B\u03AE\u03C8\u03B7 \u039A\u03AC\u03C0\u03BF\u03B9\u03C9\u03BD \u03A3\u03C7\u03B5\u03B4\u03AF\u03C9\u03BD \u0395\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1\u03C2...
-ImportExchangeDialog.ROUTINES_BUTTON=\u03A1\u03BF\u03C5\u03C4\u03AF\u03BD\u03B5\u03C2
-ImportExchangeDialog.ROUTINES_PROGRESSBAR=\u039B\u03AE\u03C8\u03B7 \u039A\u03AC\u03C0\u03BF\u03B9\u03C9\u03BD \u03A1\u03BF\u03C5\u03C4\u03B9\u03BD\u03CE\u03BD...
-ImportExchangeDialog.TEMPLATES_BUTTON=\u03A0\u03C1\u03CC\u03C4\u03C5\u03C0\u03B1 SQL
-ImportExchangeDialog.TEMPLATES_PROGRESSBAR=\u039B\u03AE\u03C8\u03B7 \u039A\u03AC\u03C0\u03BF\u03B9\u03C9\u03BD \u03A0\u03C1\u03BF\u03C4\u03CD\u03C0\u03C9\u03BD SQL...
 ImportExchangeDialog.REFRESH_BUTTON=\u0391\u03BD\u03B1\u03BD\u03AD\u03C9\u03C3\u03B7
-ImportExchangeDialog.NOT_SELECT_BUTTON=\u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03BA\u03AC\u03BD\u03C4\u03B5 \u03BC\u03B9\u03B1 \u03B5\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE \u03C0\u03C1\u03CE\u03C4\u03B1
 ImportExchangeDialog.OPERATION_CANCELLED=\u0397 \u03BB\u03B5\u03B9\u03C4\u03BF\u03C5\u03C1\u03B3\u03AF\u03B1 \u03B1\u03BA\u03C5\u03C1\u03CE\u03B8\u03B7\u03BA\u03B5

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

@@ -89,15 +89,8 @@ ImportExchangeDialog.EXTENSION_NAME=Extension Name
 ImportExchangeDialog.AUTHOR_NAME=Author Name
 ImportExchangeDialog.LATEST_REVISION=Latest Revision
 ImportExchangeDialog.EXTENSION_DESCRIPTION=Extension Description
-ImportExchangeDialog.download.components=Download Components Please Wait\!
-ImportExchangeDialog.JOB_BUTTON=Job Designs
-ImportExchangeDialog.DOWNLOAD_JOB=Download Some Job Designs...
-ImportExchangeDialog.ROUTINES_BUTTON=Routines
-ImportExchangeDialog.ROUTINES_PROGRESSBAR=Download Some Routines...
-ImportExchangeDialog.TEMPLATES_BUTTON=SQL Templates
-ImportExchangeDialog.TEMPLATES_PROGRESSBAR=Download Some SQL Templates...
 ImportExchangeDialog.REFRESH_BUTTON=Refresh
 ImportExchangeDialog.REFRESHING_PROGRESSBAR=Refreshing\! Please Wait.....
-ImportExchangeDialog.NOT_SELECT_BUTTON=Please select a choice first
 ImportExchangeDialog.OPERATION_CANCELLED=Operation was cancelled
 Exchange.logon.error=Exchange user have not been registered, please register using the preferences .
+ImportExchangeDialog.download.extensions=Download extensions\! Please Wait\!

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

@@ -3,17 +3,19 @@ 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
@@ -69,14 +71,7 @@ ImportExchangeDialog.EXTENSION_NAME=Nom de l'extension
 ImportExchangeDialog.AUTHOR_NAME=Nom de l'auteur
 ImportExchangeDialog.LATEST_REVISION=Dernière révision
 ImportExchangeDialog.EXTENSION_DESCRIPTION=Description de l'extension
-ImportExchangeDialog.download.components=Téléchargement de composants, veuillez patienter.
-ImportExchangeDialog.JOB_BUTTON=Job Designs
-ImportExchangeDialog.DOWNLOAD_JOB=Télécharger des Jobs Designs...
-ImportExchangeDialog.ROUTINES_BUTTON=Routines
-ImportExchangeDialog.ROUTINES_PROGRESSBAR=Télécharger des Routines...
-ImportExchangeDialog.TEMPLATES_PROGRESSBAR=Télécharger des modèles SQL...
 ImportExchangeDialog.REFRESH_BUTTON=Rafraîchir
 ImportExchangeDialog.REFRESHING_PROGRESSBAR=Rafraîchissement, veuillez patienter..
-ImportExchangeDialog.NOT_SELECT_BUTTON=Merci de d'abord sélectionner un choix
 ImportExchangeDialog.OPERATION_CANCELLED=L'opération a été annulée
 Exchange.logon.error=L'utilisateur de l'Exchange n'est pas enregistré. Enregistrez-vous via les Préférences.

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

@@ -14,7 +14,4 @@ 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_ja.properties

@@ -88,14 +88,7 @@ ImportExchangeDialog.EXTENSION_NAME=Extension\u540D
 ImportExchangeDialog.AUTHOR_NAME=\u4f5c\u6210\u8005\u540d
 ImportExchangeDialog.LATEST_REVISION=\u6700\u65B0\u30EA\u30D3\u30B8\u30E7\u30F3
 ImportExchangeDialog.EXTENSION_DESCRIPTION=Extension\u8AAC\u660E
-ImportExchangeDialog.download.components=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D\u3067\u3059\u3001\u66AB\u304F\u304A\u5F85\u3061\u4E0B\u3055\u3044\u3002
-ImportExchangeDialog.JOB_BUTTON=\u30B8\u30E7\u30D6
-ImportExchangeDialog.DOWNLOAD_JOB=\u30B8\u30E7\u30D6\u30C7\u30B6\u30A4\u30F3\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u307E\u3059\u2026
-ImportExchangeDialog.ROUTINES_BUTTON=\u30EB\u30FC\u30C1\u30F3
-ImportExchangeDialog.ROUTINES_PROGRESSBAR=\u30EB\u30FC\u30C1\u30F3\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9...
-ImportExchangeDialog.TEMPLATES_BUTTON=SQL\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8
-ImportExchangeDialog.TEMPLATES_PROGRESSBAR=SQL\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9...
 ImportExchangeDialog.REFRESH_BUTTON=\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5
-ImportExchangeDialog.NOT_SELECT_BUTTON=\u5148\u306B\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 ImportExchangeDialog.OPERATION_CANCELLED=\u64CD\u4F5C\u3092\u30AD\u30E3\u30F3\u30BB\u30EB
 Exchange.logon.error=Exchange\u30E6\u30FC\u30B6\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u521D\u671F\u8A2D\u5B9A\u3092\u4F7F\u7528\u3057\u3066\u767B\u9332\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+ImportExchangeDialog.download.extensions=\u62E1\u5F35\u6A5F\u80FD\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u4E2D\u3067\u3059\u3001\u66AB\u304F\u304A\u5F85\u3061\u4E0B\u3055\u3044\u3002

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

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