Fix Bug TDI-24364 : Add the fullname like: routines.system.Document for the Document Type in the generated code

https://jira.talendforge.org/browse/TDI-24364

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

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

@@ -38,7 +38,7 @@ ComponentProjectPreferencePage.ChooseProject=S
 WizardComponentFolderPage.ErrMSG5=La famille du composant est vide
 WizardComponentFolderPage.ErrMSG4=Le nom long du composant est vide
 AbstractXMLConfigPage.BooleanTip=Booléen (vrai ou faux)
-AbstractXMLConfigPage.Delete=Supprimer
+AbstractXMLConfigPage.Delete=DELETE
 WizardComponentFolderPage.ErrMSG3=Ce composant existe déjà
 WizardComponentFolderPage.ErrMSG2=Le nom du composant est vide
 WizardComponentFolderPage.ErrMSG1=Le langage du composant n'a pas été sélectionné

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

@@ -3,7 +3,7 @@ PushToPaletteActionProvider.PushComponentsToPalette=\u30B3\u30F3\u30DD\u30FC\u30
 EditComponentActionProvider.Edit=\u3053\u306E\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u7DE8\u96C6
 ImportComponentDialog.ErrorMSG4=\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 ProjectSelectionDialog.SelectPath=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30D1\u30B9\u306E\u9078\u629E
-AbstractXMLConfigPage.TYPETip=\u30C7\u30FC\u30BF\u578B\u3002
+AbstractXMLConfigPage.TYPETip=\u30C7\u30FC\u30BF\u578B
 PushToPaletteActionProvider.Error2=\u30A8\u30E9\u30FC
 CopyFromPaletteActionProvider.Label2=\u30D1\u30EC\u30C3\u30C8\u304B\u3089\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30A4\u30F3\u30DD\u30FC\u30C8
 AbstractXMLConfigPage.MAXOUTPUTTip=\u6574\u6570\u5024\u3002\u3053\u306E\u63A5\u7D9A\u306E\u6700\u5927\u51FA\u529B\u6570\u3002

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

@@ -0,0 +1,8 @@
+PushToPaletteActionProvider.Error2=Fout
+PushToPaletteActionProvider.Error=Fout
+NewActionProvider.New=Nieuw
+NewActionProvider.NewComponent=Nieuw Component
+AbstractXMLConfigPage.Delete=Verwijderen
+CreateComponentWizard.NewComponent=Nieuw Component
+WizardComponentFolderPage.Name=Naam
+AbstractXMLConfigPage.New=Nieuw

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

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

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

@@ -1,3 +1,4 @@
 ApplicationActionBarAdvisor.helpMenu=\uB3C4\uC6C0\uB9D0\uBA54\uB274
 ApplicationActionBarAdvisor.fileMenu=\uD30C\uC77C\uBA54\uB274
-ApplicationActionBarAdvisor.windowMenu=\uC708\uB3C4\uC6B0\uBA54\uB274
+ApplicationActionBarAdvisor.windowMenu=\uC708\uB3C4\uC6B0
+ApplicationWorkbenchWindowAdvisor.rcpApp=RCP \uC5B4\uD50C\uB9AC\uCF00\uC774\uC158

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

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

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

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

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

@@ -52,7 +52,7 @@ public class TreeNodeAttrCompsite extends Composite {
             gd = new GridData();
             gd.horizontalSpan = 2;
             label.setLayoutData(gd);
-            final Text nodeText = new Text(this, SWT.BORDER | SWT.MULTI | SWT.WRAP);
+            final Text nodeText = new Text(this, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
             gd = new GridData(GridData.FILL_BOTH);
             gd.horizontalSpan = 2;
             nodeText.setLayoutData(gd);
@@ -60,6 +60,7 @@ public class TreeNodeAttrCompsite extends Composite {
 
             nodeText.addModifyListener(new ModifyListener() {
 
+                @Override
                 public void modifyText(ModifyEvent e) {
                     nodeData.getXMLNode().setTextContent(nodeText.getText());
                     nodeData.setBodayText(nodeText.getText());
@@ -87,6 +88,7 @@ public class TreeNodeAttrCompsite extends Composite {
 
                     attrText.addModifyListener(new ModifyListener() {
 
+                        @Override
                         public void modifyText(ModifyEvent e) {
                             String attrName = attrLabel.getText().split(MARK)[0];
                             if (attrText.getText().equals(PluginConstant.EMPTY_STRING)) {
@@ -128,6 +130,7 @@ public class TreeNodeAttrCompsite extends Composite {
 
                     attrCombo.addModifyListener(new ModifyListener() {
 
+                        @Override
                         public void modifyText(ModifyEvent e) {
                             String attrName = attrLabel.getText().split(MARK)[0];
                             if (attrCombo.getText().equals(PluginConstant.EMPTY_STRING)) {

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

@@ -18,8 +18,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -71,6 +73,8 @@ public abstract class AbstractXMLConfigPage extends AbstractComponentPage {
 
     protected Map<String, String> attrsToolTipsMap = null;
 
+    private ScrolledComposite scrolledComposite;
+
     /**
      * DOC rli WizardXMLConfigPage constructor comment.
      * 
@@ -95,14 +99,19 @@ public abstract class AbstractXMLConfigPage extends AbstractComponentPage {
         topComposite.setLayout(new GridLayout(2, false));
         GridData data = new GridData(GridData.FILL_BOTH);
         topComposite.setLayoutData(data);
+        // topComposite.setLayout(new FillLayout());
         availableXmlTree = new Tree(topComposite, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
         GridData treeGD = new GridData(GridData.FILL_BOTH);
-        treeGD.widthHint = 110;
+        treeGD.widthHint = 196;
         treeGD.grabExcessHorizontalSpace = true;
         treeGD.grabExcessVerticalSpace = true;
         availableXmlTree.setLayoutData(treeGD);
 
-        rightComposite = new Composite(topComposite, SWT.NONE);
+        scrolledComposite = new ScrolledComposite(topComposite, SWT.V_SCROLL);
+        scrolledComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
+        scrolledComposite.setLayout(new FillLayout());
+        // rightComposite = new Composite(topComposite, SWT.NONE);
+        rightComposite = new Composite(scrolledComposite, SWT.NONE);
         GridData rightPanelGd = new GridData(GridData.FILL_BOTH);
         rightPanelGd.widthHint = 180;
         rightComposite.setLayoutData(rightPanelGd);
@@ -113,6 +122,10 @@ public abstract class AbstractXMLConfigPage extends AbstractComponentPage {
         GridData labelGd = new GridData(GridData.FILL_HORIZONTAL);
         label.setLayoutData(labelGd);
 
+        scrolledComposite.setContent(rightComposite);
+        scrolledComposite.setExpandHorizontal(true);
+        scrolledComposite.setExpandVertical(true);
+
         this.setControl(topComposite);
     }
 
@@ -121,6 +134,7 @@ public abstract class AbstractXMLConfigPage extends AbstractComponentPage {
      * 
      * @see org.talend.componentdesigner.ui.wizard.creatcomponent.AbstractComponentPage#initialize()
      */
+    @Override
     protected void initialize() {
         availableXmlTree.addSelectionListener(new SelectionAdapter() {
 
@@ -139,6 +153,7 @@ public abstract class AbstractXMLConfigPage extends AbstractComponentPage {
                 itemDel.setText(Messages.getString("AbstractXMLConfigPage.Delete")); //$NON-NLS-1$
                 itemDel.addSelectionListener(new SelectionAdapter() {
 
+                    @Override
                     public void widgetSelected(SelectionEvent e) {
                         TreeNodeData currentNodeData = (TreeNodeData) treeItem[0].getParentItem().getData();
                         currentNodeData.getXMLNode().removeChild(((TreeNodeData) treeItem[0].getData()).getXMLNode());
@@ -158,6 +173,7 @@ public abstract class AbstractXMLConfigPage extends AbstractComponentPage {
                         nodeMenuItem.setText(itemName);
                         nodeMenuItem.addSelectionListener(new SelectionAdapter() {
 
+                            @Override
                             public void widgetSelected(SelectionEvent e) {
                                 TreeItem newItem = new TreeItem(treeItem[0], 0);
                                 newItem.setText(itemName);
@@ -182,6 +198,7 @@ public abstract class AbstractXMLConfigPage extends AbstractComponentPage {
                     nodeAttrCompsite.dispose();
                 }
                 rebuildAttrComposite(treeNodeData);
+                setComponentMinSize(treeNodeData.getTreeNode().getLabel());
                 rightComposite.layout();
             }
 
@@ -189,11 +206,30 @@ public abstract class AbstractXMLConfigPage extends AbstractComponentPage {
 
     }
 
+    private void setComponentMinSize(String label) {
+        if (("HEADER").equals(label)) {
+            scrolledComposite.setMinSize(0, 0);
+            scrolledComposite.setMinSize(0, 750);
+        } else if (("CONNECTOR").equals(label)) {
+            scrolledComposite.setMinSize(0, 0);
+            scrolledComposite.setMinSize(0, 500);
+        } else if (("PARAMETER").equals(label)) {
+            scrolledComposite.setMinSize(0, 0);
+            scrolledComposite.setMinSize(0, 630);
+        } else if (("RETURN").equals(label)) {
+            scrolledComposite.setMinSize(0, 0);
+            scrolledComposite.setMinSize(0, 150);
+        } else {
+            scrolledComposite.setMinSize(0, 0);
+        }
+    }
+
     /*
      * (non-Javadoc)
      * 
      * @see org.talend.componentdesigner.ui.wizard.creatcomponent.AbstractComponentPage#validatePage()
      */
+    @Override
     protected boolean validatePage() {
         return false;
     }

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

@@ -4,6 +4,7 @@ prefs.configuration.LINK_STYLE.LINE=Lignes (rapide)
 prefs.configuration.LINK_STYLE.BEZIER_CURVE=Courbes
 prefs.configuration.LINK_STYLE=Affichage par défaut du lien de mapping \:
 DraggingInfosPopup.draggingEntry=Glissement de {0} entrée.
+DraggingInfosPopup.dropInvalid=\n<< Déposer invalide >>\n
 DraggingInfosPopup.draggingEntries=Glissement de {0} entrées.
 DraggingInfosPopup.overwriteMode=\ > Mode écrasement
 DraggingInfosPopup.appendMode=\ > Mode écrire après

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

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

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

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

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

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

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

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

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

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

org.talend.designer.business.diagram/src/org/talend/designer/business/diagram/custom/edit/parts/BusinessItemShapeEditPart.java

@@ -13,9 +13,12 @@
 package org.talend.designer.business.diagram.custom.edit.parts;
 
 import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.MouseEvent;
+import org.eclipse.draw2d.MouseMotionListener;
 import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
@@ -42,6 +45,8 @@ public abstract class BusinessItemShapeEditPart extends ShapeNodeEditPart {
 
     private ElementHelper elementHelper;
 
+    private EditPart editPart;
+
     /**
      * DOC mhelleboid BusinessItemShapeEditPart constructor comment.
      * 
@@ -51,6 +56,7 @@ public abstract class BusinessItemShapeEditPart extends ShapeNodeEditPart {
         super(view);
         tooltipFigure = new BusinessTooltipFigure();
         elementHelper = new ElementHelper();
+        editPart = this;
     }
 
     @Override
@@ -103,6 +109,33 @@ public abstract class BusinessItemShapeEditPart extends ShapeNodeEditPart {
                 for (Object figure : shapFigure.getChildren()) {
                     if (figure instanceof BusinessItemNameFigure) {
                         BusinessItemNameFigure nameFigure = (BusinessItemNameFigure) figure;
+                        nameFigure.addMouseMotionListener(new MouseMotionListener() {
+
+                            @Override
+                            public void mouseMoved(MouseEvent me) {
+                                // TODO Auto-generated method stub
+                            }
+
+                            @Override
+                            public void mouseHover(MouseEvent me) {
+                                // TODO Auto-generated method stub
+                            }
+
+                            @Override
+                            public void mouseExited(MouseEvent me) {
+                                // TODO Auto-generated method stub
+                            }
+
+                            @Override
+                            public void mouseEntered(MouseEvent me) {
+                                elementHelper.updateTooltipFigure(getNodeFigure(), tooltipFigure, editPart);
+                            }
+
+                            @Override
+                            public void mouseDragged(MouseEvent me) {
+                                // TODO Auto-generated method stub
+                            }
+                        });
                         EObject object = ((Node) getModel()).getElement();
                         if (object instanceof BusinessItem) {
                             BusinessItem item = (BusinessItem) object;
@@ -180,9 +213,9 @@ public abstract class BusinessItemShapeEditPart extends ShapeNodeEditPart {
     private BusinessAlignment getAlignment(String alignment) {
         BusinessAlignment[] alignments = BusinessAlignment.values();
         BusinessAlignment position = null;
-        for (int i = 0; i < alignments.length; i++) {
-            if (alignments[i].toString().equalsIgnoreCase(alignment)) {
-                position = alignments[i];
+        for (BusinessAlignment alignment2 : alignments) {
+            if (alignment2.toString().equalsIgnoreCase(alignment)) {
+                position = alignment2;
                 return position;
             }
 

org.talend.designer.business.diagram/src/org/talend/designer/business/diagram/custom/listeners/BusinessDeleteListener.java

@@ -18,6 +18,7 @@ import java.beans.PropertyChangeListener;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.core.CorePlugin;
+import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryObject;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
@@ -29,12 +30,6 @@ import org.talend.repository.model.IProxyRepositoryFactory;
  */
 public class BusinessDeleteListener implements PropertyChangeListener {
 
-    private IRepositoryObject businessObjectToDelete;
-
-    private boolean isDeleteBusinessLogical;
-
-    private boolean isDeleteBusinessPhysical;
-
     private IProxyRepositoryFactory factory = null;
 
     public BusinessDeleteListener() {
@@ -46,10 +41,11 @@ public class BusinessDeleteListener implements PropertyChangeListener {
      * 
      * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
      */
+    @Override
     public void propertyChange(PropertyChangeEvent event) {
 
-        isDeleteBusinessLogical = event.getPropertyName().equals(ERepositoryActionName.BUSINESS_DELETE_TO_RECYCLE_BIN.getName());
-        isDeleteBusinessPhysical = event.getPropertyName().equals(ERepositoryActionName.BUSINESS_DELETE_FOREVER.getName());
+        boolean isDeleteBusinessLogical = event.getPropertyName().equals(ERepositoryActionName.DELETE_TO_RECYCLE_BIN.getName());
+        boolean isDeleteBusinessPhysical = event.getPropertyName().equals(ERepositoryActionName.DELETE_FOREVER.getName());
 
         if (!isDeleteBusinessLogical && !isDeleteBusinessPhysical) {
             return;
@@ -58,13 +54,18 @@ public class BusinessDeleteListener implements PropertyChangeListener {
         if (!(event.getNewValue() instanceof IRepositoryObject)) {
             return;
         }
-        businessObjectToDelete = (IRepositoryObject) event.getNewValue();
+        IRepositoryObject object = (IRepositoryObject) event.getNewValue();
+        if (object.getRepositoryObjectType() != ERepositoryObjectType.BUSINESS_PROCESS) {
+            return;
+        }
 
-        if (businessObjectToDelete != null) {
+        object = (IRepositoryObject) event.getNewValue();
+
+        if (object != null) {
 
             try {
 
-                deleteSVGObjectLogicalOrPhysical(businessObjectToDelete, isDeleteBusinessLogical);
+                deleteSVGObjectLogicalOrPhysical(object, isDeleteBusinessLogical);
 
             } catch (PersistenceException e) {
                 ExceptionHandler.process(e);

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

@@ -27,8 +27,8 @@ import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.runtime.image.ECoreImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
 import org.talend.commons.ui.runtime.image.ImageUtils;
-import org.talend.commons.ui.runtime.image.OverlayImage;
 import org.talend.commons.ui.runtime.image.ImageUtils.ICON_SIZE;
+import org.talend.commons.ui.runtime.image.OverlayImage;
 import org.talend.commons.ui.runtime.image.OverlayImage.EPosition;
 import org.talend.core.CorePlugin;
 import org.talend.core.model.metadata.MetadataTool;
@@ -97,8 +97,8 @@ public class ElementHelper {
                     if (assignment instanceof BusinessAssignment) {
                         TalendItem talendItem = ((BusinessAssignment) assignment).getTalendItem();
                         if (talendItem != null) {
-                            IRepositoryViewObject obj = CorePlugin.getDefault().getProxyRepositoryFactory().getLastVersion(
-                                    talendItem.getId());
+                            IRepositoryViewObject obj = CorePlugin.getDefault().getProxyRepositoryFactory()
+                                    .getLastVersion(talendItem.getId());
                             if (obj != null) {
                                 ERepositoryObjectType type = obj.getRepositoryObjectType();
                                 Item item = obj.getProperty().getItem();
@@ -113,7 +113,7 @@ public class ElementHelper {
                                 } else {
                                     img = CoreImageProvider.getImage(type);
                                 }
-                                label = new Label(talendItem.getLabel() + " (" + provider.getColumnText(assignment, 0) + ")", img); //$NON-NLS-1$ //$NON-NLS-2$
+                                label = new Label(obj.getLabel() + " (" + provider.getColumnText(assignment, 0) + ")", img); //$NON-NLS-1$ //$NON-NLS-2$
                                 labels.add(label);
                             } else {
 

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

@@ -187,15 +187,18 @@ public class BusinessAssignmentComposite extends AbstractTabComposite {
 
         tableViewer.setCellModifier(new ICellModifier() {
 
+            @Override
             public boolean canModify(Object element, String property) {
                 return property.equals(columnProperties[2]);
             }
 
+            @Override
             public Object getValue(Object element, String property) {
                 return EmfPropertyHelper.getValue(itemPropertyDescriptor, element);
 
             }
 
+            @Override
             public void modify(Object element, String property, Object value) {
                 if (element instanceof TableItem) {
                     TableItem tableItem = (TableItem) element;
@@ -221,6 +224,7 @@ public class BusinessAssignmentComposite extends AbstractTabComposite {
     private void createDoubleClickListener() {
         tableViewer.addDoubleClickListener(new IDoubleClickListener() {
 
+            @Override
             public void doubleClick(DoubleClickEvent event) {
 
                 BusinessAssignment businessAssignment = getBusinessAssignment(event.getSelection());
@@ -254,6 +258,7 @@ public class BusinessAssignmentComposite extends AbstractTabComposite {
     private void createSelectionListener() {
         tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
+            @Override
             public void selectionChanged(SelectionChangedEvent event) {
                 BusinessAssignment businessAssignment = getBusinessAssignment(event.getSelection());
                 if (businessAssignment != null) {
@@ -390,6 +395,7 @@ public class BusinessAssignmentComposite extends AbstractTabComposite {
         menuMgr.setRemoveAllWhenShown(true);
         menuMgr.addMenuListener(new IMenuListener() {
 
+            @Override
             public void menuAboutToShow(IMenuManager mgr) {
                 BusinessAssignment businessAssignment = getBusinessAssignment(tableViewer.getSelection());
                 if (businessAssignment != null) {
@@ -518,6 +524,7 @@ public class BusinessAssignmentComposite extends AbstractTabComposite {
     private void createKeyListener(Table table) {
         table.addKeyListener(new KeyAdapter() {
 
+            @Override
             public void keyPressed(KeyEvent event) {
                 ISelection selection = tableViewer.getSelection();
                 if (selection instanceof IStructuredSelection) {
@@ -558,4 +565,12 @@ public class BusinessAssignmentComposite extends AbstractTabComposite {
         return new StructuredSelection(repositoryNode);
     }
 
+    @Override
+    public void refresh() {
+        super.refresh();
+        if (tableViewer != null) {
+            tableViewer.refresh();
+        }
+    }
+
 }

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

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

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

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

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

@@ -1,7 +1,7 @@
 CodeGeneratorEmittersPoolFactory.JETEmitters.NoPresent=JETEmitters\u5DE5\u7A0B\u4E0D\u5B58\u5728\uFF0C\u9700\u8981\u91CD\u65B0\u5B8C\u6574\u521D\u59CB\u5316\u3002
 CodeGeneratorEmittersPoolFactory.Class.NotFound=\u6A21\u677F\u4F9D\u7136\u5B58\u5728\uFF0C\u4F46\u662F\u7C7B{0}
 CodeGeneratorEmittersPoolFactory.PersitentData.Error=\u6301\u4E45\u5316\u6570\u636E\u4E0D\u80FD\u4FDD\u5B58\uFF1A
-CodeGeneratorEmittersPoolFactory.initMessage=\u4EA7\u751F\u521D\u59CB\u5316\u5F15\u64CE...
+CodeGeneratorEmittersPoolFactory.initMessage=\u521D\u59CB\u5316\u4EE3\u7801\u751F\u6210\u5F15\u64CE...
 EmfEmittersPersistence.CodeGen.DataMissing=\u4EE3\u7801\u751F\u6210\u6570\u636E\u6D41\u5931\uFF0C\u5F00\u59CB\u91CD\u65B0\u751F\u6210\u4EE3\u7801\u3002
 CodeGenerator.JET.TimeOut=JET\u521D\u59CB\u5316\u8D85\u65F6\uFF01
 generatedcode.copyright.body4=\u4F60\u53EF\u4EE5\u5728\u5728GNU LGPL \u8BB8\u53EF\u8BC1\u4E0B\u652F\u914D\u8FD9\u4E9B\u4EE3\u7801

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

@@ -24,7 +24,7 @@
 		}	
 		
 
-		protected void doStop() throws Exception {
+		protected void doStop() throws java.lang.Exception {
 			super.doStop();
 			getCamelContexts().get(0).stop();
 		}
@@ -240,11 +240,11 @@
 				return null;
 			}
 			
-			public void stop() throws Exception {
+			public void stop() throws java.lang.Exception {
 				camelImplementation.stop();
 			}
 			
-			public void shutdown() throws Exception {
+			public void shutdown() throws java.lang.Exception {
 				camelImplementation.shutdown();
 			}
 		};	

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

@@ -50,7 +50,7 @@ class CamelImpl extends org.apache.camel.impl.MainSupport {
 		try {
 			postProcessContext();
 			initRoute();
-		} catch (Exception e) {
+		} catch (java.lang.Exception e) {
 			e.printStackTrace();
 		}
 	}
@@ -64,7 +64,7 @@ class CamelImpl extends org.apache.camel.impl.MainSupport {
 		return instance;
 	}
 
-	protected void doStart() throws Exception {
+	protected void doStart() throws java.lang.Exception {
 		super.doStart();
 
 		org.apache.camel.management.JmxNotificationEventNotifier notifier = new org.apache.camel.management.JmxNotificationEventNotifier();
@@ -123,9 +123,9 @@ for (INode node : processNodes) {
 
 	}
 
-	public void initRoute() throws Exception {
+	public void initRoute() throws java.lang.Exception {
 		routeBuilder = new org.apache.camel.builder.RouteBuilder() {
-			public void configure() throws Exception {
+			public void configure() throws java.lang.Exception {
 <%
 	for (INode node : processNodes) {
 		if (node.getComponent().getName().equals("cCXF")) {

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

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

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

@@ -378,7 +378,7 @@ this.globalResumeTicket = true;//to run tPreJob
 %>
 		try {
 			<%=statCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
-		} catch (Exception e) {
+		} catch (java.lang.Exception e) {
 			e.printStackTrace();
 		}		
 <%
@@ -417,19 +417,20 @@ this.globalResumeTicket = false;//to run others jobs
                 threadLocal.set(threadRunResultMap);
 	    	    
 				<%=createCallProcess(rootNode, process.getName(), true) %>
-	        	
-                Integer localErrorCode = (Integer)(((java.util.Map)threadLocal.get()).get("errorCode"));
-                String localStatus = (String)(((java.util.Map)threadLocal.get()).get("status"));
-                if (localErrorCode != null) {
-                    if (errorCode == null || localErrorCode.compareTo(errorCode) > 0) {
-                       errorCode = localErrorCode;
-                    }
-                }
-                if(!status.equals("failure")){
-                        status = localStatus;
-                }	
-         	    
-                runningThreadCount.add(-1);	        	
+	        	finally {
+	                Integer localErrorCode = (Integer)(((java.util.Map)threadLocal.get()).get("errorCode"));
+	                String localStatus = (String)(((java.util.Map)threadLocal.get()).get("status"));
+	                if (localErrorCode != null) {
+	                    if (errorCode == null || localErrorCode.compareTo(errorCode) > 0) {
+	                       errorCode = localErrorCode;
+	                    }
+	                }
+	                if(!status.equals("failure")){
+	                        status = localStatus;
+	                }	
+	         	    
+	                runningThreadCount.add(-1);
+	            }	        	
 	    	}
 		}.start();
 		
@@ -441,7 +442,7 @@ this.globalResumeTicket = false;//to run others jobs
     {
         try {
             Thread.sleep(10);
-        } catch (Exception e) {
+        } catch (java.lang.Exception e) {
             e.printStackTrace();
         }            
     }
@@ -497,7 +498,7 @@ this.globalResumeTicket = true;//to run tPostJob
 		<%=statCatcherNode.getUniqueName() %>.addMessage(status==""?"end":status, (end-startTime));
 		try {
 			<%=statCatcherNode.getDesignSubjobStartNode().getUniqueName() %>Process(globalMap);
-		} catch (Exception e) {
+		} catch (java.lang.Exception e) {
 			e.printStackTrace();
 		}
 <%

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

@@ -2,7 +2,7 @@ import org.talend.core.model.process.INode;
 
 public class CLASS
 {
-    private static String end_multiThread = "((java.util.Map) threadLocal.get()).put(\"status\", \"end\");";
+    private static String end_multiThread = "if ( !\"failure\".equals(((java.util.Map)threadLocal.get()).get(\"status\")) ) {\n((java.util.Map) threadLocal.get()).put(\"status\", \"end\");\n}";
     private static String end_singleThread = "if(!\"failure\".equals(status)) { status = \"end\"; }";
     private static String failure_multiThread = "((java.util.Map) threadLocal.get()).put(\"status\", \"failure\");";
     private static String failure_singleThread = "status = \"failure\";";
@@ -29,11 +29,11 @@ public class CLASS
         
         toReturn += "\n}catch (TalendException e_" + rootNode.getUniqueName() + ") {\n";
         
-        if(isMultiThread) {
-            toReturn +=  failure_multiThread;
-        }else{
-            toReturn +=  failure_singleThread;
-        }
+//        if(isMultiThread) {
+//            toReturn +=  failure_multiThread;
+//        }else{
+//            toReturn +=  failure_singleThread;
+//        }
         
         toReturn += "\ne_" + rootNode.getUniqueName() + ".printStackTrace();\n";
         
@@ -45,7 +45,12 @@ public class CLASS
        //        toReturn += createCallProcess(conn.getTarget(),  className, isMultiThread);
        //    }
        //}            
-       toReturn += "\n}finally {\n}"; 
+        if(isMultiThread){
+            toReturn += "\n}catch (Error e_" + rootNode.getUniqueName() + ") {\n";
+            toReturn += "\ne_" + rootNode.getUniqueName() + ".printStackTrace();\n";
+            toReturn += "globalMap.put(\""+rootNode.getUniqueName()+ "_SUBPROCESS_STATE\", -1);\n";
+        }
+       toReturn += "\n}"; 
        return toReturn;
     }
 		 

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

@@ -2,21 +2,13 @@
 	package="org.talend.designer.codegen.translators" 
 	imports="
 		org.talend.core.model.process.IProcess
-		org.talend.core.model.process.INode 
 		org.talend.designer.codegen.config.CodeGeneratorArgument
-		org.talend.core.CorePlugin
-        org.talend.core.model.process.EConnectionType
-        org.talend.core.model.process.IConnection	
-		org.talend.core.model.metadata.IMetadataTable
-		org.talend.core.model.metadata.IMetadataColumn
 		java.util.Vector
 		java.util.List
 		java.util.ArrayList
 		org.talend.core.model.process.IContextParameter
 		org.talend.core.model.metadata.types.JavaTypesManager
-		org.talend.core.model.metadata.types.JavaType
 		org.talend.core.model.utils.JavaResourcesHelper
-		org.talend.core.model.process.ElementParameterParser
 	" 
 	class="Footer" 
 	skeleton="footer_java.skeleton"	
@@ -142,15 +134,14 @@
 			    context.putAll(context_param);		
 			}
 <% 
-			for (IContextParameter ctxParam :params)
-			{
+			//for bug TDI-22398
+			for (IContextParameter ctxParam :params){ //start for
 			    String typeToGenerate ="String";
 			    if( !(ctxParam.getType().equals("id_File") || ctxParam.getType().equals("id_Directory") ||ctxParam.getType().equals("id_List Of Value")))
 			    {
 			       typeToGenerate=JavaTypesManager.getTypeToGenerate(ctxParam.getType(),true);
 			    }
-			    if(typeToGenerate.equals("java.util.Date"))
-			    {
+			    if(typeToGenerate.equals("java.util.Date")){ // start if
 			        
 %>
 			try{
@@ -171,47 +162,25 @@
 			{
 			    context.<%=ctxParam.getName()%>=null;
 			}
+<%
+		    	}else if(typeToGenerate.equals("Object")||typeToGenerate.equals("String")||typeToGenerate.equals("java.lang.String") ){
 %>
-			}else if(typeToGenerate.equals("Integer"))
-			    {
+			    	context.<%=ctxParam.getName()%>=(<%=typeToGenerate%>) context.getProperty("<%=ctxParam.getName()%>");
+<%
+				}else if(typeToGenerate.equals("Character")&&ctxParam.getName()!=null){
+%>
+			 	context.<%=ctxParam.getName()%>= new java.text.StringCharacterIterator(context.getProperty("<%=ctxParam.getName()%>")).first();			 
+<%
+            	}else{
 %> 
-			  try{
-			      context.<%=ctxParam.getName()%>=Integer.parseInt(context.getProperty("<%=ctxParam.getName()%>"));
-			  }catch(NumberFormatException e){
-			      context.<%=ctxParam.getName()%>=null;
-			  }
+			 		try{
+			     		context.<%=ctxParam.getName()%>=routines.system.ParserUtils.parseTo_<%=typeToGenerate%> (context.getProperty("<%=ctxParam.getName()%>"));
+			 		}catch(NumberFormatException e){
+			     		context.<%=ctxParam.getName()%>=null;
+			 		}
 <%
-			    }else if(typeToGenerate.equals("Object")||typeToGenerate.equals("String")||typeToGenerate.equals("java.lang.String") )
-			    {
-%>
-			    context.<%=ctxParam.getName()%>=(<%=typeToGenerate%>) context.getProperty("<%=ctxParam.getName()%>");
-<%
-			    }else if(typeToGenerate.equals("Character")&&ctxParam.getName()!=null)
-			    {
-%>
-			 context.<%=ctxParam.getName()%>= new java.text.StringCharacterIterator(context.getProperty("<%=ctxParam.getName()%>")).first();			 
-<%
-			    } else if(typeToGenerate.equals("BigDecimal"))
-            {
-%>
-         try{
-         	context.<%=ctxParam.getName()%>= new <%=typeToGenerate%>(context.getProperty("<%=ctxParam.getName()%>"));
-		 }catch(NumberFormatException e){
-		    context.<%=ctxParam.getName()%>=null;
-		 }
-<%
-            }
-			     else
-			    {
-%> 
-			 try{
-			     context.<%=ctxParam.getName()%>=<%=typeToGenerate%>.parse<%=typeToGenerate%> (context.getProperty("<%=ctxParam.getName()%>"));
-			 }catch(NumberFormatException e){
-			     context.<%=ctxParam.getName()%>=null;
-			  }
-<%
-			    }
-			}
+			    } //end if
+			} //end for
 %>
     	} catch (java.io.IOException ie) {
     		System.err.println("Could not load context "+contextStr);
@@ -240,7 +209,7 @@
 		try {
 			initUriMap();
 			Route(true);
-		} catch (Exception e) {
+		} catch (java.lang.Exception e) {
 			System.err.println(e.getMessage());
 			e.printStackTrace();
 			return 1;

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

@@ -284,28 +284,36 @@ public String getExceptionStackTrace() {
 	return null;
 }
 
-private Exception exception = null;
+private java.lang.Exception exception = null;
 
-public Exception getException() {
+public java.lang.Exception getException() {
 	if ("failure".equals(this.getStatus())) {
 		return this.exception;
 	}
 	return null;
 }
 
-private class TalendException extends Exception {
+private class TalendException extends java.lang.Exception {
 
 	private static final long serialVersionUID = 1L;
 
 	private java.util.Map<String, Object> globalMap = null;
-	private Exception e = null;
+	private java.lang.Exception e = null;
 	private String currentComponent = null;
 
-	private TalendException(Exception e, String errorComponent, final java.util.Map<String, Object> globalMap) {
+	private TalendException(java.lang.Exception e, String errorComponent, final java.util.Map<String, Object> globalMap) {
 		this.currentComponent= errorComponent;
 		this.globalMap = globalMap;
 		this.e = e;
 	}
+	
+	public java.lang.Exception getException() {
+		return this.e;
+	}
+	
+	public String getCurrentComponent() {
+		return this.currentComponent;
+	}
 
 	@Override
 	public void printStackTrace() {
@@ -426,6 +434,17 @@ private class TalendException extends Exception {
 			}
 		}
 		%>
+		} else {
+		<%
+		if (isRunInMultiThread ) {
+		%>
+		((java.util.Map)threadLocal.get()).put("status", "failure");
+		<%
+		 } else {%>
+		 status = "failure";
+		 <%
+		 }
+		 %>
 		}
 	}
 }
@@ -435,7 +454,7 @@ private class TalendException extends Exception {
 	for (INode node : processNodes) {
 		if (node.isActivate()) {
 			%>
-			public void <%=node.getUniqueName() %>_error(Exception exception, String errorComponent, final java.util.Map<String, Object> globalMap) throws TalendException {
+			public void <%=node.getUniqueName() %>_error(java.lang.Exception exception, String errorComponent, final java.util.Map<String, Object> globalMap) throws TalendException {
 				end_Hash.put("<%=node.getUniqueName() %>", System.currentTimeMillis());
 				<%
 				boolean ifBeforRunError = NodeUtil.checkComponentErrorConnectionAfterNode(node);
@@ -466,9 +485,11 @@ private class TalendException extends Exception {
 						}
 					}
 				}
+				boolean isExistOnCompErrorLink = false;
 				List< ? extends IConnection> conns = node.getOutgoingConnections();
 				for (IConnection conn : conns) {
 					if (conn.getLineStyle().equals(EConnectionType.ON_COMPONENT_ERROR)) {
+						isExistOnCompErrorLink = true;
 						%>
 						try {
 							<%if (stats) {%>
@@ -480,27 +501,56 @@ private class TalendException extends Exception {
 							if (isRunInMultiThread ) {
 								%>
 								((java.util.Map)threadLocal.get()).put("errorCode", null);
-								((java.util.Map)threadLocal.get()).put("status", "failure");
 								<%=conn.getTarget().getUniqueName() %>Process(globalMap);
+								if ( !"failure".equals(((java.util.Map)threadLocal.get()).get("status")) ) {
+									((java.util.Map)threadLocal.get()).put("status", "end");
+								}
 								<%
 							} else {
 								%>
 								errorCode = null;
-								status = "failure";
 								<%=conn.getTarget().getUniqueName() %>Process(globalMap);
+								if (!"failure".equals(status)) {
+									status = "end";
+								}
 								<%
 							}
 							%>
 
-						} catch (Exception e) {
+						} catch (java.lang.Exception e) {
 							e.printStackTrace();
 						}
 						<%
 					}
 				}
+				boolean isSubjobHasOnSubJobError = false;
+				if (!isExistOnCompErrorLink) {
+					INode subJobStartNode =	node.getDesignSubjobStartNode();
+					if (subJobStartNode != null) {
+						List< ? extends IConnection> tempConns = subJobStartNode.getOutgoingConnections();
+						for (IConnection conn : tempConns) {
+							if (conn.getLineStyle().equals(EConnectionType.ON_SUBJOB_ERROR)) {
+								isSubjobHasOnSubJobError = true;
+								break;
+							}
+						}
+					}
+				}
+
+				if (!isSubjobHasOnSubJobError && !isExistOnCompErrorLink) { // when there is no subjoberror and no onComponentError
+					if (isRunInMultiThread ) {
+				%>
+				((java.util.Map)threadLocal.get()).put("status", "failure");
+				<%
+					} else {
+				%>
+				status = "failure";
+				<%
+					}
+				}
 				// when use parallelize will add virtual components(tAsyncIn and tAsyncOut) but in graphical these is visable=false
 				if ("true".equals(ElementParameterParser.getValue(node, "__PARALLELIZE__"))) {
-					for (INode gNode :node.getProcess().getGraphicalNodes()) {
+					for (INode gNode :node.getProcess().getGeneratingNodes()) {
 						if (gNode.getUniqueName().equals(node.getUniqueName())) {
 							if (gNode.getIncomingConnections(EConnectionType.FLOW_MAIN).size()!= 0) {
 								INode gSourceNode = gNode.getIncomingConnections(EConnectionType.FLOW_MAIN).get(0).getSource();
@@ -510,9 +560,27 @@ private class TalendException extends Exception {
 					}
 				}
 				//end
+				
+				/*
+				This part of code has been added in order to call the correct onComponentError and onSubjobError for the specific components (like tWriteXMLField, tWriteJSONField, tMDMOutput, tBRMS, ...).
+				*/
+				INode subjob_start_node = node;
+				boolean hasBeenChanged = true;
+				
+				while(subjob_start_node.getDesignSubjobStartNode().isVirtualGenerateNode() && hasBeenChanged) {
+					hasBeenChanged = false;
+					if(subjob_start_node.getDesignSubjobStartNode().getIncomingConnections(EConnectionType.ON_COMPONENT_OK) != null) {
+						if(subjob_start_node.getDesignSubjobStartNode().getIncomingConnections(EConnectionType.ON_COMPONENT_OK).size() >0) {
+							if(subjob_start_node.getDesignSubjobStartNode().getIncomingConnections(EConnectionType.ON_COMPONENT_OK).get(0).getSource().getVirtualLinkTo()==EConnectionType.ON_COMPONENT_OK) {
+								subjob_start_node = subjob_start_node.getDesignSubjobStartNode().getIncomingConnections(EConnectionType.ON_COMPONENT_OK).get(0).getSource();
+								hasBeenChanged = true;
+							}
+						}
+					}
+				}
+				
 				%>
-				<%=node.getDesignSubjobStartNode().getUniqueName() %>_onSubJobError(exception, errorComponent, globalMap);
-
+					<%=subjob_start_node.getDesignSubjobStartNode().getUniqueName() %>_onSubJobError(exception, errorComponent, globalMap);
 			}
 			<%
 		}
@@ -520,7 +588,7 @@ private class TalendException extends Exception {
 	for (INode node : processNodes) {
 		if (node.isDesignSubjobStartNode()) {
 %>
-			public void <%=node.getUniqueName() %>_onSubJobError(Exception exception, String errorComponent, final java.util.Map<String, Object> globalMap) throws TalendException {
+			public void <%=node.getUniqueName() %>_onSubJobError(java.lang.Exception exception, String errorComponent, final java.util.Map<String, Object> globalMap) throws TalendException {
 <%
 			List< ? extends IConnection> conns = node.getOutgoingConnections();
 			int count = 0;
@@ -555,18 +623,22 @@ resumeUtil.addLog("SYSTEM_LOG", "NODE:"+ errorComponent, "", Thread.currentThrea
 					if(isRunInMultiThread ){
 %>
 					((java.util.Map)threadLocal.get()).put("errorCode", null);
-					((java.util.Map)threadLocal.get()).put("status", "failure");
 					<%=conn.getTarget().getUniqueName() %>Process(globalMap);
+					if ( !"failure".equals(((java.util.Map)threadLocal.get()).get("status")) ) {
+						((java.util.Map)threadLocal.get()).put("status", "end");
+					}
 <%
 					} else {
 %>
 					errorCode = null;
-					status = "failure";
 					<%=conn.getTarget().getUniqueName() %>Process(globalMap);
+					if (!"failure".equals(status)) {
+						status = "end";
+					}
 <%
 					}
 %>
-				} catch (Exception e) {
+				} catch (java.lang.Exception e) {
 					e.printStackTrace();
 				}
 <%

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

@@ -115,11 +115,11 @@ import java.util.Comparator;
 		initUriMap();
 	}
 
-	public void stop() throws Exception {
+	public void stop() throws java.lang.Exception {
 		if (stopDelegate != null) stopDelegate.stop();
 	}
 
-	public void shutdown() throws Exception {
+	public void shutdown() throws java.lang.Exception {
 		if (stopDelegate != null) stopDelegate.shutdown();
 	}
 
@@ -654,7 +654,7 @@ for (IContextParameter ctxParam : params) {
 		}
 %>
 					Thread.sleep(1000);
-				} catch (Exception e) {
+				} catch (java.lang.Exception e) {
 					e.printStackTrace();
 				}
 			}

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

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

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

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

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

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

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

@@ -73,7 +73,7 @@
 						
 							//only for the lookup branch of the tJoin
 							boolean isLookOftJoin = false;
-							boolean isLookOftRecordMatching = true;
+							boolean isLookOftRecordMatching = false;
 							if(conn.getLineStyle().equals(EConnectionType.FLOW_REF)){
 								IProcess process = conn.getTarget().getProcess();
 								for (INode tjoinNode : process.getNodesOfType("tJoin")) {
@@ -113,8 +113,8 @@
 %>
 
 public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements routines.system.<%= isLookup ? "IPersistableComparableLookupRow<"+conn.getName()+"Struct>" : "IPersistableRow<"+conn.getName()+"Struct"+ templateOrigin + ">" %> {
-    final static byte[] commonByteArrayLock = new byte[0];
-    static byte[] commonByteArray = new byte[0];
+    final static byte[] commonByteArrayLock_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %> = new byte[0];
+    static byte[] commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %> = new byte[0];
 <%
 	if(hasAtLeastOneKey) {
 %>
@@ -134,8 +134,12 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		if (metadata !=null) {
 			for (IMetadataColumn column: metadata.getListColumns()) {
    				JavaType javaType = JavaTypesManager.getJavaTypeFromId(column.getTalendType());
+   				String typeToGenerate = JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable());
+   				if("id_Document".equals(javaType.getId())) {
+   					typeToGenerate = javaType.getNullableClass().getCanonicalName();
+   				}
 			    %>
-			    public <%= JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable()) %> <%=column.getLabel() %><%
+			    public <%= typeToGenerate %> <%=column.getLabel() %><%
 			    	
 			    	if(javaType == JavaTypesManager.CHARACTER && !column.isNullable()) {
 			    		%> = ' '<%
@@ -143,11 +147,11 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 			    	
 			    	%>;
 
-				public <%= JavaTypesManager.getTypeToGenerate(column.getTalendType(), column.isNullable()) %> get<%=column.getLabel().substring(0, 1).toUpperCase()%><%=column.getLabel().substring(1)%> () {
+				public <%= typeToGenerate %> get<%=column.getLabel().substring(0, 1).toUpperCase()%><%=column.getLabel().substring(1)%> () {
 					return this.<%=column.getLabel()%>;
 				}
 				<%
-				if("id_Document".equals(javaType.getId())) {
+				if((conn.getLineStyle() == EConnectionType.FLOW_REF) && conn.getTarget().getUniqueName().startsWith("tXMLMap") && "id_Document".equals(javaType.getId())) {
 				%>
 				public java.util.Map<String,Object> documentLookupResult =  new java.util.HashMap<String,Object>();
 				<%
@@ -307,15 +311,15 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 		if (length == -1) {
 			strReturn = null;
 		} else {
-			if(length > commonByteArray.length) {
-				if(length < 1024 && commonByteArray.length == 0) {
-   					commonByteArray = new byte[1024];
+			if(length > commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>.length) {
+				if(length < 1024 && commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>.length == 0) {
+   					commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %> = new byte[1024];
 				} else {
-   					commonByteArray = new byte[2 * length];
+   					commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %> = new byte[2 * length];
    				}
 			}
-			dis.readFully(commonByteArray, 0, length);
-			strReturn = new String(commonByteArray, 0, length, utf8Charset);
+			dis.readFully(commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>, 0, length);
+			strReturn = new String(commonByteArray_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>, 0, length, utf8Charset);
 		}
 		return strReturn;
 	}
@@ -526,7 +530,7 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 	   
     public void <%= isLookup ? "readKeys" : "read" %>Data(ObjectInputStream dis) {
 
-		synchronized(commonByteArrayLock) {
+		synchronized(commonByteArrayLock_<%=codeGenArgument.getCurrentProjectName() %>_<%=codeGenArgument.getJobName() %>) {
 
         	try {
         	
@@ -560,6 +564,9 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 					<%
 				} else if(javaType.isObjectBased() || typeToGenerate.equals("Geometry") || typeToGenerate.equals("Dynamic")) {
 			 		hasAtLeastOneObjectType = true;
+			 		if("id_Document".equals(javaType.getId())) {
+			 			typeToGenerate = javaType.getNullableClass().getCanonicalName();
+			 		}
 					%>
 						this.<%=column.getLabel() %> = (<%= typeToGenerate %>) dis.readObject();
 					<%
@@ -733,6 +740,9 @@ public static class <%=conn.getName() %>Struct<%=templateOrigin %> implements ro
 					<%
 				} else if(typeToGenerate.equals("Object") || typeToGenerate.equals("Geometry") || typeToGenerate.equals("BigDecimal") || typeToGenerate.equals("List") || typeToGenerate.equals("Dynamic") || typeToGenerate.equals("Document")) {
 			 		hasAtLeastOneObjectType = true;
+			 		if("id_Document".equals(javaType.getId())) {
+			 			typeToGenerate = javaType.getNullableClass().getCanonicalName();
+			 		}
 					%>
        			    	this.<%=column.getLabel() %> = (<%= typeToGenerate %>) ois.readObject();
 					<%
@@ -1003,7 +1013,7 @@ public void <%=subTree.getName() %>Process(final java.util.Map<String, Object> g
 				
 	try {
 	
-			String currentMethodName = new Exception().getStackTrace()[0].getMethodName();
+			String currentMethodName = new java.lang.Exception().getStackTrace()[0].getMethodName();
 			boolean resumeIt = currentMethodName.equals(resumeEntryMethodName);
 			if( resumeEntryMethodName == null || resumeIt || globalResumeTicket){//start the resume
 				globalResumeTicket = true;

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

@@ -33,7 +33,7 @@
 	boolean stat = codeGenArgument.isStatistics();
 %>
 
-public org.apache.camel.builder.RouteBuilder Route(final boolean start) throws Exception {
+public org.apache.camel.builder.RouteBuilder Route(final boolean start) throws java.lang.Exception {
 
 	String iterateId = "";
 	String currentComponent = "";

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

@@ -18,6 +18,7 @@ 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.IProcess;
 import org.talend.designer.codegen.i18n.Messages;
 import org.talend.designer.codegen.model.CodeGeneratorEmittersPoolFactory;
@@ -118,17 +119,19 @@ public class CodeGeneratorService implements ICodeGeneratorService {
      * 
      * @see org.talend.designer.codegen.ICodeGeneratorService#refreshTemplates()
      */
-    public void refreshTemplates() {
+    public Job refreshTemplates() {
         // this will force to refresh all components libs when install run ctrl+f3
         ILibraryManagerService librairesManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault().getService(
                 ILibraryManagerService.class);
         librairesManagerService.clearCache();
-
+        ComponentCompilations.deleteMarkers();
         ComponentsFactoryProvider.getInstance().resetCache();
-        CodeGeneratorEmittersPoolFactory.initialize();
+        Job job = CodeGeneratorEmittersPoolFactory.initialize();
         CorePlugin.getDefault().getLibrariesService().syncLibraries();
         IDesignerCoreService designerCoreService = (IDesignerCoreService) GlobalServiceRegister.getDefault().getService(
                 IDesignerCoreService.class);
         designerCoreService.getLastGeneratedJobsDateMap().clear();
+        
+        return job;
     }
 }

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

@@ -15,6 +15,7 @@ package org.talend.designer.codegen;
 import org.eclipse.jface.action.Action;
 import org.talend.core.CorePlugin;
 import org.talend.core.GlobalServiceRegister;
+import org.talend.core.model.components.ComponentCompilations;
 import org.talend.designer.codegen.model.CodeGeneratorEmittersPoolFactory;
 import org.talend.designer.core.IDesignerCoreService;
 import org.talend.repository.model.ComponentsFactoryProvider;
@@ -39,6 +40,7 @@ public class RefreshTemplatesAction extends Action {
      */
     @Override
     public void run() {
+        ComponentCompilations.deleteMarkers();
         ComponentsFactoryProvider.getInstance().resetCache();
         CodeGeneratorEmittersPoolFactory.initialize();
         CorePlugin.getDefault().getLibrariesService().syncLibraries();

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

@@ -18,6 +18,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -68,7 +69,7 @@ import org.talend.core.model.components.IComponentsFactory;
 import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.ComponentSetting;
 import org.talend.core.ui.branding.IBrandingService;
-import org.talend.core.utils.BrandingChecker;
+import org.talend.core.utils.TalendCacheUtils;
 import org.talend.designer.codegen.CodeGeneratorActivator;
 import org.talend.designer.codegen.i18n.Messages;
 import org.talend.designer.core.ITisLocalProviderService;
@@ -144,7 +145,7 @@ public class ComponentsFactory implements IComponentsFactory {
     // generation indirectly.
     // tFileInputFullRow + tSocketOutput : needed for DataViewer
     private static final String[] COMPONENTS_ALWAYS_NEEDED = { "tPrejob", "tPostjob", //$NON-NLS-1$ //$NON-NLS-2$ 
-            "tJava", "tLibraryLoad", "tFileInputFullRow", "tSocketOutput", "tFilterRow" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ 
+            "tJava", "tLibraryLoad", "tFileInputFullRow", "tSocketOutput", "tFilterRow", "tELTMysqlMap" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ 
 
     public ComponentsFactory() {
         if (!INCLUDEFILEINJET_SUFFIX.equals(".inc.javajet")) { //$NON-NLS-1$
@@ -158,10 +159,10 @@ public class ComponentsFactory implements IComponentsFactory {
         Project currentProject = ProjectManager.getInstance().getCurrentProject();
         if (currentProject != null && currentProject.getEmfProject() != null) {
 
-            List<ComponentSetting> components = (List<ComponentSetting>) currentProject.getEmfProject().getComponentsSettings();
+            List<ComponentSetting> components = currentProject.getEmfProject().getComponentsSettings();
             return components;
         }
-        return null;
+        return Collections.emptyList();
     }
 
     private boolean isComponentVisible(String componentName) {
@@ -230,8 +231,7 @@ public class ComponentsFactory implements IComponentsFactory {
         ProjectManager manager = ProjectManager.getInstance();
         List<Project> referencedProjects = manager.getReferencedProjects();
         for (Project curProject : referencedProjects) {
-            List<ComponentSetting> componentsSettings = (List<ComponentSetting>) curProject.getEmfProject()
-                    .getComponentsSettings();
+            List<ComponentSetting> componentsSettings = curProject.getEmfProject().getComponentsSettings();
             for (ComponentSetting setting : componentsSettings) {
                 if (setting.isHidden() && setting.getName().equals(settingInMain.getName())
                         && setting.getFamily().equals(settingInMain.getFamily())) {
@@ -261,7 +261,7 @@ public class ComponentsFactory implements IComponentsFactory {
         skeletonList = new ArrayList<String>();
         String installLocation = new Path(Platform.getConfigurationLocation().getURL().getPath()).toFile().getAbsolutePath();
         componentToProviderMap = new HashMap<IComponent, AbstractComponentsProvider>();
-        boolean isNeedClean = cleanComponentCache();
+        boolean isNeedClean = TalendCacheUtils.cleanComponentCache();
         isCreated = hasComponentFile(installLocation) && !isNeedClean;
         if (isReset) {
             isCreated = false;
@@ -288,18 +288,22 @@ public class ComponentsFactory implements IComponentsFactory {
 
         XsdValidationCacheManager.getInstance().load();
         // 1.Load Component from extension point: components_provider
+        if (isCreated) {
+            try {
+                reloadComponentsFromCache();
+            } catch (Exception e) {
+                ExceptionHandler.process(e);
+                // if any exception happen, reset all cache
+                cache.getComponentEntryMap().clear();
+                isCreated = false;
+            }
+        }
+
         if (!isCreated) {
             loadComponentsFromComponentsProviderExtension();
         }
 
         // TimeMeasure.step("initComponents", "loadComponentsFromProvider");
-        if (isCreated) {
-            try {
-                reloadComponentsFromCache();
-            } catch (BusinessException e) {
-                ExceptionHandler.process(e);
-            }
-        }
         // 2.Load Component from extension point: component_definition
         loadComponentsFromExtensions();
         // TimeMeasure.step("initComponents", "loadComponentsFromExtension[joblets?]");
@@ -343,6 +347,7 @@ public class ComponentsFactory implements IComponentsFactory {
 
                 FileFilter fileFilter = new FileFilter() {
 
+                    @Override
                     public boolean accept(final File file) {
                         return file.isDirectory() && file.getName().charAt(0) != '.'
                                 && !file.getName().equals(IComponentsFactory.EXTERNAL_COMPONENTS_INNER_FOLDER)
@@ -477,11 +482,6 @@ public class ComponentsFactory implements IComponentsFactory {
         return file.exists();
     }
 
-    private boolean cleanComponentCache() {
-        return ArrayUtils.contains(Platform.getApplicationArgs(), "--clean_component_cache")
-                || ArrayUtils.contains(Platform.getApplicationArgs(), "-clean") || BrandingChecker.isBrandingChanged();
-    }
-
     private void loadComponentsFromComponentsProviderExtension() {
         ComponentsProviderManager componentsProviderManager = ComponentsProviderManager.getInstance();
         for (AbstractComponentsProvider componentsProvider : componentsProviderManager.getProviders()) {
@@ -512,6 +512,7 @@ public class ComponentsFactory implements IComponentsFactory {
         }
     }
 
+    @Override
     public void loadUserComponentsFromComponentsProviderExtension() {
         ComponentsProviderManager.getInstance().getProviders();
         ComponentsProviderManager componentsProviderManager = ComponentsProviderManager.getInstance();
@@ -582,6 +583,7 @@ public class ComponentsFactory implements IComponentsFactory {
 
         FileFilter fileFilter = new FileFilter() {
 
+            @Override
             public boolean accept(final File file) {
                 return file.isDirectory() && file.getName().charAt(0) != '.'
                         && !file.getName().equals(IComponentsFactory.EXTERNAL_COMPONENTS_INNER_FOLDER)
@@ -602,6 +604,7 @@ public class ComponentsFactory implements IComponentsFactory {
 
         FileFilter skeletonFilter = new FileFilter() {
 
+            @Override
             public boolean accept(final File file) {
                 String fileName = file.getName();
                 return file.isFile() && fileName.charAt(0) != '.'
@@ -908,6 +911,7 @@ public class ComponentsFactory implements IComponentsFactory {
         component.setImageRegistry(componentsImageRegistry);
     }
 
+    @Override
     public int size() {
         if (componentList == null) {
             init(false);
@@ -915,6 +919,7 @@ public class ComponentsFactory implements IComponentsFactory {
         return componentList.size();
     }
 
+    @Override
     public IComponent get(String name) {
         if (componentList == null) {
             init(false);
@@ -928,6 +933,7 @@ public class ComponentsFactory implements IComponentsFactory {
         return null;
     }
 
+    @Override
     public void initializeComponents(IProgressMonitor monitor) {
         this.monitor = monitor;
         if (componentList == null) {
@@ -937,6 +943,7 @@ public class ComponentsFactory implements IComponentsFactory {
         this.subMonitor = null;
     }
 
+    @Override
     public void initializeComponents(IProgressMonitor monitor, boolean duringLogon) {
         this.monitor = monitor;
         if (componentList == null) {
@@ -951,6 +958,7 @@ public class ComponentsFactory implements IComponentsFactory {
      * 
      * @see org.talend.core.model.components.IComponentsFactory#getComponents()
      */
+    @Override
     public Set<IComponent> getComponents() {
         if (componentList == null) {
             init(false);
@@ -958,6 +966,7 @@ public class ComponentsFactory implements IComponentsFactory {
         return componentList;
     }
 
+    @Override
     public List<IComponent> getCustomComponents() {
         if (customComponentList == null) {
             init(false);
@@ -970,6 +979,7 @@ public class ComponentsFactory implements IComponentsFactory {
      * 
      * @see org.talend.core.model.components.IComponentsFactory#getComponentPath()
      */
+    @Override
     public URL getComponentPath() throws IOException {
         String componentsPath = IComponentsFactory.COMPONENTS_LOCATION;
         IBrandingService breaningService = (IBrandingService) GlobalServiceRegister.getDefault().getService(
@@ -987,6 +997,7 @@ public class ComponentsFactory implements IComponentsFactory {
      * 
      * @see org.talend.core.model.components.IComponentsFactory#getSkeletons()
      */
+    @Override
     public List<String> getSkeletons() {
         if (skeletonList == null) {
             init(false);
@@ -994,6 +1005,7 @@ public class ComponentsFactory implements IComponentsFactory {
         return skeletonList;
     }
 
+    @Override
     public void reset() {
         componentsImageRegistry.clear();
         componentList = null;
@@ -1003,6 +1015,7 @@ public class ComponentsFactory implements IComponentsFactory {
 
     }
 
+    @Override
     public void resetCache() {
         componentsImageRegistry.clear();
         componentList = null;
@@ -1021,6 +1034,7 @@ public class ComponentsFactory implements IComponentsFactory {
      * @see org.talend.core.model.components.IComponentsFactory#getFamilyTranslation(IComponent component,
      * java.lang.String)
      */
+    @Override
     public String getFamilyTranslation(Object component, String text) {
         String translated = Messages.getString(text);
 
@@ -1051,6 +1065,7 @@ public class ComponentsFactory implements IComponentsFactory {
      * 
      * @see org.talend.core.model.components.IComponentsFactory#getAllComponentsCanBeProvided()
      */
+    @Override
     public Map<String, String> getAllComponentsCanBeProvided() {
         List source = new ArrayList();
         if (allComponents == null) {
@@ -1075,6 +1090,7 @@ public class ComponentsFactory implements IComponentsFactory {
 
                     FileFilter fileFilter = new FileFilter() {
 
+                        @Override
                         public boolean accept(final File file) {
                             return file.isDirectory() && file.getName().charAt(0) != '.'
                                     && !file.getName().equals(IComponentsFactory.EXTERNAL_COMPONENTS_INNER_FOLDER);
@@ -1133,14 +1149,17 @@ public class ComponentsFactory implements IComponentsFactory {
             analyseur = fabrique.newDocumentBuilder();
             analyseur.setErrorHandler(new ErrorHandler() {
 
+                @Override
                 public void error(final SAXParseException exception) throws SAXException {
                     throw exception;
                 }
 
+                @Override
                 public void fatalError(final SAXParseException exception) throws SAXException {
                     throw exception;
                 }
 
+                @Override
                 public void warning(final SAXParseException exception) throws SAXException {
                     throw exception;
                 }
@@ -1192,10 +1211,12 @@ public class ComponentsFactory implements IComponentsFactory {
      * 
      * @see org.talend.core.model.components.IComponentsFactory#resetSpecificComponents()
      */
+    @Override
     public void resetSpecificComponents() {
         loadComponentsFromExtensions();
     }
 
+    @Override
     public Map<String, File> getComponentsProvidersFolder() {
         Map<String, File> list = new HashMap<String, File>();
 
@@ -1212,6 +1233,7 @@ public class ComponentsFactory implements IComponentsFactory {
         return list;
     }
 
+    @Override
     public Map<String, ImageDescriptor> getComponentsImageRegistry() {
         return componentsImageRegistry;
     }

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

@@ -16,6 +16,8 @@ import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
 import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.FileLocator;
@@ -48,6 +50,7 @@ public class UserComponentsProvider extends AbstractComponentsProvider {
     public UserComponentsProvider() {
     }
 
+    @Override
     protected File getExternalComponentsLocation() {
         IPreferenceStore prefStore = CodeGeneratorActivator.getDefault().getPreferenceStore();
         String path = prefStore.getString(IComponentPreferenceConstant.USER_COMPONENTS_FOLDER);
@@ -75,6 +78,7 @@ public class UserComponentsProvider extends AbstractComponentsProvider {
         return path.toString();
     }
 
+    @Override
     public void preComponentsLoad() throws IOException {
         File installationFolder = getInstallationFolder();
         if (installationFolder.exists()) {
@@ -83,6 +87,7 @@ public class UserComponentsProvider extends AbstractComponentsProvider {
         FilesUtils.createFoldersIfNotExists(installationFolder.getAbsolutePath(), false);
         FileFilter ff = new FileFilter() {
 
+            @Override
             public boolean accept(File pathname) {
                 if (pathname.getName().equals(".svn")) {
                     return false;
@@ -94,16 +99,21 @@ public class UserComponentsProvider extends AbstractComponentsProvider {
 
         // synchroniz shared custom component
         if (PluginChecker.isSVNProviderPluginLoaded()) {
-            Project currentProject = ProjectManager.getInstance().getCurrentProject();
-            String projectLabel = currentProject.getTechnicalLabel();
-            String sourcePath = new Path(Platform.getInstanceLocation().getURL().getPath()).toFile().getPath()
-                    + File.separatorChar + projectLabel + File.separatorChar
-                    + ERepositoryObjectType.getFolderName(ERepositoryObjectType.COMPONENTS);
-            File source = new File(sourcePath);
-            if (source.exists()) {
-                for (File file : source.listFiles(ff)) {
-                    FilesUtils.copyFolder(file, new File(installationFolder.getAbsolutePath() + File.separator + file.getName()),
-                            true, ff, null, true, false);
+            Set<Project> allProjects = new HashSet<Project>();
+            allProjects.add(ProjectManager.getInstance().getCurrentProject());
+            allProjects.addAll(ProjectManager.getInstance().getReferencedProjects());
+            for (Project project : allProjects) {
+                String projectLabel = project.getTechnicalLabel();
+                String sourcePath = new Path(Platform.getInstanceLocation().getURL().getPath()).toFile().getPath()
+                        + File.separatorChar + projectLabel + File.separatorChar
+                        + ERepositoryObjectType.getFolderName(ERepositoryObjectType.COMPONENTS);
+                File source = new File(sourcePath);
+                if (source.exists()) {
+                    for (File file : source.listFiles(ff)) {
+                        FilesUtils.copyFolder(file,
+                                new File(installationFolder.getAbsolutePath() + File.separator + file.getName()), true, ff, null,
+                                true, false);
+                    }
                 }
             }
         }

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

@@ -14,6 +14,7 @@ package org.talend.designer.codegen.config;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
 import java.io.File;
 import java.io.InputStream;
 import java.lang.reflect.Method;
@@ -25,8 +26,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.StringTokenizer;
 
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.log4j.Logger;
-import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IMarker;
@@ -51,7 +52,6 @@ import org.eclipse.emf.common.util.Monitor;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaModel;
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
 import org.talend.commons.debug.TalendDebugHandler;
@@ -190,8 +190,11 @@ public class TalendJetEmitter extends JETEmitter {
                 } else {
                     project.open(new SubProgressMonitor(progressMonitor, 5));
                     IProjectDescription description = project.getDescription();
-                    description.setNatureIds(new String[] { JavaCore.NATURE_ID });
-                    project.setDescription(description, new SubProgressMonitor(progressMonitor, 1));
+                    // 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);
@@ -217,18 +220,14 @@ public class TalendJetEmitter extends JETEmitter {
                     runtimeFolder.create(false, true, new SubProgressMonitor(progressMonitor, 1));
                 }
 
-                if (classpathEntryMissing(javaProject, classpath)) {
+                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));
-
-                if (rebuild) {
+                    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());
                 }
 
-                javaProject.close();
                 progressMonitor.done();
             } catch (CoreException exception) {
                 throw new JETException(exception);
@@ -239,7 +238,7 @@ public class TalendJetEmitter extends JETEmitter {
             }
         }
 
-        private boolean classpathEntryMissing(IJavaProject javaProject, Set<IClasspathEntry> newClasspath) {
+        private boolean isClasspathDifferent(IJavaProject javaProject, Set<IClasspathEntry> newClasspath) {
             IClasspathEntry[] rawClasspath;
             try {
                 rawClasspath = javaProject.getRawClasspath();
@@ -252,12 +251,19 @@ public class TalendJetEmitter extends JETEmitter {
                 settedClasspath.add(classpathEntry);
             }
 
+            // source and target classpath must be the same
             for (IClasspathEntry classpathEntry : newClasspath) {
                 if (!settedClasspath.contains(classpathEntry)) {
                     return true;
                 }
             }
 
+            for (IClasspathEntry classpathEntry : settedClasspath) {
+                if (!newClasspath.contains(classpathEntry)) {
+                    return true;
+                }
+            }
+
             return false;
         }
 
@@ -292,90 +298,107 @@ public class TalendJetEmitter extends JETEmitter {
 
                 progressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETOpeningJavaProject_message", //$NON-NLS-1$
                         new Object[] { project.getName() }));
-                javaProject.open(new SubProgressMonitor(progressMonitor, 1));
-
-                IPackageFragmentRoot[] packageFragmentRoots = javaProject.getPackageFragmentRoots();
-                IPackageFragmentRoot sourcePackageFragmentRoot = null;
-                for (int j = 0; j < packageFragmentRoots.length; ++j) {
-                    IPackageFragmentRoot packageFragmentRoot = packageFragmentRoots[j];
-                    if (packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE) {
-                        sourcePackageFragmentRoot = packageFragmentRoot;
-                        break;
-                    }
-                }
 
                 String packageName = jetCompiler.getSkeleton().getPackageName();
                 StringTokenizer stringTokenizer = new StringTokenizer(packageName, "."); //$NON-NLS-1$
                 IProgressMonitor subProgressMonitor = new SubProgressMonitor(progressMonitor, 1);
                 subProgressMonitor.beginTask("", stringTokenizer.countTokens() + 4); //$NON-NLS-1$
                 subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_CreateTargetFile_message")); //$NON-NLS-1$
-                IContainer sourceContainer = (IContainer) sourcePackageFragmentRoot.getCorrespondingResource();
+                IFolder sourceContainer = project.getFolder("src");
+
                 while (stringTokenizer.hasMoreElements()) {
                     String folderName = stringTokenizer.nextToken();
                     sourceContainer = sourceContainer.getFolder(new Path(folderName));
                     if (!sourceContainer.exists()) {
                         try {
-                            ((IFolder) sourceContainer).create(true, true, new SubProgressMonitor(subProgressMonitor, 1));
+                            sourceContainer.create(true, true, new SubProgressMonitor(subProgressMonitor, 1));
                         } catch (Exception e) {
-                            // e.printStackTrace();
                             ExceptionHandler.process(e);
                         }
                     }
                 }
+                boolean needRebuild = true;
                 IFile targetFile = sourceContainer.getFile(new Path(jetCompiler.getSkeleton().getClassName() + ".java")); //$NON-NLS-1$
                 if (!targetFile.exists()) {
                     subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETCreating_message", //$NON-NLS-1$
                             new Object[] { targetFile.getFullPath() }));
                     targetFile.create(contents, true, new SubProgressMonitor(subProgressMonitor, 1));
                 } else {
-                    subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETUpdating_message", //$NON-NLS-1$
-                            new Object[] { targetFile.getFullPath() }));
-                    targetFile.setContents(contents, true, true, new SubProgressMonitor(subProgressMonitor, 1));
-                }
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
-                subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETBuilding_message", //$NON-NLS-1$
-                        new Object[] { project.getName() }));
-                project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new SubProgressMonitor(subProgressMonitor, 1));
+                    DataInputStream dis = new DataInputStream(targetFile.getContents());
+                    int len = 0;
+                    byte[] buf = new byte[1024];
+                    while (((len = dis.read(buf))) != -1) {
+                        baos.write(buf, 0, len);
+                    }
+                    dis.close();
 
-                IMarker[] markers = targetFile.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
-                boolean errors = false;
-                for (int i = 0; i < markers.length; ++i) {
-                    IMarker marker = markers[i];
-                    if (marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO) == IMarker.SEVERITY_ERROR) {
-                        errors = true;
-                        subProgressMonitor.subTask(marker.getAttribute(IMarker.MESSAGE) + " : " //$NON-NLS-1$
-                                + (CodeGenPlugin.getPlugin().getString("jet.mark.file.line", new Object[] { //$NON-NLS-1$
-                                        targetFile.getLocation(), marker.getAttribute(IMarker.LINE_NUMBER) })));
-                        log.error(jetEmitter.templateURI.substring(jetEmitter.templateURI.lastIndexOf("/") + 1) //$NON-NLS-1$
-                                + Messages.getString(
-                                        "TalendJetEmitter.compileFail", //$NON-NLS-1$
-                                        marker.getAttribute(IMarker.MESSAGE),
-                                        (CodeGenPlugin.getPlugin().getString("jet.mark.file.line", new Object[] { //$NON-NLS-1$
-                                                targetFile.getLocation(), marker.getAttribute(IMarker.LINE_NUMBER) }))));
+                    String currentContent = baos.toString();
+                    String newContent = outputStream.toString();
+                    // since the build is done on linux, if use windows, it will use different rules for \r + \n
+                    // so compare without \r, at least to see if original string is the same
+                    // if yes, consider all is ok, no need to replace the content and recompile
+                    currentContent = currentContent.replace("\r", ""); //$NON-NLS-1$//$NON-NLS-2$ 
+                    newContent = newContent.replace("\r", ""); //$NON-NLS-1$//$NON-NLS-2$ 
+                    if (!newContent.equals(currentContent)) {
+                        subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETUpdating_message", //$NON-NLS-1$
+                                new Object[] { targetFile.getFullPath() }));
+                        targetFile.setContents(contents, true, true, new SubProgressMonitor(subProgressMonitor, 1));
+                    } else {
+                        needRebuild = false;
                     }
                 }
 
-                if (!errors) {
-                    subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETLoadingClass_message", //$NON-NLS-1$
-                            new Object[] { jetCompiler.getSkeleton().getClassName() + ".class" })); //$NON-NLS-1$
+                // if jetEmitter.getMethod() == null, means the class file doesn't exist anymore
+                // it should be impossible to have only the class file deleted and the .java never modified, but still
+                // handle this case.
+                if (needRebuild || jetEmitter.getMethod() == null) {
+                    subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETBuilding_message", //$NON-NLS-1$
+                            new Object[] { project.getName() }));
 
-                    // Construct a proper URL for relative lookup.
-                    //
-                    URL url = new File(project.getLocation() + "/" + javaProject.getOutputLocation().removeFirstSegments(1) + "/") //$NON-NLS-1$ //$NON-NLS-2$
-                            .toURL();
-                    URLClassLoader theClassLoader = new URLClassLoader(new URL[] { url }, jetEmitter.classLoader);
-                    Class theClass = theClassLoader.loadClass((packageName.length() == 0 ? "" : packageName + ".") //$NON-NLS-1$ //$NON-NLS-2$
-                            + jetCompiler.getSkeleton().getClassName());
-                    String methodName = jetCompiler.getSkeleton().getMethodName();
-                    Method[] methods = theClass.getDeclaredMethods();
-                    for (int i = 0; i < methods.length; ++i) {
-                        if (methods[i].getName().equals(methodName)) {
-                            jetEmitter.setMethod(methods[i]);
-                            break;
+                    project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new SubProgressMonitor(subProgressMonitor, 1));
+
+                    IMarker[] markers = targetFile.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
+                    boolean errors = false;
+                    for (int i = 0; i < markers.length; ++i) {
+                        IMarker marker = markers[i];
+                        if (marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO) == IMarker.SEVERITY_ERROR) {
+                            errors = true;
+                            subProgressMonitor.subTask(marker.getAttribute(IMarker.MESSAGE) + " : " //$NON-NLS-1$
+                                    + (CodeGenPlugin.getPlugin().getString("jet.mark.file.line", new Object[] { //$NON-NLS-1$
+                                            targetFile.getLocation(), marker.getAttribute(IMarker.LINE_NUMBER) })));
+                            log.error(jetEmitter.templateURI.substring(jetEmitter.templateURI.lastIndexOf("/") + 1) //$NON-NLS-1$
+                                    + Messages.getString(
+                                            "TalendJetEmitter.compileFail", //$NON-NLS-1$
+                                            marker.getAttribute(IMarker.MESSAGE),
+                                            (CodeGenPlugin.getPlugin().getString("jet.mark.file.line", new Object[] { //$NON-NLS-1$
+                                                    targetFile.getLocation(), marker.getAttribute(IMarker.LINE_NUMBER) }))));
+                        }
+                    }
+
+                    if (!errors) {
+                        subProgressMonitor.subTask(CodeGenPlugin.getPlugin().getString("_UI_JETLoadingClass_message", //$NON-NLS-1$
+                                new Object[] { jetCompiler.getSkeleton().getClassName() + ".class" })); //$NON-NLS-1$
+
+                        // Construct a proper URL for relative lookup.
+                        //
+                        URL url = new File(project.getLocation()
+                                + "/" + javaProject.getOutputLocation().removeFirstSegments(1) + "/") //$NON-NLS-1$ //$NON-NLS-2$
+                                .toURL();
+                        URLClassLoader theClassLoader = new URLClassLoader(new URL[] { url }, jetEmitter.classLoader);
+                        Class theClass = theClassLoader.loadClass((packageName.length() == 0 ? "" : packageName + ".") //$NON-NLS-1$ //$NON-NLS-2$
+                                + jetCompiler.getSkeleton().getClassName());
+                        String methodName = jetCompiler.getSkeleton().getMethodName();
+                        Method[] methods = theClass.getDeclaredMethods();
+                        for (int i = 0; i < methods.length; ++i) {
+                            if (methods[i].getName().equals(methodName)) {
+                                jetEmitter.setMethod(methods[i]);
+                                break;
+                            }
                         }
                     }
                 }
-
                 subProgressMonitor.done();
             } catch (CoreException exception) {
                 TalendDebugHandler.debug(exception);

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

@@ -48,11 +48,11 @@ import org.talend.commons.exception.BusinessException;
 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.context.Context;
-import org.talend.core.context.RepositoryContext;
 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;
@@ -120,7 +120,11 @@ public final class CodeGeneratorEmittersPoolFactory {
 
         public IStatus doRun() {
             try {
+                TimeMeasure.display = CommonsPlugin.isDebugMode();
+                TimeMeasure.displaySteps = CommonsPlugin.isDebugMode();
+                TimeMeasure.measureActive = CommonsPlugin.isDebugMode();
 
+                TimeMeasure.begin("initialize Jet Emitters");
                 ComponentsFactoryProvider.saveComponentVisibilityStatus();
 
                 jetFilesCompileFail.clear();
@@ -131,9 +135,7 @@ public final class CodeGeneratorEmittersPoolFactory {
                 } else {
                     monitorWrap = new NullProgressMonitor();
                 }
-                RepositoryContext repositoryContext = (RepositoryContext) CorePlugin.getContext().getProperty(
-                        Context.REPOSITORY_CONTEXT_KEY);
-                ECodeLanguage codeLanguage = repositoryContext.getProject().getLanguage();
+                ECodeLanguage codeLanguage = LanguageManager.getCurrentLanguage();
 
                 CodeGeneratorInternalTemplatesFactory templatesFactory = CodeGeneratorInternalTemplatesFactoryProvider
                         .getInstance();
@@ -203,12 +205,15 @@ public final class CodeGeneratorEmittersPoolFactory {
                         "CodeGeneratorEmittersPoolFactory.componentCompiled", (System.currentTimeMillis() - startTime))); //$NON-NLS-1$
                 initialized = true;
 
-                // remove compilations markers
-                ComponentCompilations.deleteMarkers();
+                ComponentCompilations.addMarkers();
                 initializeStart = false;
 
             } catch (Exception e) {
                 log.error(Messages.getString("CodeGeneratorEmittersPoolFactory.initialException"), e); //$NON-NLS-1$
+                TimeMeasure.end("initialize Jet Emitters");
+                TimeMeasure.display = false;
+                TimeMeasure.displaySteps = false;
+                TimeMeasure.measureActive = false;
                 return new Status(IStatus.ERROR, CodeGeneratorActivator.PLUGIN_ID,
                         Messages.getString("CodeGeneratorEmittersPoolFactory.initialException"), e); //$NON-NLS-1$
             } finally {
@@ -220,6 +225,10 @@ public final class CodeGeneratorEmittersPoolFactory {
                     ExceptionHandler.process(e);
                 }
             }
+            TimeMeasure.end("initialize Jet Emitters");
+            TimeMeasure.display = false;
+            TimeMeasure.displaySteps = false;
+            TimeMeasure.measureActive = false;
             if (jetFilesCompileFail.size() > 0) {
                 StringBuilder message = new StringBuilder();
                 for (JetBean tmpJetBean : jetFilesCompileFail) {
@@ -418,39 +427,13 @@ public final class CodeGeneratorEmittersPoolFactory {
                 // error already loggued
                 emitterPool = new HashMap<JetBean, JETEmitter>();
             }
+        } else {
+            ComponentCompilations.deleteMarkers();
         }
 
-        // for (JetBean jetBean : components) {
-        // if (!emitterPool.containsKey(jetBean)) {
-        // // System.out.println("The new file is not in JetPersistence* cache:" +
-        // // jetBean.getTemplateFullUri());
-        // TalendJetEmitter emitter = new TalendJetEmitter(jetBean.getTemplateFullUri(), jetBean.getClassLoader(),
-        // jetBean
-        // .getFamily(), jetBean.getClassName(), jetBean.getLanguage(), jetBean.getCodePart(), dummyEmitter
-        // .getTalendEclipseHelper());
-        // emitter.initialize(sub);
-        //
-        // if (emitter.getMethod() != null) {
-        // jetBean.setMethod(emitter.getMethod());
-        // jetBean.setClassName(emitter.getMethod().getDeclaringClass().getName());
-        // alreadyCompiledEmitters.add(jetBean);
-        // } else {
-        // jetFilesCompileFail.add(jetBean);
-        // }
-        // emitterPool.put(jetBean, emitter);
-        // monitorBuffer++;
-        // if (monitorBuffer % 100 == 0) {
-        // monitorWrap.worked(100);
-        // monitorBuffer = 0;
-        // }
-        // }
-        // }
         synchronizedComponent(components, sub, alreadyCompiledEmitters, dummyEmitter, monitorBuffer, monitorWrap);
 
         monitorWrap.worked(monitorBuffer);
-        // } catch (JETException e) {
-        //            log.error(Messages.getString("CodeGeneratorEmittersPoolFactory.jetEmitterInitialException") + e.getMessage(), e); //$NON-NLS-1$
-        // }
         try {
             EmfEmittersPersistenceFactory.getInstance(codeLanguage).saveEmittersPool(
                     extractEmfPersistenData(alreadyCompiledEmitters));
@@ -468,6 +451,8 @@ public final class CodeGeneratorEmittersPoolFactory {
             List<JetBean> alreadyCompiledEmitters, TalendJetEmitter dummyEmitter, int monitorBuffer, IProgressMonitor monitorWrap) {
         for (JetBean jetBean : components) {
             if (!emitterPool.containsKey(jetBean)) {
+                ComponentCompilations.deleteMarkers();
+
                 // System.out.println("The new file is not in JetPersistence* cache:" + getFullTemplatePath(jetBean));
                 TalendJetEmitter emitter = new TalendJetEmitter(getFullTemplatePath(jetBean), jetBean.getClassLoader(),
                         jetBean.getFamily(), jetBean.getClassName(), jetBean.getLanguage(), jetBean.getCodePart(),
@@ -635,11 +620,16 @@ public final class CodeGeneratorEmittersPoolFactory {
         } catch (Error e) {
             throw new ClassNotFoundException(e.getMessage(), e);
         }
-        Method[] methods = theClass.getDeclaredMethods();
-        for (int i = 0; i < methods.length; ++i) {
-            if (methods[i].getName().equals(methodName)) {
-                return methods[i];
+        // TDI-23079
+        try {
+            Method[] methods = theClass.getDeclaredMethods();
+            for (int i = 0; i < methods.length; ++i) {
+                if (methods[i].getName().equals(methodName)) {
+                    return methods[i];
+                }
             }
+        } catch (Exception e) {
+            return null;
         }
         return null;
     }

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

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

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

@@ -1,6 +1,7 @@
 ExchangeView.Exchange=Exchange
 AvailableExtensionsComposite.ExtensionName=Nom de l'extension
 AvailableExtensionsComposite.Version=Version
+AvailableExtensionsComposite.Rating=Note
 AvailableExtensionsComposite.Author=Auteur
 AvailableExtensionsComposite.ViewDetail.installOperateStatus=Installer
 AvailableExtensionsComposite.ViewDetail.WriteReview=Donnez votre avis
@@ -9,16 +10,18 @@ DownloadedExtensionsComposite.DownloadedVersion=Version t
 DownloadedExtensionsComposite.DownloadDate=Date de téléchargement
 DownloadedExtensionsComposite.installedOperateStatus=Installé
 DownloadedExtensionsComposite.updateOperateStatus=Mettre à jour
+MyExtensionsComposite.Version=Version
 MyExtensionsComposite.UploadDate=Date du chargement
 MyExtensionsComposite.AddNewExtensionTitle=Ajouter une nouvelle extension
 MyExtensionsComposite.UpLoadNewVersionOperateStatus=Charger une nouvelle version
 MyExtensionsComposite.ModifyOperateStatus=Modifier
-MyExtensionsComposite.DeleteOperateStatus=Supprimer
+MyExtensionsComposite.DeleteOperateStatus=DELETE
 MyExtensionsComposite.Form.Return=Retourner
 MyExtensionsComposite.Form.ExtensionTitle=Titre de l'extension
 MyExtensionsComposite.Form.InitialVersion=Version initiale
 MyExtensionsComposite.Form.Compatibility=Compatibilité
 MyExtensionsComposite.Form.Compatibility.AllVersions=Toutes les versions
+MyExtensionsComposite.Form.Compatibility.Version=Version
 MyExtensionsComposite.Form.Compatibility.AllVersionsExcept=Toutes les versions sauf :
 MyExtensionsComposite.Form.Compatibility.OnlyTheseVersions=Uniquement ces versions :
 MyExtensionsComposite.Form.Description=Description
@@ -43,6 +46,8 @@ DeleteExtensionJob.DeleteExtensionJob.Title=Supprimer une extension...
 DeleteExtensionJob.DeleteFailure=Echec de la connexion.
 ModifyExtensionJob.Title=Modifier une extension...
 ModifyExtensionJob.ModifyFailure=Echec de la modification
+InstalledExtensionJob.Title=Installation de l'extension...
+InsertionExtensionAction.InstalledFailure=Echec de l'installation
 UploadRevisionJob.Title=Chargement de la révision...
 UploadRevisionAction.InstalledFailure=Echec du chargement de la révision.
 DownloadComponenentsAction.installExchange=Installer les composants Exchange
@@ -74,3 +79,4 @@ ImportExchangeDialog.REFRESH_BUTTON=Rafra
 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_nl.properties

@@ -1 +1,7 @@
+DownloadedExtensionsComposite.updateOperateStatus=Update
+MyExtensionsComposite.UpdateOperateStatus=Update
+MyExtensionsComposite.ModifyOperateStatus=Wijzigen
+MyExtensionsComposite.DeleteOperateStatus=Verwijderen
 MyExtensionsComposite.Form.Upload.Browse=Blader...
+RefreshJob.FindExtensions.Title=Beschikbare extensies zoeken
+RefreshJob.FindExtensions.Message=Extensies zoeken op Exchange...

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

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

org.talend.designer.components.exchange/src/main/java/org/talend/designer/components/exchange/ui/actions/DownloadComponenentsAction.java

@@ -116,7 +116,7 @@ public class DownloadComponenentsAction extends Action implements IIntroAction {
             // Start Code Generation Init
             ICodeGeneratorService codeGenService = (ICodeGeneratorService) GlobalServiceRegister.getDefault().getService(
                     ICodeGeneratorService.class);
-            Job job = codeGenService.initializeTemplates();
+            Job job = codeGenService.refreshTemplates();
             job.addJobChangeListener(new JobChangeAdapter() {
 
                 @Override

org.talend.designer.components.libs/libs_src/TalendSAX/org/talend/xml/sax/ComplexSAXLooper.java

@@ -1,6 +1,7 @@
 package org.talend.xml.sax;
 
 import java.io.IOException;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -11,12 +12,6 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.talend.xml.sax.FunctionRegister;
-import org.talend.xml.sax.LoopEntry;
-import org.talend.xml.sax.SAXLoopCompositeHandler;
-import org.talend.xml.sax.SAXLoopHandler;
-import org.talend.xml.sax.SAXLoopIterator;
-import org.talend.xml.sax.SAXMultiLoopIterator;
 import org.talend.xml.sax.commons.ISAXLooper;
 import org.talend.xml.sax.function.inter.Function;
 import org.talend.xml.sax.io.UnicodeReader;
@@ -142,6 +137,7 @@ public class ComplexSAXLooper implements ISAXLooper {
      */
     public void parse(String fileURL, String charset) {
         this.charset = charset;
+        Reader reader = null;
         try {
             DefaultHandler hd = null;
             SAXParser saxParser = null;
@@ -158,9 +154,8 @@ public class ComplexSAXLooper implements ISAXLooper {
                 hd = newHandler2();
             }
             saxParser.setProperty("http://xml.org/sax/properties/lexical-handler", hd);
-            org.xml.sax.InputSource inSource = new org.xml.sax.InputSource(
-                    new UnicodeReader(new java.io.FileInputStream(fileURL),this.charset));
-//            inSource.setEncoding(this.charset);
+            reader = new UnicodeReader(new java.io.FileInputStream(fileURL),this.charset);
+            org.xml.sax.InputSource inSource = new org.xml.sax.InputSource(reader);
             saxParser.parse(inSource, hd);
 
         } catch (ParserConfigurationException e) {
@@ -169,6 +164,14 @@ public class ComplexSAXLooper implements ISAXLooper {
             e.printStackTrace();
         } catch (IOException e) {
             e.printStackTrace();
+        } finally {
+            if(reader!=null) {
+                try {
+                    reader.close();
+                } catch(IOException e) {
+                    e.printStackTrace();
+                }
+            }
         }
     }
 
@@ -179,6 +182,7 @@ public class ComplexSAXLooper implements ISAXLooper {
      */
     public void parse(java.io.InputStream is, String charset) {
         this.charset = charset;
+        Reader reader = null;
         try {
             DefaultHandler hd = null;
             SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
@@ -189,9 +193,9 @@ public class ComplexSAXLooper implements ISAXLooper {
             }
             saxParser.setProperty("http://xml.org/sax/properties/lexical-handler", hd);
             // routines.system.UnicodeReader.java is used to ignore the BOM of the source file.
-            org.xml.sax.InputSource inSource = new org.xml.sax.InputSource(new UnicodeReader(is,this.charset));
-//            inSource.setEncoding(this.charset);
-            saxParser.parse(is, hd);
+            reader = new UnicodeReader(is,this.charset);
+            org.xml.sax.InputSource inSource = new org.xml.sax.InputSource(reader);
+            saxParser.parse(inSource, hd);
 
         } catch (ParserConfigurationException e) {
             e.printStackTrace();
@@ -199,6 +203,14 @@ public class ComplexSAXLooper implements ISAXLooper {
             e.printStackTrace();
         } catch (IOException e) {
             e.printStackTrace();
+        } finally {
+            if(reader!=null) {
+                try {
+                    reader.close();
+                } catch(IOException e) {
+                    e.printStackTrace();
+                }
+            }
         }
     }
 

org.talend.designer.components.libs/libs_src/TalendSAX/org/talend/xml/sax/simpleparser/SimpleSAXLooper.java

@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.xml.sax.simpleparser;
 
+import java.io.Reader;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -113,6 +114,7 @@ public class SimpleSAXLooper implements ISAXLooper,Callable {
     }
     
     public Object call() throws Exception {
+        Reader reader = null;
 		try {
             DefaultHandler hd = new SimpleSAXLoopHandler(nodes, bcache);
             SAXParser saxParser = null;
@@ -126,17 +128,22 @@ public class SimpleSAXLooper implements ISAXLooper,Callable {
             saxParser.setProperty("http://xml.org/sax/properties/lexical-handler", hd);
             if (fileURL != null) {
             	// routines.system.UnicodeReader.java is used to ignore the BOM of the source file.
-                org.xml.sax.InputSource inSource = new org.xml.sax.InputSource(
-                        new UnicodeReader(new java.io.FileInputStream(fileURL),this.charset));
-//                inSource.setEncoding(this.charset);
+                reader = new UnicodeReader(new java.io.FileInputStream(fileURL),this.charset);
+                org.xml.sax.InputSource inSource = new org.xml.sax.InputSource(reader);
                 saxParser.parse(inSource, hd);
             } else {
-                org.xml.sax.InputSource inSource = new org.xml.sax.InputSource(new UnicodeReader(is,this.charset));
-//                inSource.setEncoding(this.charset);
-                saxParser.parse(is, hd);
+                reader = new UnicodeReader(is,this.charset);
+                org.xml.sax.InputSource inSource = new org.xml.sax.InputSource(reader);
+                saxParser.parse(inSource, hd);
             }
         } finally {
-        	bcache.notifyErrorOccurred();
+            try {
+                if(reader!=null) {
+                    reader.close();
+                }
+            } finally {
+                bcache.notifyErrorOccurred();
+            }
         }
 		return null;
 	}

org.talend.designer.components.libs/libs_src/filecopy/org/talend/FileCopy.java

@@ -35,7 +35,9 @@ public class FileCopy {
 
     public static void copyFile(String srcFileName, String desFileName, boolean delSrc) throws Exception {
 
-        FileInputStream srcInputStream = new FileInputStream(srcFileName);
+        FileInputStream srcInputStream = null;
+        try{
+        srcInputStream = new FileInputStream(srcFileName);
         long lastModified = new File(srcFileName).lastModified();
         int available = srcInputStream.available();
         if (available > L_SIZE) {// X > 100M
@@ -47,6 +49,11 @@ public class FileCopy {
         }
         // keep modification_time
         new File(desFileName).setLastModified(lastModified);
+        }finally{
+            if(srcInputStream!=null){
+                srcInputStream.close();
+            }
+        }
     }
 
     private static void copyFileS(String srcFileName, FileInputStream srcInputStream, String desFileName, boolean delSrc)
@@ -93,8 +100,13 @@ public class FileCopy {
         try {
             in = srcInputStream.getChannel();
             out = new FileOutputStream(dest).getChannel();
-
-            in.transferTo(0, in.size(), out);
+            
+            int maxCount = (32 * 1024 * 1024) - (28 * 1024);
+            long size = in.size();
+            long position = 0;
+            while (position < size) {
+                position += in.transferTo(position, maxCount, out);
+            }
 
             in.close();
             out.close();

org.talend.designer.components.libs/libs_src/javacsv/com/csvreader/CsvWriter2.java

@@ -1,622 +0,0 @@
-/*
- * Java CSV is a stream based library for reading and writing
- * CSV and other delimited data.
- *   
- * Copyright (C) Bruce Dunwiddie bruce@csvreader.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-package com.csvreader;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.nio.charset.Charset;
-
-/**
- * A stream based writer for writing delimited text data to a file or a stream.
- * So far, it is only used for tMysqlOutputBulk
- */
-public class CsvWriter2 {
-	private PrintWriter outputStream = null;
-
-	private String fileName = null;
-
-	private boolean firstColumn = true;
-
-	private boolean useCustomRecordDelimiter = false;
-
-	private Charset charset = null;
-
-	// this holds all the values for switches that the user is allowed to set
-	private UserSettings userSettings = new UserSettings();
-
-	private boolean initialized = false;
-
-	private boolean closed = false;
-	
-	private boolean useCRLFRecordDelimiter;
-	
-	private static final String CRLF = "\r\n";
-
-	/**
-	 * Double up the text qualifier to represent an occurance of the text
-	 * qualifier.
-	 */
-	public static final int ESCAPE_MODE_DOUBLED = 1;
-
-	/**
-	 * Use a backslash character before the text qualifier to represent an
-	 * occurance of the text qualifier.
-	 */
-	public static final int ESCAPE_MODE_BACKSLASH = 2;
-
-	/**
-	 * Creates a {@link com.csvreader.CsvWriter2 CsvWriter} object using a file
-	 * as the data destination.
-	 * 
-	 * @param fileName
-	 *            The path to the file to output the data.
-	 * @param delimiter
-	 *            The character to use as the column delimiter.
-	 * @param charset
-	 *            The {@link java.nio.charset.Charset Charset} to use while
-	 *            writing the data.
-	 */
-	public CsvWriter2(String fileName, String delimiter, Charset charset) {
-		if (fileName == null) {
-			throw new IllegalArgumentException("Parameter fileName can not be null.");
-		}
-
-		if (charset == null) {
-			throw new IllegalArgumentException("Parameter charset can not be null.");
-		}
-
-		this.fileName = fileName;
-		userSettings.Delimiter = delimiter;
-		this.charset = charset;
-	}
-
-	/**
-	 * Creates a {@link com.csvreader.CsvWriter2 CsvWriter} object using a file
-	 * as the data destination. Uses a comma as the column delimiter and
-	 * ISO-8859-1 as the {@link java.nio.charset.Charset Charset}.
-	 * 
-	 * @param fileName
-	 *            The path to the file to output the data.
-	 */
-	public CsvWriter2(String fileName) {
-		this(fileName, Letters.COMMA, Charset.forName("ISO-8859-1"));
-	}
-
-	/**
-	 * Creates a {@link com.csvreader.CsvWriter2 CsvWriter} object using a Writer
-	 * to write data to.
-	 * 
-	 * @param outputStream
-	 *            The stream to write the column delimited data to.
-	 * @param delimiter
-	 *            The character to use as the column delimiter.
-	 */
-	public CsvWriter2(Writer outputStream, String delimiter) {
-		if (outputStream == null) {
-			throw new IllegalArgumentException("Parameter outputStream can not be null.");
-		}
-
-		this.outputStream = new PrintWriter(outputStream);
-		userSettings.Delimiter = delimiter;
-		initialized = true;
-	}
-
-	/**
-	 * Creates a {@link com.csvreader.CsvWriter2 CsvWriter} object using an
-	 * OutputStream to write data to.
-	 * 
-	 * @param outputStream
-	 *            The stream to write the column delimited data to.
-	 * @param delimiter
-	 *            The character to use as the column delimiter.
-	 * @param charset
-	 *            The {@link java.nio.charset.Charset Charset} to use while
-	 *            writing the data.
-	 */
-	public CsvWriter2(OutputStream outputStream, String delimiter, Charset charset) {
-		this(new OutputStreamWriter(outputStream, charset), delimiter);
-	}
-
-	/**
-	 * Gets the character being used as the column delimiter.
-	 * 
-	 * @return The character being used as the column delimiter.
-	 */
-	public String getDelimiter() {
-		return userSettings.Delimiter;
-	}
-
-	/**
-	 * Sets the character to use as the column delimiter.
-	 * 
-	 * @param delimiter
-	 *            The character to use as the column delimiter.
-	 */
-	public void setDelimiter(String delimiter) {
-		userSettings.Delimiter = delimiter;
-	}
-
-	public String getRecordDelimiter() {
-		return userSettings.RecordDelimiter;
-	}
-
-	/**
-	 * Sets the character to use as the record delimiter.
-	 * 
-	 * @param recordDelimiter
-	 *            The character to use as the record delimiter. Default is
-	 *            combination of standard end of line characters for Windows,
-	 *            Unix, or Mac.
-	 */
-	public void setRecordDelimiter(String recordDelimiter) {
-		useCustomRecordDelimiter = true;
-		userSettings.RecordDelimiter = recordDelimiter;
-	}
-	
-	/**
-	 * set CRLF(window line separator) as record separator
-	 * for the contexts:Mac or Unix JVM create csv using Window row separator 
-	 * @param recordDelimiter
-	 */
-	public void useCRLFRecordDelimiter(boolean useCRLFRecordDelimiter) {
-		this.useCRLFRecordDelimiter = useCRLFRecordDelimiter;
-		
-		if(useCRLFRecordDelimiter) {
-			useCustomRecordDelimiter = false;
-			userSettings.RecordDelimiter = Letters.NULL;
-		}
-	}
-
-	/**
-	 * Gets the character to use as a text qualifier in the data.
-	 * 
-	 * @return The character to use as a text qualifier in the data.
-	 */
-	public char getTextQualifier() {
-		return userSettings.TextQualifier;
-	}
-
-	/**
-	 * Sets the character to use as a text qualifier in the data.
-	 * 
-	 * @param textQualifier
-	 *            The character to use as a text qualifier in the data.
-	 */
-	public void setTextQualifier(char textQualifier) {
-		userSettings.TextQualifier = textQualifier;
-	}
-
-	/**
-	 * Whether text qualifiers will be used while writing data or not.
-	 * 
-	 * @return Whether text qualifiers will be used while writing data or not.
-	 */
-	public boolean getUseTextQualifier() {
-		return userSettings.UseTextQualifier;
-	}
-
-	/**
-	 * Sets whether text qualifiers will be used while writing data or not.
-	 * 
-	 * @param useTextQualifier
-	 *            Whether to use a text qualifier while writing data or not.
-	 */
-	public void setUseTextQualifier(boolean useTextQualifier) {
-		userSettings.UseTextQualifier = useTextQualifier;
-	}
-
-	public int getEscapeMode() {
-		return userSettings.EscapeMode;
-	}
-
-	public void setEscapeMode(int escapeMode) {
-		userSettings.EscapeMode = escapeMode;
-	}
-
-	public void setComment(char comment) {
-		userSettings.Comment = comment;
-	}
-
-	public char getComment() {
-		return userSettings.Comment;
-	}
-
-	/**
-	 * Whether fields will be surrounded by the text qualifier even if the
-	 * qualifier is not necessarily needed to escape this field.
-	 * 
-	 * @return Whether fields will be forced to be qualified or not.
-	 */
-	public boolean getForceQualifier() {
-		return userSettings.ForceQualifier;
-	}
-
-	/**
-	 * Use this to force all fields to be surrounded by the text qualifier even
-	 * if the qualifier is not necessarily needed to escape this field. Default
-	 * is false.
-	 * 
-	 * @param forceQualifier
-	 *            Whether to force the fields to be qualified or not.
-	 */
-	public void setForceQualifier(boolean forceQualifier) {
-		userSettings.ForceQualifier = forceQualifier;
-	}
-
-	/**
-	 * Writes another column of data to this record.
-	 * 
-	 * @param content
-	 *            The data for the new column.
-	 * @param preserveSpaces
-	 *            Whether to preserve leading and trailing whitespace in this
-	 *            column of data.
-	 * @exception IOException
-	 *                Thrown if an error occurs while writing data to the
-	 *                destination stream.
-	 */
-	public void write(String content, boolean preserveSpaces)
-			throws IOException {
-		checkClosed();
-
-		checkInit();
-
-		if (content == null) {
-			content = "";
-		}
-
-		if (!firstColumn) {
-			outputStream.write(userSettings.Delimiter);
-		}
-
-		boolean textQualify = userSettings.ForceQualifier;
-
-		if (!preserveSpaces && content.length() > 0) {
-			content = content.trim();
-		}
-
-		if (!textQualify
-				&& userSettings.UseTextQualifier
-				&& (content.indexOf(userSettings.TextQualifier) > -1
-						|| content.indexOf(userSettings.Delimiter) > -1
-						|| (!useCustomRecordDelimiter && (content
-								.indexOf(Letters.LF) > -1 || content
-								.indexOf(Letters.CR) > -1))
-						|| (useCustomRecordDelimiter && content
-								.indexOf(userSettings.RecordDelimiter) > -1)
-						|| (firstColumn && content.length() > 0 && content
-								.charAt(0) == userSettings.Comment) ||
-				// check for empty first column, which if on its own line must
-				// be qualified or the line will be skipped
-				(firstColumn && content.length() == 0))) {
-			textQualify = true;
-		}
-
-		if (userSettings.UseTextQualifier && !textQualify
-				&& content.length() > 0 && preserveSpaces) {
-			char firstLetter = content.charAt(0);
-
-			if (firstLetter == Letters.SPACE || firstLetter == Letters.TAB) {
-				textQualify = true;
-			}
-
-			if (!textQualify && content.length() > 1) {
-				char lastLetter = content.charAt(content.length() - 1);
-
-				if (lastLetter == Letters.SPACE || lastLetter == Letters.TAB) {
-					textQualify = true;
-				}
-			}
-		}
-
-		if (textQualify) {
-			outputStream.write(userSettings.TextQualifier);
-
-			if (userSettings.EscapeMode == ESCAPE_MODE_BACKSLASH) {
-				content = replace(content, "" + Letters.BACKSLASH, ""
-						+ Letters.BACKSLASH + Letters.BACKSLASH);
-				content = replace(content, "" + userSettings.TextQualifier, ""
-						+ Letters.BACKSLASH + userSettings.TextQualifier);
-			} else {
-				content = replace(content, "" + userSettings.TextQualifier, ""
-						+ userSettings.TextQualifier
-						+ userSettings.TextQualifier);
-			}
-		} else if (userSettings.EscapeMode == ESCAPE_MODE_BACKSLASH) {
-			content = replace(content, "" + Letters.BACKSLASH, ""
-					+ Letters.BACKSLASH + Letters.BACKSLASH);
-			content = replace(content, "" + userSettings.Delimiter, ""
-					+ Letters.BACKSLASH + userSettings.Delimiter);
-
-			if (useCustomRecordDelimiter) {
-				content = replace(content, "" + userSettings.RecordDelimiter,
-						"" + Letters.BACKSLASH + userSettings.RecordDelimiter);
-			} else {
-				content = replace(content, "" + Letters.CR, ""
-						+ Letters.BACKSLASH + Letters.CR);
-				content = replace(content, "" + Letters.LF, ""
-						+ Letters.BACKSLASH + Letters.LF);
-			}
-
-			if (firstColumn && content.length() > 0
-					&& content.charAt(0) == userSettings.Comment) {
-				if (content.length() > 1) {
-					content = "" + Letters.BACKSLASH + userSettings.Comment
-							+ content.substring(1);
-				} else {
-					content = "" + Letters.BACKSLASH + userSettings.Comment;
-				}
-			}
-		}
-
-		outputStream.write(content);
-
-		if (textQualify) {
-			outputStream.write(userSettings.TextQualifier);
-		}
-
-		firstColumn = false;
-	}
-
-	/**
-	 * Writes another column of data to this record. Does not preserve
-	 * leading and trailing whitespace in this column of data.
-	 * 
-	 * @param content
-	 *            The data for the new column.
-	 * @exception IOException
-	 *                Thrown if an error occurs while writing data to the
-	 *                destination stream.
-	 */
-	public void write(String content) throws IOException {
-		write(content, true);
-	}
-
-	public void writeComment(String commentText) throws IOException {
-		checkClosed();
-
-		checkInit();
-
-		outputStream.write(userSettings.Comment);
-
-		outputStream.write(commentText);
-
-		if (useCustomRecordDelimiter) {
-			outputStream.write(userSettings.RecordDelimiter);
-		} else if(useCRLFRecordDelimiter) {
-			outputStream.print(CRLF);
-		} else {
-			outputStream.println();
-		}
-
-		firstColumn = true;
-	}
-
-	/**
-	 * Writes a new record using the passed in array of values.
-	 * 
-	 * @param values
-	 *            Values to be written.
-	 * 
-	 * @param preserveSpaces
-	 *            Whether to preserver leading and trailing spaces in columns
-	 *            while writing out to the record or not.
-	 * 
-	 * @throws IOException
-	 *             Thrown if an error occurs while writing data to the
-	 *             destination stream.
-	 */
-	public void writeRecord(String[] values, boolean preserveSpaces)
-			throws IOException {
-		if (values != null && values.length > 0) {
-			for (int i = 0; i < values.length; i++) {
-				write(values[i], preserveSpaces);
-			}
-
-			endRecord();
-		}
-	}
-
-	/**
-	 * Writes a new record using the passed in array of values.
-	 * 
-	 * @param values
-	 *            Values to be written.
-	 * 
-	 * @throws IOException
-	 *             Thrown if an error occurs while writing data to the
-	 *             destination stream.
-	 */
-	public void writeRecord(String[] values) throws IOException {
-		writeRecord(values, true);
-	}
-
-	/**
-	 * Ends the current record by sending the record delimiter.
-	 * 
-	 * @exception IOException
-	 *                Thrown if an error occurs while writing data to the
-	 *                destination stream.
-	 */
-	public void endRecord() throws IOException {
-		checkClosed();
-
-		checkInit();
-
-		if (useCustomRecordDelimiter) {
-			outputStream.write(userSettings.RecordDelimiter);
-		} else if(useCRLFRecordDelimiter) {
-			outputStream.print(CRLF);
-		} else {
-			outputStream.println();
-		}
-
-		firstColumn = true;
-	}
-
-	/**
-	 * 
-	 */
-	private void checkInit() throws IOException {
-		if (!initialized) {
-			if (fileName != null) {
-				outputStream = new PrintWriter(new OutputStreamWriter(
-						new FileOutputStream(fileName), charset));
-			}
-
-			initialized = true;
-		}
-	}
-
-	/**
-	 * Clears all buffers for the current writer and causes any buffered data to
-	 * be written to the underlying device.
-	 */
-	public void flush() {
-		outputStream.flush();
-	}
-
-	/**
-	 * Closes and releases all related resources.
-	 */
-	public void close() {
-		if (!closed) {
-			close(true);
-
-			closed = true;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void close(boolean closing) {
-		if (!closed) {
-			if (closing) {
-				charset = null;
-			}
-
-			try {
-				if (initialized) {
-					outputStream.close();
-				}
-			} catch (Exception e) {
-				// just eat the exception
-			}
-
-			outputStream = null;
-
-			closed = true;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void checkClosed() throws IOException {
-		if (closed) {
-			throw new IOException(
-			"This instance of the CsvWriter class has already been closed.");
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected void finalize() {
-		close(false);
-	}
-
-	private class Letters {
-		public static final char LF = '\n';
-
-		public static final char CR = '\r';
-
-		public static final char QUOTE = '"';
-
-		public static final String COMMA = ",";
-
-		public static final char SPACE = ' ';
-
-		public static final char TAB = '\t';
-
-		public static final char POUND = '#';
-
-		public static final char BACKSLASH = '\\';
-
-		public static final String NULL = "\0";
-	}
-
-	private class UserSettings {
-		// having these as publicly accessible members will prevent
-		// the overhead of the method call that exists on properties
-		public char TextQualifier;
-
-		public boolean UseTextQualifier;
-
-		public String Delimiter;
-
-		public String RecordDelimiter;
-
-		public char Comment;
-
-		public int EscapeMode;
-
-		public boolean ForceQualifier;
-
-		public UserSettings() {
-			TextQualifier = Letters.QUOTE;
-			UseTextQualifier = true;
-			Delimiter = Letters.COMMA;
-			RecordDelimiter = Letters.NULL;
-			Comment = Letters.POUND;
-			EscapeMode = ESCAPE_MODE_DOUBLED;
-			ForceQualifier = false;
-		}
-	}
-
-	public static String replace(String original, String pattern, String replace) {
-		final int len = pattern.length();
-		int found = original.indexOf(pattern);
-
-		if (found > -1) {
-			StringBuffer sb = new StringBuffer();
-			int start = 0;
-
-			while (found != -1) {
-				sb.append(original.substring(start, found));
-				sb.append(replace);
-				start = found + len;
-				found = original.indexOf(pattern, start);
-			}
-
-			sb.append(original.substring(start));
-
-			return sb.toString();
-		} else {
-			return original;
-		}
-	}
-}

org.talend.designer.components.libs/libs_src/mdmBulkLoadClient/org/talend/mdm/bulkload/client/BulkloadClient.java

@@ -1,32 +1,55 @@
 package org.talend.mdm.bulkload.client;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.List;
+import java.io.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class BulkloadClient {
-	String url;
-	String username;
-	String password;
-	String universe;
-	String cluster;
-	String concept;
-	String datamodel;
-	BulkloadOptions options=new BulkloadOptions();
-	
-	public BulkloadClient(String url, String username,String password,String universe,String cluster,String concept,String datamodel) {
+
+    private String url;
+
+	private String username;
+
+	private String password;
+
+    private String universe;
+
+    private String cluster;
+
+    private String concept;
+
+    private String dataModel;
+
+    private BulkloadOptions options = new BulkloadOptions();
+
+    private static final AtomicInteger startedBulkloadCount = new AtomicInteger(0);
+
+	public BulkloadClient(String url, String username, String password, String universe, String cluster, String concept, String dataModel) {
 		this.url=url;
 		this.username=username;
 		this.password=password;
 		this.universe=universe;
 		this.cluster=cluster;
 		this.concept=concept;
-		this.datamodel=datamodel;
+		this.dataModel = dataModel;
 	}
 
+    public void startThreadCount(){
+        // Kept for compatibility with tMDMBulkload.
+    }
+
+    public void waitForEndOfQueue() {
+        try {
+            synchronized (startedBulkloadCount) {
+                while (startedBulkloadCount.get() > 0) {
+                    System.out.println(startedBulkloadCount.get() + " remaining.");
+                    startedBulkloadCount.wait();
+                }
+            }
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
 	public String getUrl() {
 		return url;
 	}
@@ -76,11 +99,11 @@ public class BulkloadClient {
 	}
 
 	public String getDatamodel() {
-		return datamodel;
+		return dataModel;
 	}
 
-	public void setDatamodel(String datamodel) {
-		this.datamodel = datamodel;
+	public void setDatamodel(String dataModel) {
+		this.dataModel = dataModel;
 	}
 
 	public BulkloadOptions getOptions() {
@@ -90,93 +113,75 @@ public class BulkloadClient {
 	public void setOptions(BulkloadOptions options) {
 		this.options = options;
 	}
-	public void load(List<String > items) {
-		doLoad(items);
-	}
-	/**
+
+    /**
 	 * load from a huge xml string
-	 * @param xmlString
+	 * @param xmlString A full xml document.
+     * @throws Exception Thrown in case of bulk load error.
 	 */
-	public void load(String xmlString)throws Exception {
-		List<String > items=BulkloadClientUtil.getItemXmls(xmlString);			
-		doLoad(items);
-	}
-	
-	private void doLoad(List<String> items) {
-		if(items.size()>options.getArraySize()) {
-			int loop=items.size()/options.getArraySize();
-			int left=items.size()-options.getArraySize()*loop;
-			for(int i=0; i<loop; i++) {
-				List<String> subItems=items.subList(i*options.getArraySize(), (i+1)*options.getArraySize());
-				try {
-					BulkloadClientUtil.bulkload(url, cluster, concept, datamodel, options.isValidate(), options.isSmartpk(), subItems, username, password,universe);
-				} catch (Exception e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-			if(left>0) {
-				List<String> subItems=items.subList(loop*options.getArraySize(), loop*options.getArraySize()+left);
-				try {
-					BulkloadClientUtil.bulkload(url, cluster, concept, datamodel, options.isValidate(), options.isSmartpk(), subItems, username, password,universe);
-				} catch (Exception e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-		}else {
-			try {
-				BulkloadClientUtil.bulkload(url, cluster, concept, datamodel, options.isValidate(), options.isSmartpk(), items, username, password,universe);
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	/**
-	 * load from File
-	 * @param inputXmlFile
-	 */
-	public void load(Reader inputXmlFile) {
-		BufferedReader reader=null;
-		try {
-			reader=new BufferedReader(inputXmlFile);
-			StringBuffer sb=new StringBuffer();
-			String line=reader.readLine();
-			while(line!=null) {
-				sb=sb.append(line);
-				line=reader.readLine();
-			}
-			List<String > items=BulkloadClientUtil.getItemXmls(sb.toString());			
-			doLoad(items);
-		}catch(Exception e) {
-			e.printStackTrace();
-		}finally {
-			if(reader!=null)
-				try {
-					reader.close();
-				} catch (IOException e) {
-					
-				}
-		}
-	}
-	
-	public static void main(String[] args) {
-		//test
-		//FileReader reader=new FileReader(file)
-		URL url=BulkloadClient.class.getResource("test.xml");
-		try {
-			BufferedInputStream in=((BufferedInputStream)url.getContent());
-			byte[] buf=new byte[in.available()];
-			in.read(buf);
-			String xml=new String(buf);
-			BulkloadClient client=new BulkloadClient("http://localhost:8080/datamanager/loadServlet","admin","talend",null,"Order","Country","Order");
-			client.setOptions(new BulkloadOptions());
-			client.load(xml);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+	public void load(String xmlString) throws Exception {
+		load(new ByteArrayInputStream(xmlString.getBytes("UTF-8")));
 	}
+
+    /**
+     * <p>
+     * Loads XML documents in MDM using an InputStream. All documents should follow each other.
+     * For instance this InputStream can be used with this method.
+     * </p>
+     *
+     * <code>
+     * InputStream is = new ByteArrayInputStream("<doc></doc><doc></doc><doc></doc>".getBytes());
+     * </code>
+     *
+     * <p>
+     * This method blocks until all documents in <code>xmlDocuments</code> are read. For non blocking use cases
+     * see {@link #load()}.
+     * </p>
+     *
+     * @param xmlDocuments A stream that contains several XML documents.
+     * @throws Exception Thrown in case of bulk load error
+     */
+    public void load(InputStream xmlDocuments) throws Exception {
+        BulkloadClientUtil.bulkload(url,
+                cluster,
+                concept,
+                dataModel,
+                options.isValidate(),
+                options.isSmartpk(),
+                xmlDocuments,
+                username,
+                password,
+                universe);
+    }
+
+    /**
+     * <p>
+     * Loads XML documents in MDM using an InputStream created for the load. This method creates a {@link Thread} that
+     * wait for {@link InputStreamMerger#push(java.io.InputStream)} to get called.
+     * </p>
+     *
+     * <code>
+     * BulkloadClient client = ...<br/>
+     * InputStreamMerger is = client.load();<br/>
+     * for(...) {<br/>
+     *      is.push(new ByteArrayInputStream("...".getBytes());<br/>
+     * }
+     * </code>
+     *
+     * @throws Exception Thrown in case of communication error
+     * @see InputStreamMerger
+     * @return A {@link InputStreamMerger} that allow asynchronous push to bulkload client.
+     */
+    public InputStreamMerger load() throws Exception {
+        return BulkloadClientUtil.bulkload(url,
+                cluster,
+                concept,
+                dataModel,
+                options.isValidate(),
+                options.isSmartpk(),
+                username,
+                password,
+                universe,
+                startedBulkloadCount);
+    }
 }

org.talend.designer.components.libs/libs_src/mdmBulkLoadClient/org/talend/mdm/bulkload/client/BulkloadClientUtil.java

@@ -1,189 +1,131 @@
 package org.talend.mdm.bulkload.client;
 
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
+import java.io.InputStream;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.httpclient.URI;
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthScope;
-import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.cookie.CookiePolicy;
+import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
+import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.params.HttpClientParams;
-import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 /**
  * Bulkload amount items client
- * @author achen
  *
  */
 public class BulkloadClientUtil {
 
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args)throws Exception {
-		if((!args[0].startsWith("http://") && args.length>0) && (args.length != 9 || args.length!=7 || args.length!=6)) {
-			usage();
-			return;
-		}
-		String url= args[0];
-		String username=args[1];
-		String password=args[2];
-		String cluster= args[3];
-		String concept= args[4];
-		String datamodel= args[5];
-		boolean validate= false;
-		boolean smartpk= false;
-		List<String> itemdata= new ArrayList<String>();
-		if(args.length==9) {
-			 validate= Boolean.valueOf(args[6]);
-			 smartpk= Boolean.valueOf(args[7]);	
-			 itemdata=getItemXmls(args[8]);
-		}
-		if(args.length==7) {
-			itemdata=getItemXmls(args[6]);
-		}
-		if(args.length==6) {//get itemdata from System.in
-			byte[] buf=new byte[System.in.available()];
-			System.in.read(buf);
-			itemdata=getItemXmls(new String(buf));
-		}
-		try {
-			bulkload(url,cluster, concept,datamodel, validate, smartpk, itemdata,username,password,null);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-	public static List<String> getItemXmls(String itemdata)throws Exception {
-		Element root=parse(itemdata).getDocumentElement();
-		List<String> items=new ArrayList<String>();
-		for(int i=0; i<root.getChildNodes().getLength(); i++) {
-			Node node=root.getChildNodes().item(i);
-			if(node.getNodeType() == Node.ELEMENT_NODE) {
-				items.add(nodeToString(node, true));
-			}
-		}
-		return items;
-	}
-	
-	private static String nodeToString(Node n, boolean omitXMLDeclaration) throws TransformerException{
-       	StringWriter sw = new StringWriter();
-       	Transformer transformer = TransformerFactory.newInstance().newTransformer();       	
-       	if (omitXMLDeclaration)
-       		transformer.setOutputProperty("omit-xml-declaration","yes");
-       	else
-       		transformer.setOutputProperty("omit-xml-declaration","no");
-       	transformer.setOutputProperty("indent","yes");
-       	transformer.transform(
-				new DOMSource(n),
-				new StreamResult(sw)
-				);
-       	if (sw==null) return null;       	
-		return sw.toString().replaceAll("\r\n", "\n");
-	}
-	
-	private static Document parse(String xmlString) throws ParserConfigurationException,IOException, SAXException{
-		//parse
-		Document d=null;
+    public static void bulkload(String url, String cluster, String concept, String datamodel, boolean validate, boolean smartpk, InputStream itemdata,
+                                String username, String password, String universe) throws Exception {
+        HostConfiguration config = new HostConfiguration();
+        URI uri = new URI(url, false, "UTF-8"); //$NON-NLS-1$
+        config.setHost(uri);
 
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		//Schema validation based on schemaURL
-		factory.setNamespaceAware(true);
-		factory.setAttribute(
-				"http://java.sun.com/xml/jaxp/properties/schemaLanguage",
-				"http://www.w3.org/2001/XMLSchema");
-		DocumentBuilder builder;
-		builder = factory.newDocumentBuilder();
+        NameValuePair[] parameters = {new NameValuePair("cluster", cluster), //$NON-NLS-1$
+                new NameValuePair("concept", concept),  //$NON-NLS-1$
+                new NameValuePair("datamodel", datamodel),   //$NON-NLS-1$
+                new NameValuePair("validate", String.valueOf(validate)), //$NON-NLS-1$
+                new NameValuePair("action", "load"), //$NON-NLS-1$ //$NON-NLS-2$
+                new NameValuePair("smartpk", String.valueOf(smartpk))}; //$NON-NLS-1$
 
-		d = builder.parse(new InputSource(new StringReader(xmlString)));
+        HttpClient client = new HttpClient();
+        String user = universe == null || universe.trim().length() == 0 ? username : universe + "/" + username; //$NON-NLS-1$
+        client.getState().setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(user, password));
+        HttpClientParams clientParams = client.getParams();
+        clientParams.setAuthenticationPreemptive(true);
+        clientParams.setCookiePolicy(CookiePolicy.IGNORE_COOKIES);
 
-		return d;
-    }	
-	private static void usage() {
-		String usage="Usage:\n"+
-		"\t java -jar bulkloadclient.jar <url> <username> <password> <datacontainer> <concept> <datamodel> [validate] [smartpk] [itemdata] \n"+
-		"\t example1: java -jar bulkloadclient.jar http://localhost:8080/datamanager/loadServlet admin talend Order Country Order <itemdata><Country><isoCode>zh</isoCode><label>china</label><Continent>Asia</Continent></Country></itemdata>"+
-		"\t example2(on linux): cat myfile.xml|java -jar bulkloadclient.jar http://localhost:8080/datamanager/loadServlet admin talend Order Country Order";
-		
-		System.out.println(usage);
-	}
-	
-	
-	public static boolean bulkload(String URL, String cluster,String concept,String datamodel, boolean validate, boolean smartpk, List<String> itemdata,
-			String username, String password,String universe) throws Exception {
-		HttpClient client = new HttpClient();
-		HttpClientParams params = new HttpClientParams();
-		// params.setSoTimeout(1000);
-		// params.setConnectionManagerTimeout(200);
-		client.setParams(params);
-		String user=universe==null||universe.trim().length()==0?username:universe+"/"+username;
-		client.getState().setCredentials(AuthScope.ANY,
-				new UsernamePasswordCredentials(user, password));
+        PutMethod putMethod = new PutMethod();
+        // This setPath call is *really* important (if not set, request will be sent to the JBoss root '/')
+        putMethod.setPath(url);
+        String responseBody;
+        try {
+            // Configuration
+            putMethod.setRequestHeader("Content-Type", "text/xml; charset=utf8"); //$NON-NLS-1$ //$NON-NLS-2$
+            putMethod.setQueryString(parameters);
+            putMethod.setContentChunked(true);
+            // Set the content of the PUT request
+            putMethod.setRequestEntity(new InputStreamRequestEntity(itemdata));
 
-		URI uri = new URI(URL, false, "utf-8");
-		HostConfiguration config = new HostConfiguration();
-		config.setHost(uri);
+            client.executeMethod(config, putMethod);
+            responseBody = putMethod.getResponseBodyAsString();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        } finally {
+            putMethod.releaseConnection();
+        }
 
-		PostMethod postMethod = new PostMethod(URL);
-		HttpMethodParams reqParams = postMethod.getParams();  
-		reqParams.setContentCharset("UTF-8"); 
-		List<NameValuePair> list=new ArrayList<NameValuePair>();
-		NameValuePair[] data = { new NameValuePair("cluster", cluster),
-				new NameValuePair("concept", concept),
-				new NameValuePair("datamodel", datamodel),
-				new NameValuePair("validate", String.valueOf(validate)),
-				new NameValuePair("smartpk", String.valueOf(smartpk))};
-		list.addAll(Arrays.asList(data));
-		for(int i=0; i<itemdata.size(); i++) {
-			list.add(new NameValuePair("itemdata"+i, itemdata.get(i)));
-		}
-		postMethod.setRequestBody((NameValuePair[])list.toArray(new NameValuePair[list.size()]));
-		// post method
-		int statusCode = 0;
-		try {
-			statusCode = client.executeMethod(config,postMethod);
-		} catch (HttpException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+        int statusCode = putMethod.getStatusCode();
+        if (statusCode >= 400) {
+            throw new BulkloadException(responseBody);
+        }
+    }
 
-		if (statusCode >= 400)
-			return false;
-		String str = "";
-		try {
-			str = postMethod.getResponseBodyAsString();
-		} catch (IOException e) {
+    public static InputStreamMerger bulkload(String url, String cluster, String concept, String dataModel, boolean validate, boolean smartPK, String username, String password, String universe, AtomicInteger startedBulkloadCount) {
+        InputStreamMerger merger = new InputStreamMerger();
 
-		}
-		System.out.println(str);
+        Runnable loadRunnable = new AsyncLoadRunnable(url, cluster, concept, dataModel, validate, smartPK, merger, username, password, universe, startedBulkloadCount);
+        Thread loadThread = new Thread(loadRunnable);
+        loadThread.start();
 
-		postMethod.releaseConnection();
-		return true;
-	}
+        return merger;
+    }
 
+    private static class AsyncLoadRunnable implements Runnable {
+
+        private final String url;
+
+        private final String cluster;
+
+        private final String concept;
+
+        private final String dataModel;
+
+        private final boolean validate;
+
+        private final boolean smartPK;
+
+        private final InputStreamMerger inputStream;
+
+        private final String userName;
+
+        private final String password;
+
+        private final String universe;
+
+        private final AtomicInteger startedBulkloadCount;
+
+        public AsyncLoadRunnable(String url, String cluster, String concept, String dataModel, boolean validate, boolean smartPK, InputStreamMerger inputStream, String userName, String password, String universe, AtomicInteger startedBulkloadCount) {
+            this.url = url;
+            this.cluster = cluster;
+            this.concept = concept;
+            this.dataModel = dataModel;
+            this.validate = validate;
+            this.smartPK = smartPK;
+            this.inputStream = inputStream;
+            this.userName = userName;
+            this.password = password;
+            this.universe = universe;
+            this.startedBulkloadCount = startedBulkloadCount;
+        }
+
+        public void run() {
+            try {
+                startedBulkloadCount.incrementAndGet();
+                bulkload(url, cluster, concept, dataModel, validate, smartPK, inputStream, userName, password, universe);
+            } catch (Throwable e) {
+                inputStream.reportFailure(e);
+            } finally {
+                startedBulkloadCount.decrementAndGet();
+                synchronized (startedBulkloadCount) {
+                    startedBulkloadCount.notifyAll();
+                }
+            }
+        }
+    }
 }

org.talend.designer.components.libs/libs_src/mdmBulkLoadClient/org/talend/mdm/bulkload/client/BulkloadException.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2006-2012 Talend Inc. - www.talend.com
+ *
+ * This source code is available under agreement available at
+ * %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+ *
+ * You should have received a copy of the agreement
+ * along with this program; if not, write to Talend SA
+ * 9 rue Pages 92150 Suresnes, France
+ */
+
+package org.talend.mdm.bulkload.client;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+/**
+ *
+ */
+public class BulkloadException extends RuntimeException {
+
+    private static final String SERVER_EXCEPTION_SEPARATOR = "== SERVER EXCEPTION ==";
+
+    private static final String LINE_SEPARATOR  = System.getProperty("line.separator"); //$NON-NLS-1$
+
+    private final String serverException;
+
+    public BulkloadException(String serverException) {
+        super("An exception happened during bulk load on MDM server.");
+        this.serverException = serverException;
+    }
+
+    public String getServerException() {
+        return serverException;
+    }
+
+    @Override
+    public void printStackTrace(PrintStream s) {
+        super.printStackTrace(s);
+        s.append(LINE_SEPARATOR);
+        s.append(SERVER_EXCEPTION_SEPARATOR);
+        s.append(LINE_SEPARATOR);
+        s.append(serverException);
+    }
+
+    @Override
+    public void printStackTrace(PrintWriter s) {
+        super.printStackTrace(s);
+        s.println(SERVER_EXCEPTION_SEPARATOR);
+        s.println(serverException);
+    }
+}

org.talend.designer.components.libs/libs_src/mdmBulkLoadClient/org/talend/mdm/bulkload/client/InputStreamMerger.java

@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2006-2012 Talend Inc. - www.talend.com
+ *
+ * This source code is available under agreement available at
+ * %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
+ *
+ * You should have received a copy of the agreement
+ * along with this program; if not, write to Talend SA
+ * 9 rue Pages 92150 Suresnes, France
+ */
+
+package org.talend.mdm.bulkload.client;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ *
+ */
+public class InputStreamMerger extends InputStream {
+
+    private static final Logger log = Logger.getLogger(InputStreamMerger.class.getName());
+
+    private final Queue<InputStream> inputStreamBuffer = new ConcurrentLinkedQueue<InputStream>();
+
+    private final Object readLock = new Object();
+
+    private final Object exhaustLock = new Object();
+
+    private boolean isClosed;
+
+    private InputStream currentStream;
+
+    private boolean hasFinishedRead;
+
+    private Throwable lastFailure;
+
+    public void push(InputStream inputStream) throws IOException {
+        if (inputStream == null) {
+            throw new IllegalArgumentException("Input stream can not be null.");
+        }
+        if (isClosed) {
+            throw new IOException("Stream is closed");
+        }
+        inputStreamBuffer.add(inputStream);
+        debug("Added a new input stream (buffer now has " + inputStreamBuffer.size() + " streams)");
+    }
+
+    public void reportFailure(Throwable e) {
+        debug("Exception occurred in consumer thread: " + e.getMessage());
+        lastFailure = e;
+        synchronized (exhaustLock) {
+            exhaustLock.notifyAll();
+        }
+    }
+
+    @Override
+    public int available() throws IOException {
+        return 4096;
+    }
+
+    @Override
+    public boolean markSupported() {
+        return false;
+    }
+
+    /**
+     * <p> Read block the current thread until data is pushed to this stream (using {@link #push(java.io.InputStream)}
+     * or if {@link #close()} is called. </p>
+     *
+     * @return the next byte of data, or <code>-1</code> if the end of the stream is reached <b>or</b> if stream is
+     *         closed.
+     * @throws IOException
+     * @see java.io.InputStream#read()
+     */
+    @Override
+    public int read() throws IOException {
+        int read = -1;
+        if (currentStream != null) {
+            read = currentStream.read();
+        } else {
+            moveToNextInputStream();
+            if (currentStream != null) {
+                read = currentStream.read();
+            }
+        }
+        if (read < 0) {
+            moveToNextInputStream();
+            if (currentStream != null) {
+                read = currentStream.read();
+            }
+        }
+        if (read < 0) {
+            synchronized (exhaustLock) {
+                debug("Notify exhaust lock");
+                exhaustLock.notifyAll();
+            }
+        }
+        // Throw any exception that might have occurred during last record processing.
+        throwLastFailure();
+        return read;
+    }
+
+    private void throwLastFailure() throws IOException {
+        if (lastFailure != null) {
+            debug("Report last failure exception to producer.");
+            throw new IOException("An exception occurred while processing last record.", lastFailure);
+        }
+    }
+
+    private void moveToNextInputStream() throws IOException {
+        // Throw any exception that might have occurred during previous records
+        throwLastFailure();
+        // Check the isClosed flag in case we've got waken up by a close()
+        while (inputStreamBuffer.isEmpty() && !isClosed) {
+            synchronized (readLock) {
+                try {
+                    debug("Wait for more input...");
+                    readLock.wait();
+                    debug("Wait for more input done.");
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        if (!inputStreamBuffer.isEmpty()) {
+            if (currentStream != null) {
+                currentStream.close();
+            }
+            currentStream = inputStreamBuffer.poll();
+        } else {
+            currentStream = null;
+            hasFinishedRead = true;
+        }
+        debug("Remaining buffers : " + inputStreamBuffer.size());
+    }
+
+    /**
+     * <p> Close this stream and perform some checks: <ul> <li>Mark this stream as closed (no more calls to {@link
+     * #push(java.io.InputStream)} are allowed)</li> <li>Closes any remaining stream pushed to this stream</li> </ul>
+     * </p> <p> Calling this method wakes up any thread blocked on {@link #read()} </p> <p> Wait till all streams pushed
+     * to this stream (and stored in <code>inputStreamBuffer</code>) are processed by a reader. </p> <p> When this
+     * method exits, the buffer is empty and the last stream in buffer is fully read (i.e. until read() returns -1).
+     * </p>
+     *
+     * @throws IOException In case at least one stream in buffer hasn't been read.
+     * @see java.io.InputStream#close()
+     */
+    @Override
+    public void close() throws IOException {
+        super.close();
+        isClosed = true;
+        synchronized (readLock) {
+            readLock.notifyAll();
+        }
+        debug("Input stream buffer size: " + +inputStreamBuffer.size());
+        debug("Has finished read: " + hasFinishedRead);
+        debug("Stop condition: " + (!inputStreamBuffer.isEmpty() && !hasFinishedRead));
+        while (!inputStreamBuffer.isEmpty() && !hasFinishedRead) {
+            try {
+                debug("Waiting for exhaust... (" + inputStreamBuffer.size() + " remaining)");
+                synchronized (exhaustLock) {
+                    exhaustLock.wait();
+                }
+                // In case we got woken up due to a failure
+                throwLastFailure();
+                debug("Waiting for exhaust done.");
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        // In case failure happened on very last read.
+        throwLastFailure();
+        debug("Close completed.");
+    }
+
+    private static void debug(String message) {
+        Level debugLevel = Level.FINEST;
+        if (log.isLoggable(debugLevel)) {
+            log.log(debugLevel, "[" + Thread.currentThread() + "] " + message);
+        }
+    }
+
+    public Throwable getLastReportedFailure() {
+        return lastFailure;
+    }
+}

org.talend.designer.components.libs/libs_src/msmq/ionic/Msmq/Message.java

@@ -1,37 +1,331 @@
+// Message.java
+// ------------------------------------------------------------------
+//
+// Copyright (c) 2006-2010 Dino Chiesa.
+// All rights reserved.
+//
+// This code module is part of MsmqJava, a JNI library that provides
+// access to MSMQ for Java on Windows.
+//
+// ------------------------------------------------------------------
+//
+// This code is licensed under the Microsoft Public License.
+// See the file License.txt for the license details.
+// More info on: http://dotnetzip.codeplex.com
+//
+// ------------------------------------------------------------------
+//
+// last saved (in emacs):
+// Time-stamp: <2010-March-28 15:17:56>
+//
+// ------------------------------------------------------------------
+//
+// This module represents a Message object.
+//
+// ------------------------------------------------------------------
+
 package ionic.Msmq;
 
-  public class Message {
-    String _message ;
+
+/**
+ * <p>The Message class models a message that is sent to or receive from an
+ * MSMQ queue.  It exposes several properties that are known to MSMQ,
+ * including the message label, the message correlationId, and the
+ * message body.</p>
+ *
+ * <p>The maximum size for an MSMQ 4.0 message is slightly less than 4
+ * MB. If you try to send a message that exceeds the maximum size, you
+ * will receive a MessageQueueException, with hr =
+ * MQ_ERROR_INSUFFICIENT_RESOURCES (0xC00E0027).</p>
+ *
+ */
+public class Message {
+    private static String _encoding = "UTF-16LE";
+    private static String _utf8 = "UTF-8";
+    byte[] _messageBody ;
     String _label ;
-    String _correlationId ;
-    int _transactionFlag;
-    //    int _status; 
+    byte[] _correlationId ; // up to PROPID_M_CORRELATIONID_SIZE bytes
+    boolean _highPriority;
 
-    public void setMessage(String value) { _message= value; }
-    public String getMessage() { return _message; }
 
-    public void setLabel(String value) { _label= value; }
-    public String getLabel() { return _label; }
+    /**
+     * <p>Sets the message body, as a string.</p>
+     *
+     * <p>The string will be encoded as UTF-16LE, with no byte-order-mark.
+     * This information may be useful if you use different libraries on the
+     * the receiving and sending side. </p>
+     *
+     * @param  value    the string to use for the Message body
+     * @see    #setBody(byte[])
+     */
+    public void setBodyAsString(String value)
+        throws java.io.UnsupportedEncodingException
+    { _messageBody= value.getBytes(_encoding); }
 
-    public void setCorrelationId(String value) {_correlationId= value;}
-    public String getCorrelationId() {return _correlationId; }
 
-    public void setTransactionFlag(int value) { _transactionFlag= value;}
-    public int getTransactionFlag() {return _transactionFlag;}
+    /**
+     * <p>Gets the message body, as a string.</p>
+     *
+     * <p>The string will be decoded as UTF-16LE, with no byte-order-mark.
+     * This is mostly useful after receiving a message. </p>
+     *
+     * <p>If the message body is not a legal UTF-16LE bytestream, then this
+     * method will return a rubbish string.</p>
+     *
+     * @return the message body, as a string.
+     * @see    #getBody()
+     */
+    public String getBodyAsString()
+        throws java.io.UnsupportedEncodingException
+    { return new String(_messageBody, _encoding); }
 
-    //    public int getStatus() {return _status;}
 
-    public  Message(String message, String label, String correlationId, int transactionFlag) {
-      _message=message;
-      _label= label;
-      _correlationId= correlationId;
-      _transactionFlag= transactionFlag;
+    /**
+     * <p>Sets the correlation Id on the message. </p>
+     *
+     * <p>MSMQ specifies that the ID should be a byte array, of 20 bytes
+     * in length. But callers can use this convenience method to use a
+     * string as a correlationId.  It will be encoded as UTF-8, and
+     * limited to 20 bytes.</p>
+     *
+     * @param  value   the string to use as the correlation ID on the message.
+     */
+
+    public void setCorrelationIdAsString(String value)
+        throws java.io.UnsupportedEncodingException
+    { _correlationId= value.getBytes(_utf8); }
+
+
+    /**
+     * <p>Gets the correlation Id on the message, in the form of a string. </p>
+     *
+     * <p>The behavior is undefined if the correlation ID is not a
+     * UTF-8 bytestream.</p>
+     *
+     * @return the correlation ID on the message, as a string.
+     */
+    public String getCorrelationIdAsString()
+        throws java.io.UnsupportedEncodingException
+    { return new String(_correlationId, _utf8); }
+
+
+    /**
+     * Sets the message body.
+     *
+     * @param  value    the byte array to use for the Message body
+     * @see    #getBody()
+     * @see    #setBodyAsString(String)
+     */
+    public void setBody(byte[] value)          { _messageBody= value; }
+
+    /**
+     * Gets the message body.
+     *
+     * @return the message body, as a byte array.
+     */
+    public byte[] getBody()                    { return _messageBody; }
+
+
+
+    /**
+     * Sets the message label.
+     *
+     * @param  value   the string to use as the label on the message.
+     */
+    public void setLabel(String value)         { _label= value; }
+
+    /**
+     * Gets the message body.
+     *
+     * @return the message label.
+     */
+    public String getLabel()                   { return _label; }
+
+
+
+    /**
+     * <p>Sets the correlation Id on the message. </p>
+     *
+     * <p> The ID should be a byte array, a maximum of 20 bytes.</p>
+     *
+     * @param  value  the byte array to use as the correlation ID on the
+     *                message.
+     */
+    public void setCorrelationId(byte[] value) { _correlationId= value; }
+
+    /**
+     * <p>Gets the correlation Id on the message. </p>
+     *
+     * <p>The ID will be a byte array, of length 20.</p>
+     *
+     * @return the correlation ID on the message.
+     */
+    public byte[] getCorrelationId()           { return _correlationId; }
+
+
+    /**
+     * Sets whether the message should be trated as high priority or not.
+     *
+     * @param  value   true if the message should be delivered with high
+     *                 priority.
+     */
+    public void setHighPriority(boolean value) { _highPriority= value; }
+
+
+    /**
+     * <p>Gets whether the message will be treated with high priority.</p>
+     *
+     * <p>This only makes sense for outgoing messages.</p>
+     *
+     * @return  true if the message will be trated with high priority.
+     */
+    public boolean getHighPriority()           { return _highPriority; }
+
+
+    Message()    { }
+
+
+
+    /**
+     * <p>Creates a Message instance, using a string argument for the
+     * contents of the body, and empty values for the label and
+     * correlation ID.</p>
+     *
+     * @param  body    the string to use for the Message body
+     */
+    public Message(String body)
+        throws java.io.UnsupportedEncodingException
+    {
+        this(body, "", "");
     }
-//     public Message(String message, String label, String correlationId, int transactionFlag, int status) {
-//       _message=message;
-//       _label= label;
-//       _correlationId= correlationId;
-//       _transactionFlag= transactionFlag;
-//       _status= status;
-//     }
-  }
+
+
+    /**
+     * <p>Creates a Message instance, using string arguments for the
+     * contents.</p>
+     *
+     * <p>A Message contains byte array data in the body and correlation
+     * Id. This constructor allows the specification of those items as
+     * strings.  The actual values of the body and correlation Id are
+     * set to the encoded form of the strings, using UTF-16LE for
+     * encoding. </p>
+     *
+     * <p>If you use ASCII strings for the body and correlationId,
+     * the encoding will be very inefficient. Each character in the input
+     * will result in two bytes in output, one of which will be a zero.
+     * Therefore, if you're concerned about efficiency, consider encoding
+     * strings separately, before creating the Message instance. </p>
+     *
+     *
+     * @param  body    the string to use for the Message body.
+     * @param  label   the string to use for the Message label. The maximum
+     *                 length of a message label is 250 bytes.
+     * @param  correlationId    the string to use for the Message correlation Id
+     */
+    public Message(String body, String label, String correlationId)
+        throws java.io.UnsupportedEncodingException
+    {
+        this(body.getBytes(Message._encoding),
+             label,
+             correlationId.getBytes(Message._encoding));
+    }
+
+
+    /**
+     * <p>Creates a Message instance, using a string for the
+     * body and label, and a byte array for the correlation ID.</p>
+     *
+     * <p>A Message contains byte array data in the body and correlation
+     * Id. This constructor allows the specification of the body as a
+     * string, and the correlation Id as a byte array.  The actual value
+     * of the body will be set to the encoded form of the body string,
+     * using UTF-16LE. </p>
+     *
+     * <p>Only the first 20 bytes of the correlationId will be used.</p>
+     *
+     * @param  body    the string to use for the Message body
+     * @param  label   the string to use for the Message label
+     * @param  correlationId    the byte array to use for the Message correlation Id
+     *
+     */
+    public Message(String body, String label, byte[] correlationId)
+        throws java.io.UnsupportedEncodingException
+    {
+        this(body.getBytes(_encoding),
+             label,
+             correlationId);
+    }
+
+
+    /**
+     * <p>Creates a Message instance, using a byte array for the
+     * message body, and empty values for the label and correlation ID.</p>
+     *
+     * <p>A Message contains byte array data in the body and
+     * correlation Id. This constructor allows the specification of the
+     * body as a byte array. The label and correlation ID of the
+     * Message are set to empty values. </p>
+     *
+     * @param  body    the string to use for the Message body
+     *
+     */
+    public Message(byte[] body)
+        throws java.io.UnsupportedEncodingException
+    {
+        this(body, "", "");
+    }
+
+
+
+    /**
+     * <p>Creates a Message instance, using a byte array for the
+     * body, and a string for the label and correlation ID.</p>
+     *
+     * <p>A Message contains byte array data in the body and correlation
+     * Id. This constructor allows the specification of the body as a
+     * byte array, and the correlation Id as a string.  The actual value
+     * of the correlation Id will be the encoded form of the body
+     * string, using UTF-16LE. </p>
+     *
+     * <p>Only the first 20 bytes of the correlationId will be used.</p>
+     *
+     * @param  body    the string to use for the Message body
+     * @param  label   the string to use for the Message label
+     * @param  correlationId    the byte array to use for the Message correlation Id
+     *
+     */
+    public Message(byte[] body, String label, String correlationId)
+        throws java.io.UnsupportedEncodingException
+    {
+        this(body,
+             label,
+             correlationId.getBytes(_encoding));
+    }
+
+
+
+    /**
+     * <p>Creates a Message instance, using a byte array for the
+     * body the correlation ID, and a string for the label.</p>
+     *
+     * <p>A Message contains byte array data in the body and correlation
+     * Id. This constructor allows the specification of the body and
+     * correlation ID as byte arrays. Applications may wish to use this
+     * constructor when close control of the contents of the message is
+     * desired. </p>
+     *
+     * <p>Only the first 20 bytes of the correlationId will be used.</p>
+     *
+     * @param  body    the string to use for the Message body
+     * @param  label   the string to use for the Message label
+     * @param  correlationId    the byte array to use for the Message correlation Id
+     *
+     */
+    public Message(byte[] body, String label, byte[] correlationId)
+    {
+        _messageBody = body;
+        _label= label;
+        _correlationId= correlationId;
+    }
+
+}

org.talend.designer.components.libs/libs_src/msmq/ionic/Msmq/MessageQueueException.java

@@ -1,63 +1,113 @@
-package ionic.Msmq ; 
+//
+// MessageQueueException.java
+// ------------------------------------------------------------------
+//
+// Copyright (c) 2006-2010 Dino Chiesa.
+// All rights reserved.
+//
+// This code module is part of MsmqJava, a JNI library that provides
+// access to MSMQ for Java on Windows.
+//
+// ------------------------------------------------------------------
+//
+// This code is licensed under the Microsoft Public License.
+// See the file License.txt for the license details.
+// More info on: http://dotnetzip.codeplex.com
+//
+// ------------------------------------------------------------------
+//
+// last saved (in emacs):
+// Time-stamp: <2010-March-28 15:50:20>
+//
+// ------------------------------------------------------------------
+//
+// This class models an exception that may occur when interacting with
+// MSMQ through the JNI library.
+//
+// ------------------------------------------------------------------
 
+package ionic.Msmq ;
+
+/**
+ * An exception type to wrap any problems that occur during MSMQ operations.
+ *
+ **/
 public class MessageQueueException extends java.lang.Exception {
 
-  public int hresult;
+    public int hresult;
 
-  public MessageQueueException(int HRESULT) {
-    super();
-    hresult= HRESULT; 
-  }
+    public MessageQueueException(int HRESULT) {
+        super();
+        hresult= HRESULT;
+    }
 
-  public MessageQueueException(String message, int HRESULT) {
-    super(message);
-    hresult= HRESULT; 
-  }
+    public MessageQueueException(String message, int HRESULT) {
+        super(message);
+        hresult= HRESULT;
+    }
 
-  public String toString() {
-    String msg = getLocalizedMessage();
-    String hr= "hr=" + HrToString(hresult) ; 
-    return msg + " (" + hr + ")";
-  }
+    /**
+     * <p>Produce the string version for the given exception, including the
+     * string mnemonic for the HR wrapped by the exception.</p>
+     *
+     * <p>Example:</p>
+     *
+     * <blockquote class='code'><pre>
+     *   try {
+     *       String label="testmessage";
+     *       String body= "....";
+     *       Message msg= new Message(body, label, null);
+     *       queue.send(msg);
+     *   }
+     *   catch (MessageQueueException ex1) {
+     *       System.out.println("Put failure: " + ex1.toString());
+     *   }
+     * </pre></blockquote>
+     *
+     */
+    public String toString() {
+        String msg = getLocalizedMessage();
+        String hr= "hr=" + HrToString(hresult) ;
+        return msg + " (" + hr + ")";
+    }
 
 
-  // --------------------------------------------
-  public static String HrToString(int hr) {
-    if (hr== 0) 
-      return "SUCCESS";
-    if (hr==0xC00E0002)
-      return "MQ_ERROR_PROPERTY";
-    if (hr== 0xC00E0003) 
-      return "MQ_ERROR_QUEUE_NOT_FOUND";
-    if (hr==0xC00E0005)
-      return "MQ_ERROR_QUEUE_EXISTS";
-    if (hr==0xC00E0006)
-      return "MQ_ERROR_INVALID_PARAMETER";
-    if (hr==0xC00E0007)
-      return "MQ_ERROR_INVALID_HANDLE";
-    if (hr==0xC00E005A)
-      return "MQ_ERROR_QUEUE_DELETED";
-    if (hr==0xC00E000B)
-      return "MQ_ERROR_SERVICE_NOT_AVAILABLE";
-    if (hr==0xC00E001B)
-      return "MQ_ERROR_IO_TIMEOUT";
-    if (hr==0xC00E001E)
-      return "MQ_ERROR_ILLEGAL_FORMATNAME";
-    if (hr== 0xC00E0025) 
-      return "MQ_ERROR_ACCESS_DENIED";
-    if (hr==0xC00E0013) 
-      return "MQ_ERROR_NO_DS";
-    if (hr==0xC00E003F)
-      return "MQ_ERROR_INSUFFICIENT_PROPERTIES";
-    if (hr==0xC00E0014) 
-      return "MQ_ERROR_ILLEGAL_QUEUE_PATHNAME";
-    if (hr==0xC00E0044)
-      return "MQ_ERROR_INVALID_OWNER";
-    if (hr==0xC00E0045)
-      return "MQ_ERROR_UNSUPPORTED_ACCESS_MODE";
-    if (hr== 0xC00E0069) 
-      return "MQ_ERROR_REMOTE_MACHINE_NOT_AVAILABLE";
+    private static String HrToString(int hr) {
+        if (hr== 0)
+            return "SUCCESS";
+        if (hr==0xC00E0002)
+            return "MQ_ERROR_PROPERTY";
+        if (hr== 0xC00E0003)
+            return "MQ_ERROR_QUEUE_NOT_FOUND";
+        if (hr==0xC00E0005)
+            return "MQ_ERROR_QUEUE_EXISTS";
+        if (hr==0xC00E0006)
+            return "MQ_ERROR_INVALID_PARAMETER";
+        if (hr==0xC00E0007)
+            return "MQ_ERROR_INVALID_HANDLE";
+        if (hr==0xC00E005A)
+            return "MQ_ERROR_QUEUE_DELETED";
+        if (hr==0xC00E000B)
+            return "MQ_ERROR_SERVICE_NOT_AVAILABLE";
+        if (hr==0xC00E001B)
+            return "MQ_ERROR_IO_TIMEOUT";
+        if (hr==0xC00E001E)
+            return "MQ_ERROR_ILLEGAL_FORMATNAME";
+        if (hr== 0xC00E0025)
+            return "MQ_ERROR_ACCESS_DENIED";
+        if (hr==0xC00E0013)
+            return "MQ_ERROR_NO_DS";
+        if (hr==0xC00E003F)
+            return "MQ_ERROR_INSUFFICIENT_PROPERTIES";
+        if (hr==0xC00E0014)
+            return "MQ_ERROR_ILLEGAL_QUEUE_PATHNAME";
+        if (hr==0xC00E0044)
+            return "MQ_ERROR_INVALID_OWNER";
+        if (hr==0xC00E0045)
+            return "MQ_ERROR_UNSUPPORTED_ACCESS_MODE";
+        if (hr== 0xC00E0069)
+            return "MQ_ERROR_REMOTE_MACHINE_NOT_AVAILABLE";
 
-    return "unknown hr (" + hr + ")";
-  }
+        return "unknown hr (" + hr + ")";
+    }
 }

org.talend.designer.components.libs/libs_src/msmq/ionic/Msmq/Queue.java

@@ -1,184 +1,463 @@
+//
+// Queue.java
+// ------------------------------------------------------------------
+//
+// Copyright (c) 2006-2010 Dino Chiesa.
+// All rights reserved.
+//
+// This code module is part of MsmqJava, a JNI library that provides
+// access to MSMQ for Java on Windows.
+//
+// ------------------------------------------------------------------
+//
+// This code is licensed under the Microsoft Public License.
+// See the file License.txt for the license details.
+// More info on: http://dotnetzip.codeplex.com
+//
+// ------------------------------------------------------------------
+//
+// last saved (in emacs):
+// Time-stamp: <2010-March-28 15:51:58>
+//
+// ------------------------------------------------------------------
+//
+// This module provides the Java Queue object, representing an MSMQ Queue.
+//
+// ------------------------------------------------------------------
+
 package ionic.Msmq;
 
-public class Queue {
 
-    public Queue(String queueName) throws MessageQueueException {
-        _init(queueName, 0x03); // open with both SEND and RECEIVE access
+
+/**
+ * The Queue class represents a message queue in MSMQ.
+ *
+ * <p>
+ *
+ * Applications can instantiate a Queue, then perform send and receive
+ * operations on the queue, using instances of the Message type.
+ *
+ * </p>
+ * <p>
+ *
+ * Queue also exposes several static methods for Queue management, to
+ * support creation and deletion of message queues.
+ * </p>
+ *
+ */
+public class Queue
+{
+
+    /**
+     * <p>
+     * The Queue.Access enum provides options for access to the MSMQ
+     * Queue: Either Receive, Send, or both. Specify this when opening a
+     * queue.
+     * </p>
+     *
+     * <p>
+     *
+     * Applications may wish to open queues for only the access they
+     * need, in order to save resources and memory.
+     * </p>
+     *
+     */
+    public enum Access
+    {
+        /**
+         * The queue will be accessible for Receive or READ (or GET)
+         * operations.
+         *
+         **/
+        RECEIVE(1),
+
+        /**
+         * The queue will be accessible for Send or WRITE (or PUT)
+         * operations.
+         *
+         **/
+            SEND(2),
+
+        /**
+         * The queue will be accessible for both Send ad Receive
+         * operations.
+         *
+         **/
+            SEND_AND_RECEIVE(3);
+
+        int _accessFlag;
+
+        Access(int value)
+        {
+            _accessFlag = value;
+        }
+
+        int getValue()   { return _accessFlag; }
     }
 
-    public Queue(String queueName, int access) throws MessageQueueException {
-        _init(queueName, access);
+
+    /**
+     * <p>Call this constructor to open a queue by name for SEND and
+     * RECEIVE operations.</p>
+     *
+     * <p>Here's an example of how to use it, to send a simple message:</p>
+     *
+     * <blockquote class='code'><pre>
+     *   Queue queue= new Queue(fullname);
+     *   String body = "Hello, World!";
+     *   String label = "Greeting";
+     *   String correlationId= "L:none";
+     *   Message msg= new Message(body, label, correlationId);
+     *   queue.send(msg);
+     * </pre></blockquote>
+     *
+     **/
+    public Queue(String queueName)
+        throws  MessageQueueException
+    {
+        _init(queueName, 0x03);  // open with both SEND and RECEIVE access
     }
 
-    void _init(String queueName, int access) throws MessageQueueException {
+
+    /**
+     * Call this constructor to open a queue with the specified access
+     *
+     **/
+    public Queue(String queueName, Queue.Access access)
+        throws  MessageQueueException
+    {
+        _init(queueName, access.getValue());
+    }
+
+
+    private void _init(String queueName, int access)
+        throws  MessageQueueException
+    {
         // the openQueue native method causes the _queueSlot to be set.
         int rc = 0;
         if (access == 0x01) // RECEIVE
         {
-            rc = nativeOpenQueueForReceive(queueName);
-        } else if (access == 0x02) // SEND
-        {
-            rc = nativeOpenQueueForSend(queueName);
-        } else if (access == 0x03) // SEND+RECEIVE
-        {
-            rc = nativeOpenQueue(queueName);
-        } else {
-            rc = 0xC00E0006; /* MQ_INVALID_PARAMETER */
+            rc= nativeOpenQueueForReceive(queueName);
         }
+        else if (access == 0x02) // SEND
+        {
+            rc= nativeOpenQueueForSend(queueName);
+        }
+        else if (access == 0x03) // SEND+RECEIVE
+        {
+            rc= nativeOpenQueue(queueName);
+        }
+        else { rc= 0xC00E0006; /* MQ_INVALID_PARAMETER */ }
 
-        if (rc != 0)
-            throw new MessageQueueException("Cannot open queue.", rc);
+        if (rc!=0) throw new  MessageQueueException("Cannot open queue.", rc);
 
-        _name = queueName;
-        _formatName = "unknown";
-        _label = "need to set this";
-        _isTransactional = false; // TODO: get actual value in "openQueue"
+        _name= queueName;
+        _formatName= "unknown";
+        _label= "need to set this";
+        _isTransactional= false; // TODO: get actual value in "openQueue"
     }
 
-    public static Queue create(String queuePath, String queueLabel, boolean isTransactional) throws MessageQueueException {
-        int rc = nativeCreateQueue(queuePath, queueLabel, (isTransactional) ? 1 : 0);
-        if (rc != 0)
-            throw new MessageQueueException("Cannot create queue.", rc);
-        // DIRECT=OS ? or DIRECT=TCP ?
-        String a1 = "OS";
-        char[] c = queuePath.toCharArray();
-        if ((c[0] >= '1') && (c[0] <= '9'))
-            a1 = "TCP"; // assume ip address
 
-        Queue q = new Queue("DIRECT=" + a1 + ":" + queuePath);
-        q._name = queuePath;
-        // q._formatName=queueFormatName;
-        q._label = queueLabel;
-        q._isTransactional = isTransactional;
+
+    /**
+     * <p>
+     * Create a queue by name, with the given queue label and transactional access.
+     * </p>
+     *
+     * <p>Example:</p>
+     *
+     * <blockquote class='code'><pre>
+     *   String fullname= ".\\private$\\" + qname;
+     *   String qLabel="Created by " + this.getClass().getName() + ".java";
+     *   boolean transactional= false;  // should the queue be transactional
+     *   queue= Queue.create(fullname, qLabel, transactional);
+     * </pre></blockquote>
+     **/
+    public static Queue create(String queuePath, String queueLabel, boolean isTransactional)
+        throws  MessageQueueException
+    {
+        int rc= nativeCreateQueue( queuePath,  queueLabel,  (isTransactional)?1:0);
+        if (rc!=0)
+            throw new  MessageQueueException("Cannot create queue.", rc);
+        // DIRECT=OS  ?  or DIRECT=TCP ?
+        String a1= "OS";
+        char[] c= queuePath.toCharArray();
+        if ((c[0]>='1')
+            && (c[0]<='9')) a1= "TCP"; // assume ip address
+
+        Queue q= new Queue("DIRECT=" + a1 + ":" + queuePath);
+        q._name= queuePath;
+        //    q._formatName=queueFormatName;
+        q._label=queueLabel;
+        q._isTransactional= isTransactional;
         return q;
     }
 
-    public static void delete(String queuePath) throws MessageQueueException {
-        int rc = nativeDeleteQueue(queuePath);
-        if (rc != 0)
-            throw new MessageQueueException("Cannot delete queue.", rc);
+
+    /**
+     * Delete a queue by the given name.
+     *
+     **/
+    public static void delete(String queuePath)
+        throws  MessageQueueException
+    {
+        int rc= nativeDeleteQueue( queuePath );
+        if (rc!=0)
+            throw new  MessageQueueException("Cannot delete queue.", rc);
     }
 
-    public void send(Message msg) throws MessageQueueException {
-        int rc = nativeSend(msg.getMessage(), msg.getMessage().length(), msg.getLabel(), msg.getCorrelationId(), msg
-                .getTransactionFlag());
-        if (rc != 0)
+
+    // -------------------------------------------------------
+    // Sending methods
+    // -------------------------------------------------------
+
+    /**
+     * Send a Message, with the given transaction type, and with the
+     * given setting for high priority.
+     **/
+    public void send(Message msg, boolean highPriority, TransactionType t)
+        throws  MessageQueueException
+    {
+        int rc= nativeSendBytes(msg.getBody(),
+                                msg.getLabel(),
+                                msg.getCorrelationId(),
+                                t.getValue(),
+                                highPriority
+                                );
+        if (rc!=0)
             throw new MessageQueueException("Cannot send.", rc);
     }
 
-    public void send(String s) throws MessageQueueException {
-        int rc = nativeSend(s, s.length(), "", // empty label
-                "", // empty correlationId
-                0 // outside any transaction
-        );
-        if (rc != 0)
+
+    /**
+     * Send a Message, with the given transaction type.
+     *
+     **/
+    public void send(Message msg, TransactionType t)
+        throws  MessageQueueException
+    {
+        send(msg, false, t);
+    }
+
+    /**
+     * Send a Message, with the given value for high priority.
+     *
+     **/
+    public void send(Message msg, boolean highPriority)
+        throws  MessageQueueException
+    {
+        send(msg, highPriority, TransactionType.None);
+    }
+
+
+    /**
+     * Send a Message on the queue.
+     *
+     **/
+    public void send(Message msg)
+        throws  MessageQueueException
+    {
+        send(msg, false, TransactionType.None);
+    }
+
+
+    /**
+     * Send a string as a Message, using UTF-8 encoding.
+     * The label used will be blank, and the correlationId
+     * will be null (none).
+     *
+     **/
+    public void send(String s)
+        throws  MessageQueueException, java.io.UnsupportedEncodingException
+
+    {
+        int rc= nativeSendBytes(s.getBytes("UTF-8"), // bytes of string
+                                "",                  // empty label
+                                null,                // empty correlationId
+                                0,                   // outside any transaction
+                                false                // false = not high priority
+                                );
+        if (rc!=0)
             throw new MessageQueueException("Cannot send.", rc);
     }
 
-    // TODO: add sendMessage() methods for other types: byte[]? object?
 
-    private ionic.Msmq.Message receiveEx(int timeout, int ReadOrPeek) throws MessageQueueException {
-        int rc = nativeReceive(128, timeout, ReadOrPeek);
+    /**
+     * Send a byte array as a Message.
+     * The label used will be blank, and the correlationId
+     * will be null (none).
+     *
+     **/
+    public void send(byte[] b)
+        throws  MessageQueueException
+    {
+        int rc= nativeSendBytes(b,
+                                "",                 // empty label
+                                null,                 // empty correlationId
+                                0,                  // outside any transaction
+                                false               // false = not high priority
+                                );
+        if (rc!=0)
+            throw new MessageQueueException("Cannot send.", rc);
+    }
 
-        if (rc != 0)
+
+    // -------------------------------------------------------
+    // Receiving methods
+    // -------------------------------------------------------
+    private ionic.Msmq.Message _internal_receive(int timeout, int ReadOrPeek)
+        throws  MessageQueueException
+    {
+        Message msg = new Message();
+
+        int rc = nativeReceiveBytes(msg, timeout, ReadOrPeek);
+        //int rc = nativeReceiveBytes(timeout, ReadOrPeek);
+
+        if (rc!=0)
             throw new MessageQueueException("Cannot receive.", rc);
 
-        return new Message(_lastMessageRetrieved_MessageString, _lastMessageRetrieved_MessageLabel,
-                _lastMessageRetrieved_CorrelationId, 0);
-
+        return msg;
     }
 
-    public ionic.Msmq.Message receive(int timeout) throws MessageQueueException {
-        return receiveEx(timeout, 1);
+    /**
+     * Poll the queue to receive one message, with the given timeout.
+     *
+     * <p>
+     *
+     * If the timeout expires before a message becomes available,
+     * the method will throw an exception.
+     **/
+    public ionic.Msmq.Message receive(int timeout)
+        throws  MessageQueueException
+    {
+        return _internal_receive(timeout, 1);
     }
 
-    public ionic.Msmq.Message receive() throws MessageQueueException {
-        return receiveEx(0, 1); // infinite timeout
+
+    /**
+     * Poll the queue to receive one message, with an infinite timeout.
+     *
+     **/
+    public ionic.Msmq.Message receive()
+        throws  MessageQueueException
+    {
+        return _internal_receive(0,1); // infinite timeout
     }
 
-    public ionic.Msmq.Message peek() throws MessageQueueException {
-        return receiveEx(0, 0); // infinite timeout
+    /**
+     * Peek at the queue and return a message without dequeueing it.
+     *
+     **/
+    public ionic.Msmq.Message peek()
+        throws  MessageQueueException
+    {
+        return _internal_receive(0,0); // infinite timeout
     }
 
-    public ionic.Msmq.Message peek(int timeout) throws MessageQueueException {
-        return receiveEx(timeout, 0);
+    /**
+     * Peek at the queue and return a message without dequeueing it,
+     *
+     * <p>
+     *
+     * If the timeout expires before a message becomes available,
+     * the method will throw an exception.
+     **/
+    public ionic.Msmq.Message peek(int timeout)
+        throws  MessageQueueException
+    {
+        return _internal_receive(timeout,0);
     }
 
-    public void close() throws MessageQueueException {
 
-        int rc = nativeClose();
-        if (rc != 0)
+
+
+    /**
+     * Close the queue.
+     *
+     **/
+    public void close()
+        throws  MessageQueueException
+    {
+
+        int rc=nativeClose();
+        if (rc!=0)
             throw new MessageQueueException("Cannot close.", rc);
     }
 
+
+
     // --------------------------------------------
     // getters on the Queue properties
-    public String getName() {
-        return _name;
-    }
 
-    public String getLabel() {
-        return _label;
-    }
 
-    public String getFormatName() {
-        return _formatName;
-    }
+    /**
+     * Gets the name of the queue.
+     *
+     * @return the name of the queue.
+     */
+    public String getName(){ return _name; }
+
+
+    /**
+     * Gets the label on the queue.
+     *
+     * @return the label on the queue.
+     */
+    public String getLabel(){ return _label; }
+
+
+    /**
+     * Gets the formatname on the queue.
+     *
+     * @return the formatname of the queue.
+     */
+    public String getFormatName(){ return _formatName; }
+
+
+    /**
+     * Gets the transactional setting for the queue.
+     *
+     * @return the transactional setting for the queue.
+     */
+    public boolean isTransactional(){ return _isTransactional; }
+
 
-    public boolean isTransactional() {
-        return _isTransactional;
-    }
 
     // --------------------------------------------
     // native methods
     private static native int nativeInit();
-
     private static native int nativeCreateQueue(String queuePath, String queueLabel, int isTransactional);
-
     private static native int nativeDeleteQueue(String queuePath);
-
     private native int nativeOpenQueue(String queueString);
-
     private native int nativeOpenQueueForSend(String queueString);
-
     private native int nativeOpenQueueForReceive(String queueString);
-
-    private native int nativeReceive(int length, int timeout, int ReadOrPeek);
-
-    private native int nativeSend(String messageString, int length, String label, String correlationString, int transactionFlag);
-
+    private native int nativeSend(String messageString, int length, String label, String correlationId, int transactionFlag);
+    //private native int nativeReceiveBytes(int timeout, int ReadOrPeek);
+    private native int nativeReceiveBytes(Message msg, int timeout, int ReadOrPeek);
+    private native int nativeSendBytes(byte [] messageBytes, String label, byte[] correlationId, int tflag, boolean priority );
     private native int nativeClose();
 
+
     // --------------------------------------------
     // private members
-    int _queueSlot = 0;
-
+    int   _queueSlot = 0;
     String _name;
-
     String _formatName;
-
     String _label;
-
     boolean _isTransactional;
 
-    String _lastMessageRetrieved_MessageString;
-
-    String _lastMessageRetrieved_MessageLabel;
-
-    String _lastMessageRetrieved_CorrelationId;
-
     // --------------------------------------------
     // static initializer
     static {
-        // System.loadLibrary("JNIMSMQ");
-        loadLib();
+        //System.loadLibrary("MsmqJava");
+    	loadLib();
         nativeInit();
     }
-
+    
     /* Try extracting and loading library from jar */
-
+    
     private static void loadLib() {
-        String dllName = "JNIMSMQ.dll";
+        String dllName = "MsmqJava.dll";
         String TMP_HOME = System.getProperty("java.io.tmpdir");
         // TMP_HOME = "d:";
         String SEPARATOR = System.getProperty("file.separator");

org.talend.designer.components.libs/libs_src/msmq/ionic/Msmq/TransactionType.java

@@ -0,0 +1,93 @@
+//
+// TransactionType.java
+// ------------------------------------------------------------------
+//
+// Copyright (c) 2006-2010 Dino Chiesa.
+// All rights reserved.
+//
+// This code module is part of MsmqJava, a JNI library that provides
+// access to MSMQ for Java on Windows.
+//
+// ------------------------------------------------------------------
+//
+// This code is licensed under the Microsoft Public License.
+// See the file License.txt for the license details.
+// More info on: http://dotnetzip.codeplex.com
+//
+// ------------------------------------------------------------------
+//
+// last saved (in emacs):
+// Time-stamp: <2010-March-28 15:43:23>
+//
+// ------------------------------------------------------------------
+//
+// This module provides the various transaction types for MQ.
+//
+// ------------------------------------------------------------------
+
+package ionic.Msmq;
+
+/**
+ * Specifies the transaction type to use when enqueuing messages into a
+ * transactional queue.
+ *
+ */
+
+public enum TransactionType {
+
+    // transactionFlag:
+    //     MQ_NO_TRANSACTION,
+    //     MQ_MTS_TRANSACTION,
+    //     MQ_XA_TRANSACTION, or
+    //     MQ_SINGLE_MESSAGE
+    // see mq.h for details...
+
+
+    /**
+     * <p>Specifies that the call is not part of a transaction. This
+     * transaction type cannot be used to send a message to a transactional
+     * queue.</p>
+     *
+     * <p>Equivalent to MSMQ's MQ_NO_TRANSACTION.</p>
+     *
+     */
+    None(0),
+
+    /**
+     * <p>If the application is
+     * running in the context of a COM+ (Component Services)
+     * transaction, the message is sent within the current COM+
+     * transaction. Otherwise, the message is sent outside of a
+     * transaction.</p>
+     *
+     * <p>Equivalent to MSMQ's MQ_MTS_TRANSACTION.</p>
+     *
+     */
+        MTS(1),
+
+    /**
+     * Specifies that the call is part of an externally coordinated,
+     * XA-compliant transaction.
+     *
+     */
+        XA(2),
+
+    /**
+     * Specifies that the message is sent in a single-message
+     * transaction. Messages sent in a single-message transaction must
+     * be sent to a transactional queue.
+     *
+     * <p>Equivalent to MSMQ's MQ_SINGLE_MESSAGE.</p>
+     *
+     */
+        SINGLE_MESSAGE(3);
+
+    int _transactionFlag;
+
+    TransactionType(int value)
+    {
+        _transactionFlag = value;
+    }
+
+    public int getValue()   { return _transactionFlag; }
+}

org.talend.designer.components.libs/libs_src/msmq/org/talend/msmq/CharacterSetToolkit.java

@@ -1,170 +0,0 @@
-package org.talend.msmq;
- 
-public class CharacterSetToolkit {
-	public static void main(String[] args) 
-	{
-		String str = "abc";
-		str = toUnicode(str, false);
-		System.out.println(str);
-		str ="\u4F60\u597D";
-		str = fromUnicode(str);
-		System.out.println(str);
-	}
-    
-     public CharacterSetToolkit() {
-     }
-    
-     private static final char[] hexDigit = {
-         '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'
-     };
-    
-     private static char toHex(int nibble) {
-         return hexDigit[(nibble & 0xF)];
-     }
-    
-     /*
-      * Converts unicodes to encoded \uxxxx and escapes
-      * special characters with a preceding slash
-      */
-     public static String toUnicode(String theString, boolean escapeSpace) {
-         int len = theString.length();
-         int bufLen = len * 2;
-         if (bufLen < 0) {
-             bufLen = Integer.MAX_VALUE;
-         }
-         StringBuffer outBuffer = new StringBuffer(bufLen);
-
-         for(int x=0; x<len; x++) {
-             char aChar = theString.charAt(x);
-             // Handle common case first, selecting largest block that
-             // avoids the specials below
-             if ((aChar > 61) && (aChar < 127)) {
-                 if (aChar == '\\') {
-                     outBuffer.append('\\'); outBuffer.append('\\');
-                     continue;
-                 }
-                 outBuffer.append(aChar);
-                 continue;
-             }
-             switch(aChar) {
-                 case ' ':
-                     if (x == 0 || escapeSpace)
-                         outBuffer.append('\\');
-                     outBuffer.append(' ');
-                     break;
-                 case '\t':outBuffer.append('\\'); outBuffer.append('t');
-                           break;
-                 case '\n':outBuffer.append('\\'); outBuffer.append('n');
-                           break;
-                 case '\r':outBuffer.append('\\'); outBuffer.append('r');
-                           break;
-                 case '\f':outBuffer.append('\\'); outBuffer.append('f');
-                           break;
-                 case '=': // Fall through
-                 case ':': // Fall through
-                 case '#': // Fall through
-                 case '!':
-                     outBuffer.append('\\'); outBuffer.append(aChar);
-                     break;
-                 default:
-                     if ((aChar < 0x0020) || (aChar > 0x007e)) {
-                         outBuffer.append('\\');
-                         outBuffer.append('u');
-                         outBuffer.append(toHex((aChar >> 12) & 0xF));
-                         outBuffer.append(toHex((aChar >>   8) & 0xF));
-                         outBuffer.append(toHex((aChar >>   4) & 0xF));
-                         outBuffer.append(toHex( aChar         & 0xF));
-                     } else {
-                         outBuffer.append(aChar);
-                     }
-             }
-         }
-         return outBuffer.toString();
-     }
-     
-     public static String fromUnicode(String str) {
-         return fromUnicode(str.toCharArray(), 0, str.length(), new char[1024]);
-     }
-     /*
-      * Converts encoded &#92;uxxxx to unicode chars
-      * and changes special saved chars to their original forms
-      */
-     public static String fromUnicode(char[] in, int off, int len, char[] convtBuf) {
-         if (convtBuf.length < len) {
-             int newLen = len * 2;
-             if (newLen < 0) {
-                 newLen = Integer.MAX_VALUE;
-             }
-             convtBuf = new char[newLen];
-         }
-         char aChar;
-         char[] out = convtBuf;
-         int outLen = 0;
-         int end = off + len;
-
-         while (off < end) {
-             aChar = in[off++];
-             if (aChar == '\\') {
-                 aChar = in[off++];
-                 if (aChar == 'u') {
-                     // Read the xxxx
-                     int value = 0;
-                     for (int i = 0; i < 4; i++) {
-                         aChar = in[off++];
-                         switch (aChar) {
-                         case '0':
-                         case '1':
-                         case '2':
-                         case '3':
-                         case '4':
-                         case '5':
-                         case '6':
-                         case '7':
-                         case '8':
-                         case '9':
-                             value = (value << 4) + aChar - '0';
-                             break;
-                         case 'a':
-                         case 'b':
-                         case 'c':
-                         case 'd':
-                         case 'e':
-                         case 'f':
-                             value = (value << 4) + 10 + aChar - 'a';
-                             break;
-                         case 'A':
-                         case 'B':
-                         case 'C':
-                         case 'D':
-                         case 'E':
-                         case 'F':
-                             value = (value << 4) + 10 + aChar - 'A';
-                             break;
-                         default:
-                             throw new IllegalArgumentException(
-                                     "Malformed \\uxxxx encoding.");
-                         }
-                     }
-                     out[outLen++] = (char) value;
-                 } else {
-                     if (aChar == 't') {
-                         aChar = '\t';
-                     } else if (aChar == 'r') {
-                         aChar = '\r';
-                     } else if (aChar == 'n') {
-                         aChar = '\n';
-                     } else if (aChar == 'f') {
-                         aChar = '\f';
-                     }
-                     out[outLen++] = aChar;
-                 }
-             } else {
-                 out[outLen++] = (char) aChar;
-             }
-         }
-         return new String(out, 0, outLen);
-     }
-
-	 
-
-}

org.talend.designer.components.libs/libs_src/msmq/org/talend/msmq/MsmqUtil.java

@@ -1,8 +1,11 @@
 package org.talend.msmq;
 
+import java.io.UnsupportedEncodingException;
+
 import ionic.Msmq.Message;
 import ionic.Msmq.MessageQueueException;
 import ionic.Msmq.Queue;
+import ionic.Msmq.TransactionType;
 
 public class MsmqUtil {
 
@@ -35,7 +38,7 @@ public class MsmqUtil {
         msgu.setQueue("ytao4");
         msgu.createIfNotExists(true);
         msgu.open();
-        String str = "ÊǵÄabc";
+        String str = "<EFBFBD>ǵ<EFBFBD>abc";
         // str = CharacterSetToolkit.toUnicode(str, true);
         // System.out.println(str);
         msgu.setMsg(str);
@@ -54,11 +57,13 @@ public class MsmqUtil {
             checkOpen();
             System.out.println("peek");
             Message msg = msmqHandle.peek(2000); // timeout= 2000 ms
-            System.out.println(" ==> message: " + msg.getMessage());
+            System.out.println(" ==> message: " + msg.getBodyAsString());
             System.out.println("     label:   " + msg.getLabel());
         } catch (MessageQueueException ex1) {
             System.out.println("Peek failure: " + ex1);
-        }
+        } catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
     }
 
     // close an open queue
@@ -109,11 +114,13 @@ public class MsmqUtil {
             int transactionFlag = 0; // 0 = NO TRANSACTION, 1= MTS, 2= XA, 3= SINGLE_MESSAGE
             String mLabel = "inserted by " + this.getClass().getName() + ".java";
             String correlationID = "L:none";
-            Message msg = new Message(msgContent, mLabel, correlationID, transactionFlag);
+            Message msg = new Message(msgContent, mLabel, correlationID);
             msmqHandle.send(msg);
         } catch (MessageQueueException ex1) {
             System.out.println("Send failure: " + ex1);
-        }
+        } catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
     }
 
     public String receive() {
@@ -123,10 +130,12 @@ public class MsmqUtil {
             Message msg = msmqHandle.receive(2000); // timeout= 2000 ms
             // System.out.println(" ==> message: " + msg.getMessage());
             // System.out.println("     label:   " + msg.getLabel());
-            return CharacterSetToolkit.fromUnicode(msg.getMessage());
+            return msg.getBodyAsString();
         } catch (MessageQueueException ex1) {
             System.out.println("Receive failure: " + ex1);
-        }
+        } catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
         return null;
     }
 
@@ -175,7 +184,7 @@ public class MsmqUtil {
     }
 
     public void setMsg(String msg) {
-        this.msgContent = CharacterSetToolkit.toUnicode(msg, true);
+        this.msgContent = msg;
     }
 
     public void createIfNotExists(boolean bool) {

org.talend.designer.components.libs/libs_src/salesforceBulkAPI/org/talend/salesforceBulk/SalesforceBulkAPI.java

@@ -6,7 +6,9 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.Authenticator; 
 import java.net.InetSocketAddress;
+import java.net.PasswordAuthentication; 
 import java.net.Proxy;
 import java.net.SocketAddress;
 import java.util.ArrayList;
@@ -143,22 +145,30 @@ public class SalesforceBulkAPI {
     private void setProxyToConnection(ConnectorConfig conn) {
         Proxy socketProxy = null;
         if (!useProxy) {
-            proxyHost = System.getProperty("http.proxyHost");
-            if (proxyHost != null && System.getProperty("http.proxyPort") != null) {
-                proxyPort = Integer.parseInt(System.getProperty("http.proxyPort"));
-                proxyUsername = System.getProperty("http.proxyUser");
-                proxyPassword = System.getProperty("http.proxyPassword");
+            proxyHost = System.getProperty("https.proxyHost");
+            if (proxyHost != null && System.getProperty("https.proxyPort") != null) {
+                proxyPort = Integer.parseInt(System.getProperty("https.proxyPort"));
+                proxyUsername = System.getProperty("https.proxyUser");
+                proxyPassword = System.getProperty("https.proxyPassword");
                 useProxy = true;
             } else {
-                proxyHost = System.getProperty("socksProxyHost");
-                if (proxyHost != null && System.getProperty("socksProxyPort") != null) {
-                    proxyPort = Integer.parseInt(System.getProperty("socksProxyPort"));
-                    proxyUsername = System.getProperty("java.net.socks.username");
-                    proxyPassword = System.getProperty("java.net.socks.password");
+                proxyHost = System.getProperty("http.proxyHost");
+                if (proxyHost != null && System.getProperty("http.proxyPort") != null) {
+                    proxyPort = Integer.parseInt(System.getProperty("http.proxyPort"));
+                    proxyUsername = System.getProperty("http.proxyUser");
+                    proxyPassword = System.getProperty("http.proxyPassword");
                     useProxy = true;
+                } else {
+                    proxyHost = System.getProperty("socksProxyHost");
+                    if (proxyHost != null && System.getProperty("socksProxyPort") != null) {
+                        proxyPort = Integer.parseInt(System.getProperty("socksProxyPort"));
+                        proxyUsername = System.getProperty("java.net.socks.username");
+                        proxyPassword = System.getProperty("java.net.socks.password");
+                        useProxy = true;
 
-                    SocketAddress addr = new InetSocketAddress(proxyHost, proxyPort);
-                    socketProxy = new Proxy(Proxy.Type.SOCKS, addr);
+                        SocketAddress addr = new InetSocketAddress(proxyHost, proxyPort);
+                        socketProxy = new Proxy(Proxy.Type.SOCKS, addr);
+                    }
                 }
             }
         }
@@ -170,9 +180,22 @@ public class SalesforceBulkAPI {
             }
             if (proxyUsername != null && !"".equals(proxyUsername)) {
                 conn.setProxyUsername(proxyUsername);
-            }
-            if (proxyPassword != null && !"".equals(proxyPassword)) {
-                conn.setProxyPassword(proxyPassword);
+                if (proxyPassword != null && !"".equals(proxyPassword)) {
+                    conn.setProxyPassword(proxyPassword);
+
+                    Authenticator.setDefault(new Authenticator() {
+
+                        @Override
+                        public PasswordAuthentication getPasswordAuthentication() {
+                            if (getRequestorType() == Authenticator.RequestorType.PROXY) {
+                                return new PasswordAuthentication(proxyUsername, proxyPassword.toCharArray());
+                            } else {
+                                return super.getPasswordAuthentication();
+                            }
+                        }
+                    });
+
+                }
             }
         }
     }
@@ -220,6 +243,22 @@ public class SalesforceBulkAPI {
         // System.out.println(job);
         return job;
     }
+    
+    private int countQuotes(String value){
+        if (value == null || "".equals(value)) {
+            return 0;
+        } else {
+            char c = '\"';
+            int num = 0;
+            char[] chars = value.toCharArray();
+            for (int i = 0; i < chars.length; i++) {
+                if (c == chars[i]) {
+                    num++;
+                }
+            }
+            return num;
+        }
+    }
 
     private List<BatchInfo> createBatchesFromCSVFile() throws IOException, AsyncApiException {
         List<BatchInfo> batchInfos = new ArrayList<BatchInfo>();
@@ -234,7 +273,25 @@ public class SalesforceBulkAPI {
             int currentBytes = 0;
             int currentLines = 0;
             String nextLine;
+            boolean needStart=true;
+            boolean needEnds=true;
             while ((nextLine = rdr.readLine()) != null) {
+                int num=countQuotes(nextLine);
+                //nextLine is header or footer of the record
+                if (num % 2 == 1) {
+                    if (!needStart) {
+                        needEnds = false;
+                    } else {
+                        needStart = false;
+                    }
+                } else {
+                //nextLine is a whole record or middle of the record
+                    if (needEnds && needStart) {
+                        needEnds = false;
+                        needStart = false;
+                    }
+                }
+                
                 byte[] bytes = (nextLine + "\n").getBytes("UTF-8");
 
                 // Create a new batch when our batch size limit is reached
@@ -251,7 +308,11 @@ public class SalesforceBulkAPI {
                 }
                 tmpOut.write(bytes);
                 currentBytes += bytes.length;
-                currentLines++;
+                if(!needStart && !needEnds){
+                    currentLines++;
+                    needStart=true;
+                    needEnds=true;
+                }
             }
             // Finished processing all rows
             // Create a final batch for any remaining data

org.talend.designer.components.libs/libs_src/talend-marketo/com/marketo/www/mktows/MktowsApiSoapBindingStub.java

@@ -1412,8 +1412,7 @@ public class MktowsApiSoapBindingStub extends org.apache.axis.client.Stub implem
     public void addMarketoAuthenticatioNHeader(org.apache.axis.client.Call _call) throws Exception {
         // Request timestamp: a timestamp string in W3C WSDL date format
 
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
-        String requestTimestamp = df.format(Calendar.getInstance().getTime());
+        String requestTimestamp = formatAsW3C(Calendar.getInstance().getTime());
         // System.out.println(requestTimestamp);
 
         String stringToEncrypt = requestTimestamp + clientAccessID;
@@ -1435,6 +1434,13 @@ public class MktowsApiSoapBindingStub extends org.apache.axis.client.Stub implem
         // System.out.println(authenticationHeader.getAsString());
         _call.addHeader(authenticationHeader);
     }
+    
+    public String formatAsW3C(java.util.Date dt) {
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
+        String text = df.format(dt);
+        String w3cValue = text.substring(0, 22) + ":" + text.substring(22);
+        return w3cValue;
+    }
 
     public com.marketo.www.mktows.SuccessGetLeadActivity getLeadActivity(com.marketo.www.mktows.ParamsGetLeadActivity paramsGetLeadActivity) throws java.rmi.RemoteException {
         if (super.cachedEndpoint == null) {

org.talend.designer.components.libs/libs_src/talendExcel/build.xml

@@ -15,7 +15,7 @@
 		<pathelement location="${component.plugin.home}/tFileInputXML/dom4j-1.6.1.jar" />
 		<pathelement location="${component.plugin.home}/tMicrosoftCrmInput/geronimo-stax-api_1.0_spec-1.0.jar" />
 		<pathelement location="${component.plugin.home}/tFileInputExcel/log4j-1.2.15.jar" />
-		<pathelement location="${component.plugin.home}/tFileInputExcel/poi-3.8-20120326.jar" />
+		<pathelement location="${component.plugin.home}/tFileInputExcel/poi-3.8-20120913_modified_talend.jar" />
 		<pathelement location="${component.plugin.home}/tFileInputExcel/poi-ooxml-3.8-20120326.jar" />
 		<pathelement location="${component.plugin.home}/tFileInputExcel/poi-ooxml-schemas-3.8-20120326.jar" />
 		<pathelement location="${component.plugin.home}/tFileInputExcel/poi-scratchpad-3.8-20120326.jar" />

org.talend.designer.components.libs/libs_src/talendExcel/org/talend/ExcelTool.java

@@ -104,7 +104,9 @@ public class ExcelTool {
 				sheet = wb.getSheet(sheetName);
 				if (sheet != null) {
 					if (appendSheet) {
-						curY = sheet.getLastRowNum() + 1;
+					    if(sheet.getLastRowNum()!=0 || sheet.getRow(0)!=null){
+							curY = sheet.getLastRowNum() + 1;
+						}
 					} else {
 						wb.removeSheetAt(wb.getSheetIndex(sheetName));
 						sheet = wb.createSheet(sheetName);
@@ -219,14 +221,15 @@ public class ExcelTool {
 
 	private CellStyle getPreCellStyle() {
 		if (isAbsY && keepCellFormat) {
+			CellStyle preCellStyle =null;
 			if (preCell == null) {
-				return null;
+				preCellStyle = preSheet.getColumnStyle(curCell.getColumnIndex());
 			} else {
-				CellStyle preCellStyle = preCell.getCellStyle();
-				CellStyle targetCellStyle = wb.createCellStyle();
-				targetCellStyle.cloneStyleFrom(preCellStyle);
-				return targetCellStyle;
+				preCellStyle = preCell.getCellStyle();
 			}
+			CellStyle targetCellStyle = wb.createCellStyle();
+			targetCellStyle.cloneStyleFrom(preCellStyle);
+			return targetCellStyle;
 		} else {
 			return null;
 		}

org.talend.designer.components.libs/libs_src/talend_DB_mssqlUtil/build.xml

@@ -12,6 +12,7 @@
 	
 	<!-- modification 2: compile classpath -->
 	<path id="compile.classpath">
+		<pathelement location="${component.plugin.home}/tMSSqlInput/jtds-1.2.5.jar" />
 	</path>
 
 	<!-- #################################################### -->	

org.talend.designer.components.libs/libs_src/talend_DB_mssqlUtil/net/sourceforge/jtds/jdbc/TalendNTextImpl.java

@@ -0,0 +1,46 @@
+package net.sourceforge.jtds.jdbc;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+import net.sourceforge.jtds.util.BlobBuffer;
+
+public class TalendNTextImpl {
+
+    ClobImpl clobImpl;
+
+    public TalendNTextImpl(ClobImpl clobImpl) {
+        this.clobImpl = clobImpl;
+    }
+
+    public String getValue() throws SQLException, IOException {
+        BlobBuffer blobBuffer = clobImpl.getBlobBuffer();
+        int length = Integer.parseInt(String.valueOf(blobBuffer.getLength()));
+        byte[] b = blobBuffer.getBytes(1L, length);
+        return readUnicodeString(b, length / 2);
+    }
+
+    /**
+     * Reads a UCS2-LE (Unicode) encoded String object from the server response stream.
+     * 
+     * @param buffer the content of the string to read
+     * @param len the length of the string to read <b>in characters</b>
+     * @return the result as a <code>String</code>
+     * @throws IOException if an I/O error occurs
+     */
+    public static String readUnicodeString(byte[] buffer, int len) throws IOException {
+        char[] chars = new char[len];
+        int bufferPos = 0;
+
+        for (int i = 0; i < len; i++) {
+
+            int b1 = buffer[bufferPos++] & 0xFF;
+
+            int b2 = buffer[bufferPos++] << 8;
+
+            chars[i] = (char) (b2 | b1);
+        }
+
+        return new String(chars, 0, len);
+    }
+}

org.talend.designer.components.libs/libs_src/talend_DB_mssqlUtil/org/talend/designer/components/util/mssql/MSSqlGenerateTimestampUtil.java

@@ -104,13 +104,25 @@ public class MSSqlGenerateTimestampUtil {
         return null;
     }
     
+    /**
+     * parse datetimeoffset string to date.
+     * datetimeoffset string show as YYYY-MM-DD hh:mm:ss[.nnnnnnn] [+|-]hh:mm
+     * and no enough infomation for the DST decision,so no DST consider.
+     * @param datetimeOffsetString
+     * @return
+     */
     private java.util.Date parseDatetimeOffset(String datetimeOffsetString) {
     	int idx = datetimeOffsetString.lastIndexOf(' ');
 		String datetimeString = datetimeOffsetString.substring(0,idx);
 		String offsetString = datetimeOffsetString.substring(idx+1);
 		int offset = TimeZone.getTimeZone("GMT"+offsetString).getRawOffset();
+
+		//local timezone
+		TimeZone local = TimeZone.getDefault();
+		int localOffset = local.getRawOffset();
+		
 		long milliseconds = java.sql.Timestamp.valueOf(datetimeString).getTime();
-		long millisecondsToGMT1970_01_01 = milliseconds - offset;
+		long millisecondsToGMT1970_01_01 = milliseconds - offset + localOffset;
 		return new java.util.Date(millisecondsToGMT1970_01_01);
     }
     

org.talend.designer.components.libs/libs_src/thashfile/org/talend/designer/components/hashfile/common/MapHashFile.java

@@ -3,6 +3,8 @@ package org.talend.designer.components.hashfile.common;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.Iterator;
 import org.talend.designer.components.hashfile.memory.AdvancedMemoryHashFile;
 
 public class MapHashFile {
@@ -24,7 +26,8 @@ public class MapHashFile {
 		AdvancedMemoryHashFile amhf = resourceMap.get(key);
 		String prekey = keyMap.get(key);
 		//if present AdvancedMemoryHashFile is null get the AdvancedMemoryHashFile before present.
-		while(amhf==null){
+		int size = keyMap.size();
+		while(amhf==null && (size--)>0){
 			amhf = resourceMap.get(prekey);
 			prekey = keyMap.get(prekey);
 		}
@@ -38,4 +41,29 @@ public class MapHashFile {
 	public Map<String, String> getKeyMap() {
 		return keyMap;
 	}
+	public void clearCache(String key){
+		clearChildCache(getRootCache(key));
+	}
+	public void clearChildCache(String root){
+		Set<String> set = keyMap.keySet();
+		synchronized(keyMap) {
+			Iterator<String> it = set.iterator();
+			while(it.hasNext()){
+				String key = it.next();
+				if(keyMap.get(key).equals(root)){
+					this.resourceMap.remove(key);
+					clearChildCache(key);
+				}
+			}
+		}
+		this.resourceMap.remove(root);
+	}
+	
+	public String getRootCache(String cache){
+		String root;
+		while((root = keyMap.get(cache))!=null){
+			cache=root;
+		}
+		return cache;
+	}
 }

org.talend.designer.components.libs/libs_src/thashfile/org/talend/designer/components/hashfile/memory/AdvancedMemoryHashFile.java

@@ -12,6 +12,7 @@
 // ============================================================================
 package org.talend.designer.components.hashfile.memory;
 
+import java.util.Collections;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -34,9 +35,9 @@ public class AdvancedMemoryHashFile<V> {
     public AdvancedMemoryHashFile(MATCHING_MODE matchingMode) {
         this.matchingMode = matchingMode;
         if (matchingMode == MATCHING_MODE.KEEP_ALL) {
-            allList = new ArrayList<V>();
+            allList = Collections.synchronizedList(new ArrayList<V>());
         } else if (matchingMode == MATCHING_MODE.KEEP_FIRST) {
-            firstHash = new HashMap<V, V>();
+            firstHash = Collections.synchronizedMap(new HashMap<V, V>());
         }
     }
 

org.talend.designer.components.localprovider/build_tos_bd.properties

@@ -45,7 +45,6 @@ bin.excludes = components/tBonitaDeploy/,\
                components/tInformixInput/ifxjdbc.jar,\
                components/tIngresConnection/iijdbc.jar,\
                components/tJMSInput/jms.jar,\
-               components/tMSSqlInput/sqljdbc.jar,\
                components/tSybaseInput/jconn3.jar,\
                components/tVerticaInput/vertica_4.1.7_jdk_5.jar,\
                components/tWriteJSONFieldIn/xom-1.2.7.jar,\
@@ -65,7 +64,7 @@ bin.excludes = components/tBonitaDeploy/,\
                components/tMicrosoftMQInput/msmq.jar,\
                components/tMysqlInput/mysql-connector-java-3.1.14-bin.jar,\
                components/tAmazonMysqlInput/mysql-connector-java-5.1.0-bin.jar,\
-               components/tAmazonMysqlInput/mysql-connector-java-5.1.0-bin.jar,\
+               components/tAmazonMysqlInput/mysql-connector-java-5.1.22-bin.jar,\
                components/tGreenplumGPLoad/namedpipe_jni.dll,\
                components/tNamedPipeOutput/namedpipe_jni.dll,\
                components/tNetezzaNzLoad/namedpipe_jni.dll,\
@@ -80,7 +79,6 @@ bin.excludes = components/tBonitaDeploy/,\
                components/tAmazonOracleInput/ojdbc5-11g.jar,\
                components/tOracleInput/ojdbc6-11g.jar,\
                components/tParAccelInput/paraccel-jdbc.jar,\
-               components/tSalesforceBulkExec/partnerBulk.jar,\
                components/tMaxDBInput/sapdbc.jar,\
                components/tXSLT/saxon9.jar,\
                components/tTeradataInput/tdgssconfig.jar,\

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

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

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

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

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

@@ -1,4 +1,3 @@
-DBNAME.NAME=Database
 ENCODING.NAME=Encoding
 HELP=org.talend.help.tAS400Connection
 HOST.NAME=Host

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

@@ -1,4 +1,3 @@
-DBNAME.NAME=Base de données
 ENCODING.NAME=Encodage
 HELP=org.talend.help.tAS400Connection
 HOST.NAME=Hôte

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

@@ -1,2 +1,4 @@
 PASS.NAME=Wachtwoord
 USER.NAME=Gebruikersnaam
+DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4
+DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1

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

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

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

@@ -1,4 +1,3 @@
-DBNAME.NAME=Database
 HELP=org.talend.help.tAS400Input
 HOST.NAME=Host name
 LONG_NAME=Reads a table and extracts fields based on an SQL query

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

@@ -1,4 +1,3 @@
-DBNAME.NAME=Base de données
 HELP=org.talend.help.tAS400Input
 HOST.NAME=Nom du serveur
 LONG_NAME=Lit une table et extrait les champs à partir d'une requête SQL
@@ -16,7 +15,7 @@ TABLE.NAME=Nom de la table
 DB_VERSION.NAME=Version de la base de données
 DB_VERSION.ITEM.V5R2_V5R4=V5R2 à V5R4
 DB_VERSION.ITEM.V5R3_V6R1=V5R3 à V6R1
-GUESS_SCHEMA.NAME=Retrouver le schéma
+GUESS_SCHEMA.NAME=Détecter le schéma
 CONNECTION.NAME=Liste des composants
 PROPERTY.NAME=Type de propriété
 TYPE.NAME=Pilote de base de données

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

@@ -1,2 +1,4 @@
 PASS.NAME=Wachtwoord
 USER.NAME=Gebruikersnaam
+DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4
+DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1

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

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

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

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

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

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

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

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

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

@@ -24,7 +24,6 @@ DATA_ACTION.ITEM.INSERT_OR_UPDATE=Insert or update
 DATA_ACTION.ITEM.UPDATE=Update
 DATA_ACTION.ITEM.UPDATE_OR_INSERT=Update or insert
 DATA_ACTION.NAME=Action on data
-DBNAME.NAME=Database
 DIE_ON_ERROR.NAME=Die on error
 ENCODING.NAME=Encoding
 FIELD_OPTIONS.ITEM.DELETE_KEY=Deletion key

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

@@ -18,14 +18,13 @@ ADD_COLS.ITEM.SQL=Expression SQL
 ADD_COLS.NAME=Colonnes supplémentaires
 CLEAR_TABLE.NAME=Effacer les données dans la table
 COMMIT_EVERY.NAME=Commiter toutes les
-DATA_ACTION.ITEM.DELETE=Supprimer
+DATA_ACTION.ITEM.DELETE=DELETE
 DATA_ACTION.ITEM.INSERT=INSERT
 DATA_ACTION.ITEM.INSERT_OR_UPDATE=Insert ou update
 DATA_ACTION.ITEM.UPDATE=UPDATE
 DATA_ACTION.ITEM.UPDATE_OR_INSERT=Update ou insert
 DATA_ACTION.NAME=Action sur les données
-DBNAME.NAME=Base de données
-DIE_ON_ERROR.NAME=Terminer en cas d'erreur
+DIE_ON_ERROR.NAME=Arrêter en cas d'erreur
 ENCODING.NAME=Encodage
 FIELD_OPTIONS.ITEM.DELETE_KEY=Clé pour suppression
 FIELD_OPTIONS.ITEM.INSERTABLE=Insérable

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

@@ -1,12 +1,12 @@
 ADD_COLS.ITEM.DATATYPE=\u30C7\u30FC\u30BF\u578B
 ADD_COLS.ITEM.NAME=\u540D\u524D
 ADD_COLS.ITEM.OPERATOR=\u30AA\u30DA\u30EC\u30FC\u30BF
-ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=\=
+ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=\u2267
 ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=>\=
 ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=>=
 ADD_COLS.ITEM.OPERATOR.ITEM.IS=\=\=
 ADD_COLS.ITEM.OPERATOR.ITEM.IS_NOT=\!\=
-ADD_COLS.ITEM.OPERATOR.ITEM.LESS_EQUAL_THAN=<\=
+ADD_COLS.ITEM.OPERATOR.ITEM.LESS_EQUAL_THAN=<
 ADD_COLS.ITEM.OPERATOR.ITEM.LESS_THAN=<
 ADD_COLS.ITEM.OPERATOR.ITEM.NOT_EQUAL=<>
 ADD_COLS.ITEM.POS=\u30DD\u30B8\u30B7\u30E7\u30F3

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

@@ -1,2 +1,14 @@
+ADD_COLS.ITEM.NAME=Naam
+ADD_COLS.ITEM.OPERATOR.ITEM.EQUAL=Groter dan of gelijk aan
+ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_EQUAL_THAN=Groter dan of gelijk aan
+ADD_COLS.ITEM.OPERATOR.ITEM.GREAT_THAN=Groter dan of gelijk aan
+ADD_COLS.ITEM.OPERATOR.ITEM.IS=IS
+ADD_COLS.ITEM.OPERATOR.ITEM.LESS_THAN=Kleiner dan
+ADD_COLS.ITEM.OPERATOR.ITEM.NOT_EQUAL=<>
+COMMIT_EVERY.NAME=Commit iedere
+DATA_ACTION.ITEM.DELETE=Verwijderen
+DATA_ACTION.ITEM.UPDATE=Update
 PASS.NAME=Wachtwoord
 USER.NAME=Gebruikersnaam
+DB_VERSION.ITEM.V5R2_V5R4=V5R2 to V5R4
+DB_VERSION.ITEM.V5R3_V6R1=V5R3 to V6R1

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

@@ -6,6 +6,5 @@ ADD_COLS.ITEM.OPERATOR.ITEM.LESS_THAN=Manje od
 ADD_COLS.ITEM.OPERATOR.ITEM.NOT_EQUAL=<>
 ADD_COLS.ITEM.REFCOL=Referentna kolona
 ADD_COLS.ITEM.SQL=SQL izraz
-DATA_ACTION.ITEM.DELETE=DELETE
 DATA_ACTION.ITEM.INSERT=INSERT
 DATA_ACTION.ITEM.UPDATE=UPDATE

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

@@ -27,7 +27,7 @@ LONG_NAME=\u521B\u5EFA\u4E00\u4E2A\u6C38\u4E0D\u505C\u6B62\u7684\u5FAA\u73AF
 NB_LINE.NAME=\u884c\u6570
 PASS.NAME=\u5bc6\u7801
 QUERY.NAME=\u67e5\u8be2
-SCHEMA_FLOW.NAME=RowGenerator\u53C2\u6570\u8868
+SCHEMA_FLOW.NAME=\u67B6\u6784
 TABLE.NAME=\u8868
 TABLE_ACTION.ITEM.CLEAR=\u6E05\u9664\u8868\u4E2D\u6570\u636E
 TABLE_ACTION.ITEM.CREATE=\u521B\u5EFA\u8868

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

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