Merge release/5.1.1/tis_shared and release/5.1.1/tos for release/5.1.1.

git-svn-id: http://talendforge.org/svn/tis_shared/trunk@84297 f6f1c999-d317-4740-80b0-e6d1abc6f99e

org.talend.common.ui.runtime.nl/src/main/java/messages_de.properties

@@ -1,4 +1,3 @@
-AccessorUtils.Assert0=Der 'BeanPropertyAccessors' der Spalte (mit Überschrift '{0}' und id '{1}') ist nicht korrekt konfiguriert.  {2} wird benötigt für die Bean <B>
 AccessorUtils.Assert1=Der 'BeanPropertyAccessors' der Spalte (mit Überschrift '{0}' und id '{1}') ist nicht korrekt konfiguriert oder der konfigurierte Wert hat nicht den korrekten Typ.
 AccessorUtils.isReq=\ wird benötigt für die Bean (<B>).
 AddPushButton.AddButton.Tip=Hinzufügen

org.talend.common.ui.runtime.nl/src/main/java/messages_el.properties

@@ -1,4 +1,3 @@
-AccessorUtils.Assert0=\u03A4\u03BF 'BeanPropertyAccessors'  \u03C4\u03B7\u03C2 \u03C3\u03C4\u03AE\u03BB\u03B7\u03C2 (\u03BC\u03B5 \u03C4\u03AF\u03C4\u03BB\u03BF '{0}' \u03BA\u03B1\u03B9 \u03B4\u03B9\u03B1\u03BA\u03C1\u03B9\u03C4\u03B9\u03BA\u03CC '{1}') \u03B4\u03B5\u03BD \u03B5\u03AF\u03BD\u03B1\u03B9 \u03C0\u03B1\u03C1\u03B1\u03BC\u03B5\u03C4\u03C1\u03BF\u03C0\u03BF\u03B9\u03B7\u03BC\u03AD\u03BD\u03BF \u03C3\u03C9\u03C3\u03C4\u03AC. \u0391\u03C0\u03B1\u03B9\u03C4\u03B5\u03AF\u03C4\u03B1\u03B9 {2] \u03B3\u03B9\u03B1 \u03C4\u03BF bean <B> 
 AccessorUtils.Assert1=\u03A4\u03BF 'BeanPropertyAccessors'  \u03C4\u03B7\u03C2 \u03C3\u03C4\u03AE\u03BB\u03B7\u03C2 (\u03BC\u03B5 \u03C4\u03AF\u03C4\u03BB\u03BF '{0}' \u03BA\u03B1\u03B9 \u03B4\u03B9\u03B1\u03BA\u03C1\u03B9\u03C4\u03B9\u03BA\u03CC '{1}') \u03B4\u03B5\u03BD \u03B5\u03AF\u03BD\u03B1\u03B9 \u03C0\u03B1\u03C1\u03B1\u03BC\u03B5\u03C4\u03C1\u03BF\u03C0\u03BF\u03B9\u03B7\u03BC\u03AD\u03BD\u03BF \u03C3\u03C9\u03C3\u03C4\u03AC \u03AE \u03B7 \u03BF\u03C1\u03B9\u03C3\u03BC\u03AD\u03BD\u03B7 \u03C4\u03B9\u03BC\u03AE \u03B4\u03B5\u03BD \u03B5\u03AF\u03BD\u03B1\u03B9 \u03C4\u03BF\u03C5 \u03C3\u03C9\u03C3\u03C4\u03BF\u03CD \u03C4\u03CD\u03C0\u03BF\u03C5.
 AddPushButton.AddButton.Tip=\u03A0\u03C1\u03C3\u03B8\u03AE\u03BA\u03B7
 AddAllPushButton.AddAllButton.Tip=\u03A0\u03C1\u03BF\u03C3\u03B8\u03AE\u03BA\u03B7 \u038C\u03BB\u03C9\u03BD

org.talend.common.ui.runtime.nl/src/main/java/messages_en.properties

@@ -1,4 +1,3 @@
-AccessorUtils.Assert0=The 'BeanPropertyAccessors' of the column (with title '{0}' and id '{1}') is not configured correctly.  {2} is required for bean <B>
 AccessorUtils.Assert1=The 'BeanPropertyAccessors' of the column (with title '{0}' and id '{1}') is not configured correctly or the value set has not the correct type.
 AccessorUtils.NoClassDef=NoClassDefFoundError ({0})\:{1}
 AccessorUtils.isReq=\ is required for the bean (<B>).
@@ -124,3 +123,4 @@ ExceptionMessageDialog.Cancel=Cancel
 ExceptionMessageDialog.No=No
 ExceptionMessageDialog.OK=OK
 ExceptionMessageDialog.Yes=Yes
+AccessorUtils.Assert0=The 'BeanPropertyAccessors' of the column (with title '{0}' and id '{1}') is not configured correctly.  {2} is required for bean <B>

org.talend.common.ui.runtime.nl/src/main/java/messages_es.properties

@@ -1,4 +1,3 @@
-AccessorUtils.Assert0=La "PropiedadDeAcceso" de la columna (título '{0}' y clave '{1}') no esta correctamente configurada. {2} es requerido para bean <B>
 AccessorUtils.Assert1=La 'BeanPropertyAccesors' de la columna (con título '{0}' u Id '{0}' no está configurada correctamente o el valor puesto no tiene un tipo adecuado
 AccessorUtils.isReqValue=es requerido para el valor (<V>), pero éste podría ser adaptado con CellEditorValueAdapter.
 AddPushButton.AddButton.Tip=Agregue

org.talend.common.ui.runtime.nl/src/main/java/messages_fr.properties

@@ -1,4 +1,3 @@
-AccessorUtils.Assert0=L'attribut 'BeanPropertyAccessors' de la colonne (nommée '{0}' et ayant l'id '{1}') n'est pas configuré correctement. {2} est requis pour le bean 
 AccessorUtils.Assert1=L'attribut 'BeanPropertyAccessors' de la colonne (nommée'{0}' et ayant l'id '{1}') n'est pas configuré correctement ou le type de la valeur affectée n'est pas correct.
 AccessorUtils.isReq=\ est requis pour le bean (<B>).
 AddPushButton.AddButton.Tip=Add

org.talend.common.ui.runtime.nl/src/main/java/messages_hr.properties

@@ -1,4 +1,3 @@
-AccessorUtils.Assert0='BeanPropertyAccessors' za stupac (sa naslovom '{0}' i poljem id '{1}') nije ispravno konfiguriran. {2} potreban za bean <B>
 AccessorUtils.Assert1=BeanPropertyAccessors' za stupac (sa naslovom '{0}' i poljem id '{1}') nije ispravno konfiguriran ili set vrijednosti nije odgovaraju\u0107eg tipa.
 AddPushButton.AddButton.Tip=Dodaj
 AddAllPushButton.AddAllButton.Tip=Dodaj sve

org.talend.common.ui.runtime.nl/src/main/java/messages_it.properties

@@ -1,4 +1,3 @@
-AccessorUtils.Assert0=La caratteristica 'BeanPropertyAccessors' della colonna (con titolo'{0}' e id '{1}') non sono configurate correttamente. {2} è obbligatorio per il bean.
 AccessorUtils.Assert1=La caratteristica 'BeanPropertyAccessors' della colonna (titolo '{0}' e id '{1}') non è correttemente configurata o il tipo del valore non è corretto.
 AddPushButton.AddButton.Tip=Aggiungere
 AddAllPushButton.AddAllButton.Tip=Aggiungi tutto

org.talend.common.ui.runtime.nl/src/main/java/messages_ja.properties

@@ -1,4 +1,3 @@
-AccessorUtils.Assert0=\u3053\u306E\u30AB\u30E9\u30E0 (\u30BF\u30A4\u30C8\u30EB '{0}' \u3001id '{1}') \u306E BeanPropertyAccessors \u306F\u6B63\u3057\u304F\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002{2} \u306Fbean <B>\u3067\u8981\u6C42\u3055\u308C\u3066\u3044\u307E\u3059\u3002
 AccessorUtils.Assert1=\u3053\u306E\u30AB\u30E9\u30E0 (\u30BF\u30A4\u30C8\u30EB '{0}' \u3001id '{1}') \u306E BeanPropertyAccessors \u306F\u6B63\u3057\u304F\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u5024\u30BB\u30C3\u30C8\u306E\u578B\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093\u3002
 AccessorUtils.NoClassDef=NoClassDefFoundError({0}):{1}
 AccessorUtils.isReq=\u306Fbean (<B>) \u3067\u8981\u6C42\u3055\u308C\u307E\u3059\u3002

org.talend.common.ui.runtime.nl/src/main/java/messages_pt_BR.properties

@@ -1,4 +1,3 @@
-AccessorUtils.Assert0=O 'BeanPropertyAccessors' da coluna (com o título '{0}' e id '{1}') não está configurado corretamente. {2} é requerido para o bean<B>
 AccessorUtils.Assert1=O «BeanPropertyAccessors' da coluna (com o título '(0)' e id '(1)') não está configurado corretamente ou o valor definido não tem o tipo certo.
 AddPushButton.AddButton.Tip=Adicionar
 AddAllPushButton.AddAllButton.Tip=Adicionar todos

org.talend.common.ui.runtime.nl/src/main/java/messages_ru.properties

@@ -1,4 +1,3 @@
-AccessorUtils.Assert0='BeanPropertyAccessors' \u043A\u043E\u043B\u043E\u043D\u043A\u0438 (\u0441 \u0437\u0430\u0433\u043E\u043B\u043E\u0432\u043A\u043E\u043C '{0}' \u0438 id '{1}') \u043D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u043E \u0441\u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D. {2} \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E \u0434\u043B\u044F bean <B>
 AccessorUtils.Assert1='BeanPropertyAccessors' \u043A\u043E\u043B\u043E\u043D\u043A\u0438 (\u0441 \u0437\u0430\u0433\u043E\u043B\u043E\u0432\u043A\u043E\u043C '{0}' \u0438 id '{1}') \u043D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u043E \u0441\u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D \u0438\u043B\u0438 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 \u043D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u043E\u0433\u043E \u0442\u0438\u043F\u0430
 AddPushButton.AddButton.Tip=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C
 AddAllPushButton.AddAllButton.Tip=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0432\u0441\u0435

org.talend.common.ui.runtime.nl/src/main/java/messages_zh.properties

@@ -1,4 +1,3 @@
-AccessorUtils.Assert0=\u8FD9\u4E2A\u5217(\u6807\u9898\u4E3A\u2018{0}\u2019\uFF0CID\u4E3A\u2018{1}\u2019)\u7684\u2018BeanPropertyAccessors\u2019\u6CA1\u6709\u6B63\u786E\u914D\u7F6E\u3002\u2018{2}\u2019\u9700\u8981\u4E00\u4E2ABean<B>
 AccessorUtils.Assert1=\u8FD9\u4E2A\u5217(\u6807\u9898\u4E3A\u2018{0}\u2019\uFF0CID\u4E3A\u2018{1}\u2019)\u7684\u2018BeanPropertyAccessors\u2019\u6CA1\u6709\u6B63\u786E\u914D\u7F6E,\u6216\u8005\u503C\u8BBE\u7F6E\u4E3A\u4E0D\u6B63\u786E\u7684\u7C7B\u578B\u3002
 AddPushButton.AddButton.Tip=\u589E\u52A0
 AddAllPushButton.AddAllButton.Tip=\u6DFB\u52A0\u6240\u6709

org.talend.commons.runtime/src/org/talend/commons/utils/database/DB2ForZosDataBaseMetadata.java

@@ -116,7 +116,8 @@ public class DB2ForZosDataBaseMetadata extends FakeDatabaseMetaData {
     @Override
     public ResultSet getSchemas() throws SQLException {
         // see the feature 5827
-        String sql = "SELECT DISTINCT CREATOR FROM SYSIBM.SYSTABLES"; //$NON-NLS-1$
+        // MOD yyin 2012-05-15 TDQ-5190
+        String sql = "SELECT DISTINCT NAME FROM SYSIBM.SYSSCHEMATA"; //$NON-NLS-1$
         ResultSet rs = null;
         Statement stmt = null;
         List<String[]> list = new ArrayList<String[]>();
@@ -125,7 +126,7 @@ public class DB2ForZosDataBaseMetadata extends FakeDatabaseMetaData {
             rs = stmt.executeQuery(sql);
 
             while (rs.next()) {
-                String creator = rs.getString("CREATOR"); //$NON-NLS-1$
+                String creator = rs.getString("NAME"); //$NON-NLS-1$
 
                 String[] r = new String[] { creator.trim() }; //$NON-NLS-1$ //$NON-NLS-2$
                 list.add(r);
@@ -261,15 +262,25 @@ public class DB2ForZosDataBaseMetadata extends FakeDatabaseMetaData {
         if (types != null && types.length > 0) {
             String typeClause = " type in("; //$NON-NLS-1$
             int len = types.length;
+            boolean isTable = false;
             for (int i = 0; i < len; ++i) {
                 String comma = ""; //$NON-NLS-1$
                 if (i > 0) {
                     comma = " , "; //$NON-NLS-1$
                 }
                 typeClause = comma + typeClause + "'" + getDb2zosTypeName(types[i]) + "'";//$NON-NLS-1$ //$NON-NLS-2$
+
+                // ADDED yyin 20120516 TDQ-5190, same action as DB2
+                if (TABLE.equals(types[i])) {
+                    isTable = true;
+                }
             }
             typeClause = typeClause + ")"; //$NON-NLS-1$
             result = sql + and + typeClause;
+            // ADDED yyin 20120516 TDQ-5190, same action as DB2
+            if (isTable) {
+                result = result + " and TBSPACE!='SYSCATSPACE'";
+            }
         }
         return result;
     }

org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/commands/ExtendedTableAddCommand.java

@@ -61,7 +61,9 @@ public class ExtendedTableAddCommand extends Command implements IExtendedTableCo
         this.extendedTable = extendedTable;
         this.indexStartAdd = indexStartAdd;
         ArrayList list = new ArrayList(1);
-        list.add(beanToAdd);
+        if (beanToAdd != null) {
+            list.add(beanToAdd);
+        }
         this.beansToAdd = list;
     }
 

org.talend.core.nl/src/main/java/messages_fr.properties

@@ -402,3 +402,4 @@ ConnectionParameterName.UserLabel=Utilisateur
 ConnectionParameterName.PasswordLabel=Mot de passe
 ConnectionParameterName.DbfileLabel=Base de données
 ConnectionParameterName.DbPathLabel=Chemin d'accès racine à la base de données
+AbstractBrandingService.routines_license_header_content1=Copyright (c) 2005-2012, Talend Inc.\n//\n// Ce code source a été automatiquement généré par_{0}\n// CodeGenerator version {1}\n// Pour plus d'informations concernant les produits Talend, consultez www.talend.com.\n// Vous pouvez distribuer ce code sous conditions de la licence GNU LGPL\n// http://www.gnu.org/licenses/lgpl.html).

org.talend.core.repository.nl/src/main/java/messages_ar.properties

@@ -1,4 +1,3 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=\u0644\u0627\u064A\u0645\u0643\u0646 \u062A\u0648\u0644\u064A\u062F \u0639\u0646\u0648\u0627\u0646 \u0645\u0627\u062F\u0629 \u0628\u0627\u0644\u0644\u0635\u0642
 AbstractEMFRepositoryFactory.presistenceException.whoCauseProblems=\u0627\u0644\u0645\u0634\u0627\u0643\u0644 \u0628\u0633\u0628\u0628 \u0627\u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u062A\u0627\u0644\u064A\u0629:
 ProxyRepositoryFactory.Label=\u062A\u0633\u0645\u064A\u0629
 CreateSandboxProjectDialog.ProjectLabel=\u062A\u0633\u0645\u064A\u0629

org.talend.core.repository.nl/src/main/java/messages_el.properties

@@ -1,4 +1,3 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=\u0394\u03B5 \u03BC\u03C0\u03BF\u03C1\u03B5\u03AF \u03BD\u03B1 \u03C0\u03B1\u03C1\u03B1\u03C7\u03B8\u03B5\u03AF \u03B5\u03C0\u03B9\u03BA\u03BF\u03BB\u03BB\u03BF\u03CD\u03BC\u03B5\u03BD\u03B7 \u03B5\u03C4\u03B9\u03BA\u03AD\u03C4\u03B1 \u03B1\u03BD\u03C4\u03B9\u03BA\u03B5\u03B9\u03BC\u03AD\u03BD\u03BF\u03C5
 AbstractEMFRepositoryFactory.job=\u0395\u03C1\u03B3\u03B1\u03C3\u03AF\u03B1
 AbstractEMFRepositoryFactory.presistenceException.whoCauseProblems=\u03B1\u03BD\u03C4\u03B9\u03BA\u03B5\u03AF\u03BC\u03B5\u03BD\u03B1 \u03C0\u03BF\u03C5 \u03C0\u03C1\u03BF\u03BA\u03B1\u03BB\u03BF\u03CD\u03BD \u03C0\u03C1\u03BF\u03B2\u03BB\u03AE\u03BC\u03B1\u03C4\u03B1 \u03B5\u03AF\u03BD\u03B1\u03B9:
 ProxyRepositoryFactory.bussinessException.itemNonModifiable=\u0394\u03B5\u03BD \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B1\u03C1\u03BA\u03B5\u03C4\u03AC \u03B4\u03B9\u03BA\u03B1\u03B9\u03CE\u03BC\u03B1\u03C4\u03B1 \u03B3\u03B9\u03B1 \u03B1\u03C5\u03C4\u03AE \u03C4\u03B7\u03BD \u03B5\u03BD\u03AD\u03C1\u03B3\u03B5\u03B9\u03B1

org.talend.core.repository.nl/src/main/java/messages_en.properties

@@ -1,4 +1,3 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=Cannot generate pasted item label.
 AbstractEMFRepositoryFactory.job=Job
 AbstractEMFRepositoryFactory.presistenceException.OnlyOneOccurenceMustbeFound=More than one items are retrieved at the same time.\n{0}
 AbstractEMFRepositoryFactory.presistenceException.whoCauseProblems=Items who cause problems are:
@@ -144,3 +143,4 @@ RepositoryDropAdapter_moveTitle=Move
 RepositoryDropAdapter_movingItems=Moving items...
 RepositoryDropAdapter.checkingLockStatus=Checking lock status of
 RepositoryDropAdapter.moving=Moving
+AbstractEMFRepositoryFactory.cannotGenerateItem=Cannot generate pasted item label.

org.talend.core.repository.nl/src/main/java/messages_es.properties

@@ -1,4 +1,3 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=No Genero Etiqueta Pegada del Item
 AbstractEMFRepositoryFactory.job=Trabajo
 AbstractEMFRepositoryFactory.presistenceException.whoCauseProblems=Los elementos que causan problema son:
 AbstractEMFRepositoryFactory.requiredComponent=Requerido para utilizar el componente:

org.talend.core.repository.nl/src/main/java/messages_fr.properties

@@ -1,4 +1,3 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=Impossible de générer le libellé collé de l'élément
 AbstractEMFRepositoryFactory.job=Job
 AbstractEMFRepositoryFactory.presistenceException.OnlyOneOccurenceMustbeFound=Plusieurs éléments ont été retrouvés simultanément.\n{0}
 AbstractEMFRepositoryFactory.presistenceException.whoCauseProblems=Les éléments à l'origine des problèmes sont :
@@ -94,3 +93,4 @@ JobletReferenceDialog.ReferenceJob=Job de r
 JobletReferenceDialog.Title=Echec de la suppression du joblet
 EmptyRecycleBinAction.dialog.allDependencies=Vous ne pouvez vider la Corbeille.\nLa perspective Profiling dépend d'un élément. Ne le supprimez pas.
 ContextReferenceDialog.Recycle=dans la Corbeille
+ContextReferenceDialog.ReferenceJob=Objets de référence

org.talend.core.repository.nl/src/main/java/messages_hr.properties

@@ -1,4 +1,3 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=Ne mogu generirati naziv zaljepljene stavke.
 AbstractEMFRepositoryFactory.job=Posao
 AbstractEMFRepositoryFactory.presistenceException.whoCauseProblems=Stavke koje uzrokuju problem:
 ProxyRepositoryFactory.Label=Labela

org.talend.core.repository.nl/src/main/java/messages_it.properties

@@ -1,4 +1,3 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=Impossibile generare  copia elemento
 AbstractEMFRepositoryFactory.job=Job
 ProxyRepositoryFactory.Label=Etichetta
 CreateSandboxProjectDialog.ProjectDesc=Descrizione

org.talend.core.repository.nl/src/main/java/messages_ja.properties

@@ -1,4 +1,3 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=\u30A2\u30A4\u30C6\u30E0\u30E9\u30D9\u30EB\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
 AbstractEMFRepositoryFactory.job=\u30B8\u30E7\u30D6
 AbstractEMFRepositoryFactory.presistenceException.OnlyOneOccurenceMustbeFound=time.n{0}\u3067\u540C\u6642\u306B1\u3064\u4EE5\u4E0A\u306E\u30A2\u30A4\u30C6\u30E0\u304C\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059
 AbstractEMFRepositoryFactory.presistenceException.whoCauseProblems=\u554F\u984C\u767A\u751F\u539F\u56E0\u306F\uFF1A

org.talend.core.repository.nl/src/main/java/messages_pl.properties

@@ -1,4 +1,3 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=Nie mo\u017Cna wygenerowa\u0107 etykiety dla wklejanego obiektu.
 AbstractEMFRepositoryFactory.presistenceException.whoCauseProblems=Elementy powoduj\u0105ce problemy:
 AbstractEMFRepositoryFactory.requiredComponent=Wymagane u\u017Cycie komponentów:
 ProxyRepositoryFactory.Label=Etykieta

org.talend.core.repository.nl/src/main/java/messages_pt_BR.properties

@@ -1,4 +1,3 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=Impossível gerar label do item copiado
 AbstractEMFRepositoryFactory.presistenceException.whoCauseProblems=Quais são os itens que causaram problema:
 ProxyRepositoryFactory.initializeProjectConnection=Iniciar Conexão do Projeto
 ProxyRepositoryFactory.Label=Label

org.talend.core.repository.nl/src/main/java/messages_zh.properties

@@ -1,4 +1,3 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=\u65E0\u6CD5\u751F\u6210\u7C98\u8D34\u9879\u76EE\u7684\u6807\u7B7E.
 AbstractEMFRepositoryFactory.job=\u4f5c\u4e1a
 ProxyRepositoryFactory.bussinessException.itemNonModifiable=\u4e0d\u53ef\u4fee\u6539\u9879
 ProxyRepositoryFactory.illegalArgumentException.labelNotMatchPattern=\u6807\u7b7e {0} \u4e0e\u6a21\u5f0f {1} \u4e0d\u7b26

org.talend.core.repository/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +0,0 @@
-#Wed Dec 08 15:09:12 CST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

org.talend.core.repository/META-INF/MANIFEST.MF

@@ -12,12 +12,14 @@ Require-Bundle: org.eclipse.ui,
  org.talend.common.ui.runtime,
  org.talend.commons.ui,
  org.apache.log4j,
- org.talend.libraries.apache
+ org.talend.libraries.apache,
+ org.eclipse.osgi.services
 Export-Package: org.talend.core.ldap,
  org.talend.core.model.genhtml,
  org.talend.core.model.metadata,
  org.talend.core.repository,
  org.talend.core.repository.constants,
+ org.talend.core.repository.i18n,
  org.talend.core.repository.model,
  org.talend.core.repository.model.listeners,
  org.talend.core.repository.model.repositoryObject,

org.talend.core.repository/plugin.xml

@@ -9,6 +9,7 @@
    <extension-point id="repository_handler" name="Repository handler" schema="schema/repository_handler.exsd"/>
    <extension-point id="repository_service" name="Repository service" schema="schema/repository_service.exsd"/>
    <extension-point id="metadata_provider" name="Metadata provider" schema="schema/metadata_provider.exsd"/>
+   <extension-point id="org.talend.core.repository.login.task" name="Login Task" schema="schema/login_task.exsd"/>
 
    <extension
          point="org.talend.core.runtime.service">
@@ -572,6 +573,12 @@
             name="tRunJob DnD Filter">
       </DragAndDropFilter>
    </extension>
+   <extension
+         point="org.talend.core.repository.login.task">
+      <loginTask
+            class="org.talend.core.repository.GeneratedJetEmitersLoginTask">
+      </loginTask>
+   </extension>
 
 
 </plugin>

org.talend.core.repository/schema/login_task.exsd

@@ -0,0 +1,127 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.talend.core.repository" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.talend.core.repository" id="login.task" name="Login Task"/>
+      </appinfo>
+      <documentation>
+         This extension point defines the tasks that will be executed during project login in the Talend Studio.
+The class used is a &lt;b&gt;IRunnableWithProgress&lt;/b&gt; and they will be instanciated and executed at the end of the login phase after some compulsory initilisation.&lt;p&gt;
+This is mainly used for initialisation and should report any progress and response to the cancel event regularly.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="loginTask"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="loginTask">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Class instanciated and called at the end of the login phase in the Studio. Class must implement &lt;b&gt;org.eclipse.jface.operation.IRunnableWithProgress&lt;/b&gt;
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.jface.operation.IRunnableWithProgress"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="priority">
+            <annotation>
+               <documentation>
+                  This defines the order that the runnable is executed regarding other identical extensions.
+where the &lt;b&gt;highest&lt;/b&gt; are executed first and  the &lt;b&gt;lowest&lt;/b&gt; priority are executed last.
+The default value is &lt;b&gt;normal&lt;/b&gt;
+               </documentation>
+            </annotation>
+            <simpleType>
+               <restriction base="string">
+                  <enumeration value="lowest">
+                  </enumeration>
+                  <enumeration value="low">
+                  </enumeration>
+                  <enumeration value="normal">
+                  </enumeration>
+                  <enumeration value="high">
+                  </enumeration>
+                  <enumeration value="highest">
+                  </enumeration>
+               </restriction>
+            </simpleType>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>

org.talend.core.repository/src/main/java/org/talend/core/repository/GeneratedJetEmitersLoginTask.java

@@ -0,0 +1,27 @@
+package org.talend.core.repository;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.apache.log4j.Logger;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.ICoreService;
+
+public class GeneratedJetEmitersLoginTask implements IRunnableWithProgress {
+
+    private static Logger log = Logger.getLogger(GeneratedJetEmitersLoginTask.class);
+
+    @Override
+    public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+        log.info("Generating JetEmiters"); //$NON-NLS-1$
+        SubMonitor subMonitor = SubMonitor.convert(monitor, 1);
+        subMonitor.setTaskName("Generating Jet Emiters.");
+        ICoreService coreService = (ICoreService) GlobalServiceRegister.getDefault().getService(ICoreService.class);
+        coreService.initializeTemplates();
+        subMonitor.done();
+
+    }
+
+}

org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractRepositoryFactory.java

@@ -266,4 +266,8 @@ public abstract class AbstractRepositoryFactory implements IRepositoryFactory {
         return readProject();
     }
 
+    @Override
+    public void updateLockStatus() throws PersistenceException {
+        // nothing to do, by default
+    }
 }

org.talend.core.repository/src/main/java/org/talend/core/repository/model/IRepositoryFactory.java

@@ -371,4 +371,12 @@ public interface IRepositoryFactory {
      * @return
      */
     public String getNavigatorViewDescription();
+
+    /**
+     * 
+     * DOC ggu Comment method "updateLockStatus".
+     * 
+     * update the lock status
+     */
+    public void updateLockStatus() throws PersistenceException;
 }

org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java

@@ -16,6 +16,8 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Dictionary;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -37,10 +39,18 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventAdmin;
 import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.BusinessException;
 import org.talend.commons.exception.LoginException;
@@ -55,9 +65,11 @@ import org.talend.core.AbstractDQModelService;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ICoreService;
 import org.talend.core.IESBService;
+import org.talend.core.ITDQRepositoryService;
 import org.talend.core.PluginChecker;
 import org.talend.core.context.Context;
 import org.talend.core.context.RepositoryContext;
+import org.talend.core.exception.TalendInternalPersistenceException;
 import org.talend.core.language.LanguageManager;
 import org.talend.core.model.general.ModuleNeeded;
 import org.talend.core.model.general.Project;
@@ -88,6 +100,7 @@ import org.talend.core.model.repository.LockInfo;
 import org.talend.core.model.repository.RepositoryContentManager;
 import org.talend.core.model.repository.RepositoryObject;
 import org.talend.core.model.repository.RepositoryViewObject;
+import org.talend.core.repository.CoreRepositoryPlugin;
 import org.talend.core.repository.constants.FileConstants;
 import org.talend.core.repository.i18n.Messages;
 import org.talend.core.repository.utils.RepositoryPathProvider;
@@ -118,7 +131,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
     private static ICoreService coreService = (ICoreService) GlobalServiceRegister.getDefault().getService(ICoreService.class);
 
-    private static final int MAX_TASKS = 9;
+    private static final int MAX_TASKS = 8;
 
     private static Logger log = Logger.getLogger(ProxyRepositoryFactory.class);
 
@@ -132,6 +145,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
     private ProjectManager projectManager;
 
+    @Override
     public synchronized void addPropertyChangeListener(PropertyChangeListener l) {
         if (l == null) {
             throw new IllegalArgumentException();
@@ -139,6 +153,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         support.addPropertyChangeListener(l);
     }
 
+    @Override
     public synchronized void removePropertyChangeListener(PropertyChangeListener l) {
         if (l != null) {
             support.removePropertyChangeListener(l);
@@ -170,6 +185,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#refreshJobPictureFolder()
      */
+    @Override
     public void refreshJobPictureFolder(String picFolder) {
         IFolder folder = RepositoryPathProvider.getFolder(picFolder);
         try {
@@ -186,6 +202,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#refreshJobPictureFolder()
      */
+    @Override
     public void refreshDocumentationFolder(String docFolder) {
         IFolder folder = RepositoryPathProvider.getFolder(docFolder);
         if (folder != null) {
@@ -203,6 +220,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#getRepositoryContext()
      */
+    @Override
     public RepositoryContext getRepositoryContext() {
         Context ctx = CoreRuntimePlugin.getInstance().getContext();
         return (RepositoryContext) ctx.getProperty(Context.REPOSITORY_CONTEXT_KEY);
@@ -299,16 +317,37 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 if (currentShell == null) {
                     currentShell = new Shell();
                 }
-                MessageBox box = new MessageBox(currentShell, SWT.ICON_WARNING | SWT.OK | SWT.CANCEL);
-                box.setText(Messages.getString("ProxyRepositoryFactory.JobNameErroe")); //$NON-NLS-1$
-                box.setMessage(Messages.getString("ProxyRepositoryFactory.Label") + " " + name + " " + Messages.getString("ProxyRepositoryFactory.ReplaceJob") + Messages.getString("ProxyRepositoryFactory.ReplaceJobHazardDescription")); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$//$NON-NLS-5$
-                if (box.open() == SWT.OK) {
-                    deleteObjectPhysical(duplicateNameObject);
-                    return true;
+                ITDQRepositoryService tdqRepService = null;
+
+                if (GlobalServiceRegister.getDefault().isServiceRegistered(ITDQRepositoryService.class)) {
+                    tdqRepService = (ITDQRepositoryService) GlobalServiceRegister.getDefault().getService(
+                            ITDQRepositoryService.class);
+                }
+
+                boolean isThrow = true;
+                if (tdqRepService != null && CoreRuntimePlugin.getInstance().isDataProfilePerspectiveSelected()) {
+                    // change MessageBox to DeleteModelElementConfirmDialog
+                    InputDialog inputDialog = tdqRepService.getInputDialog(item);
+                    if (MessageDialog.OK == inputDialog.open()) {
+                        String newName = inputDialog.getValue();
+                        tdqRepService.changeElementName(item, newName);
+                        isThrow = false;
+                    }
                 } else {
-                    throw new IllegalArgumentException(Messages.getString(
+                    MessageBox box = new MessageBox(currentShell, SWT.ICON_WARNING | SWT.OK | SWT.CANCEL);
+                    box.setText(Messages.getString("ProxyRepositoryFactory.JobNameErroe")); //$NON-NLS-1$
+                    box.setMessage(Messages.getString("ProxyRepositoryFactory.Label") + " " + name + " " + Messages.getString("ProxyRepositoryFactory.ReplaceJob") + Messages.getString("ProxyRepositoryFactory.ReplaceJobHazardDescription")); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$//$NON-NLS-5$
+
+                    if (box.open() == SWT.OK) {
+                        deleteObjectPhysical(duplicateNameObject);
+                        isThrow = false;
+                    }
+                }
+                if (isThrow) {
+                    throw new TalendInternalPersistenceException(Messages.getString(
                             "ProxyRepositoryFactory.illegalArgumentException.labeAlreadyInUse", new String[] { name })); //$NON-NLS-1$
                 }
+                return true;
             }
         }
         return true;
@@ -324,6 +363,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return this.repositoryFactoryFromProvider.getMetadataConnectionsItem(project);
     }
 
+    @Override
     public List<ConnectionItem> getMetadataConnectionsItem() throws PersistenceException {
         return getMetadataConnectionsItem(projectManager.getCurrentProject());
     }
@@ -332,6 +372,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return this.repositoryFactoryFromProvider.getContextItem(project);
     }
 
+    @Override
     public List<ContextItem> getContextItem() throws PersistenceException {
         List<ContextItem> contextItems = getContextItem(projectManager.getCurrentProject());
         if (contextItems == null) {
@@ -352,10 +393,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @see org.talend.repository.model.IProxyRepositoryFactory#isNameAvailable(org.talend.core.model.properties.Item,
      * java.lang.String)
      */
+    @Override
     public boolean isNameAvailable(Item item, String name, List<IRepositoryViewObject>... givenList) throws PersistenceException {
         return isNameAvailable(projectManager.getCurrentProject(), item, name, givenList);
     }
 
+    @Override
     public boolean isNameAvailable(Project project, Item item, String name, List<IRepositoryViewObject>... givenList)
             throws PersistenceException {
         return this.repositoryFactoryFromProvider.isNameAvailable(project, item, name, givenList);
@@ -367,10 +410,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @seeorg.talend.repository.model.IProxyRepositoryFactory#isPathValid(org.talend.core.model.repository.
      * ERepositoryObjectType, org.eclipse.core.runtime.IPath, java.lang.String)
      */
+    @Override
     public boolean isPathValid(ERepositoryObjectType type, IPath path, String label) throws PersistenceException {
         return isPathValid(projectManager.getCurrentProject(), type, path, label);
     }
 
+    @Override
     public boolean isPathValid(Project proejct, ERepositoryObjectType type, IPath path, String label) throws PersistenceException {
         return this.repositoryFactoryFromProvider.isPathValid(proejct, type, path, label);
     }
@@ -381,6 +426,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @see org.talend.repository.model.IProxyRepositoryFactory#createProject(java.lang.String, java.lang.String,
      * org.talend.core.model.temp.ECodeLanguage, org.talend.core.model.properties.User)
      */
+    @Override
     public Project createProject(Project projectInfor) throws PersistenceException {
         checkFileName(projectInfor.getLabel(), RepositoryConstants.PROJECT_PATTERN);
         Project toReturn = this.repositoryFactoryFromProvider.createProject(projectInfor);
@@ -392,6 +438,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return toReturn;
     }
 
+    @Override
     public void saveProject(Project project) throws PersistenceException {
         repositoryFactoryFromProvider.saveProject(project);
     }
@@ -402,18 +449,21 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @seeorg.talend.repository.model.IProxyRepositoryFactory#createFolder(org.talend.core.model.repository.
      * ERepositoryObjectType, org.eclipse.core.runtime.IPath, java.lang.String)
      */
+    @Override
     public Folder createFolder(ERepositoryObjectType type, IPath path, String label) throws PersistenceException {
         return createFolder(projectManager.getCurrentProject(), type, path, label);
     }
 
+    @Override
     public Folder createFolder(Project project, ERepositoryObjectType type, IPath path, String label) throws PersistenceException {
         return createFolder(project, type, path, label, false);
     }
 
+    @Override
     public Folder createFolder(Project project, ERepositoryObjectType type, IPath path, String label, boolean isImportItem)
             throws PersistenceException {
         if (type.isDQItemType()) {
-            checkFileNameAndPath(project, label, RepositoryConstants.TDQ_PAT_ITEM_PATTERN, type, path, true);
+            checkFileNameAndPath(project, label, RepositoryConstants.TDQ_ALL_ITEM_PATTERN, type, path, true);
         } else if (type == ERepositoryObjectType.METADATA_FILE_XML) {
             checkFileNameAndPath(project, label, RepositoryConstants.SIMPLE_FOLDER_PATTERN, type, path, true);
         } else {
@@ -432,14 +482,17 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @seeorg.talend.repository.model.IProxyRepositoryFactory#deleteFolder(org.talend.core.model.repository.
      * ERepositoryObjectType, org.eclipse.core.runtime.IPath)
      */
+    @Override
     public synchronized void deleteFolder(ERepositoryObjectType type, IPath path) throws PersistenceException {
         deleteFolder(projectManager.getCurrentProject(), type, path);
     }
 
+    @Override
     public synchronized void deleteFolder(Project project, ERepositoryObjectType type, IPath path) throws PersistenceException {
         deleteFolder(projectManager.getCurrentProject(), type, path, false);
     }
 
+    @Override
     public synchronized void deleteFolder(Project project, ERepositoryObjectType type, IPath path, boolean fromEmptyRecycleBin)
             throws PersistenceException {
         this.repositoryFactoryFromProvider.deleteFolder(project, type, path, fromEmptyRecycleBin);
@@ -458,6 +511,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * org.talend.repository.model.IProxyRepositoryFactory#moveFolder(org.talend.core.model.repository.ERepositoryObjectType
      * , org.eclipse.core.runtime.IPath, org.eclipse.core.runtime.IPath)
      */
+    @Override
     public void moveFolder(ERepositoryObjectType type, IPath sourcePath, IPath targetPath) throws PersistenceException {
         this.repositoryFactoryFromProvider.moveFolder(type, sourcePath, targetPath);
         if (type == ERepositoryObjectType.PROCESS) {
@@ -474,6 +528,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#getNextId()
      */
+    @Override
     public String getNextId() {
         String nextId = this.repositoryFactoryFromProvider.getNextId();
 
@@ -493,6 +548,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#getRecycleBinItems()
      */
+    @Override
     public List<IRepositoryViewObject> getRecycleBinItems() throws PersistenceException {
         return getRecycleBinItems(projectManager.getCurrentProject());
     }
@@ -502,6 +558,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#readProject()
      */
+    @Override
     public Project[] readProject() throws PersistenceException, BusinessException {
         // mzhao initialize the DQ model packages.
         AbstractDQModelService dqModelService = CoreRuntimePlugin.getInstance().getDQModelService();
@@ -511,6 +568,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return this.repositoryFactoryFromProvider.readProject();
     }
 
+    @Override
     public Project[] readProject(boolean unloadResource) throws PersistenceException, BusinessException {
         return this.repositoryFactoryFromProvider.readProject(unloadResource);
     }
@@ -521,6 +579,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @seeorg.talend.repository.model.IProxyRepositoryFactory#renameFolder(org.talend.core.model.repository.
      * ERepositoryObjectType, org.eclipse.core.runtime.IPath, java.lang.String)
      */
+    @Override
     public void renameFolder(ERepositoryObjectType type, IPath path, String label) throws PersistenceException {
         // if (path.lastSegment().equalsIgnoreCase(label)) {
         // not supported to rename directly to another case.
@@ -551,10 +610,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @seeorg.talend.repository.model.IProxyRepositoryFactory#deleteObjectLogical(org.talend.core.model.repository.
      * IRepositoryViewObject)
      */
+    @Override
     public void deleteObjectLogical(IRepositoryViewObject objToDelete) throws PersistenceException, BusinessException {
         deleteObjectLogical(projectManager.getCurrentProject(), objToDelete);
     }
 
+    @Override
     public void deleteObjectLogical(Project project, IRepositoryViewObject objToDelete) throws PersistenceException,
             BusinessException {
         // RepositoryViewObject is dynamic, so force to use in all case the RepositoryObject with fixed object.
@@ -593,6 +654,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @seeorg.talend.repository.model.IProxyRepositoryFactory#deleteObjectPhysical(org.talend.core.model.repository.
      * IRepositoryViewObject)
      */
+    @Override
     public void forceDeleteObjectPhysical(IRepositoryViewObject objToDelete, String version) throws PersistenceException {
         this.repositoryFactoryFromProvider.deleteObjectPhysical(projectManager.getCurrentProject(), objToDelete, version);
         // i18n
@@ -607,23 +669,28 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @seeorg.talend.repository.model.IProxyRepositoryFactory#deleteObjectPhysical(org.talend.core.model.repository.
      * IRepositoryViewObject)
      */
+    @Override
     public void deleteObjectPhysical(IRepositoryViewObject objToDelete) throws PersistenceException {
         deleteObjectPhysical(objToDelete, null);
     }
 
+    @Override
     public void deleteObjectPhysical(IRepositoryViewObject objToDelete, String version) throws PersistenceException {
         deleteObjectPhysical(projectManager.getCurrentProject(), objToDelete, version);
     }
 
+    @Override
     public void deleteObjectPhysical(Project project, IRepositoryViewObject objToDelete) throws PersistenceException {
         deleteObjectPhysical(project, objToDelete, null);
     }
 
+    @Override
     public void deleteObjectPhysical(Project project, IRepositoryViewObject objToDelete, String version)
             throws PersistenceException {
         deleteObjectPhysical(project, objToDelete, version, false);
     }
 
+    @Override
     public void deleteObjectPhysical(Project project, IRepositoryViewObject objToDelete, String version,
             boolean fromEmptyRecycleBin) throws PersistenceException {
         if (project == null || objToDelete == null || objToDelete.getProperty() == null) {
@@ -693,6 +760,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @seeorg.talend.repository.model.IProxyRepositoryFactory#restoreObject(org.talend.core.model.repository.
      * IRepositoryViewObject , org.eclipse.core.runtime.IPath)
      */
+    @Override
     public void restoreObject(IRepositoryViewObject objToRestore, IPath path) throws PersistenceException, BusinessException {
         if (ProxyRepositoryFactory.getInstance().isUserReadOnlyOnCurrentProject()) {
             throw new BusinessException(Messages.getString("ProxyRepositoryFactory.bussinessException.itemNonModifiable")); //$NON-NLS-1$
@@ -732,6 +800,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * org.talend.repository.model.IProxyRepositoryFactory#moveObject(org.talend.core.model.repository.IRepositoryViewObject
      * , org.eclipse.core.runtime.IPath)
      */
+    @Override
     public void moveObject(IRepositoryViewObject objToMove, IPath targetPath, IPath... sourcePath) throws PersistenceException,
             BusinessException {
         checkAvailability(objToMove);
@@ -748,16 +817,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         log.debug(Messages.getString("ProxyRepositoryFactory.log.move", str)); //$NON-NLS-1$
         // unlock(getItem(objToMove));
 
-        boolean isExtendPoint = false;
-        ERepositoryObjectType repositoryObjectType = objToMove.getRepositoryObjectType();
-        for (IRepositoryContentHandler handler : RepositoryContentManager.getHandlers()) {
-            ERepositoryObjectType type = handler.getProcessType();
-            if (type != null && repositoryObjectType == type) {
-                isExtendPoint = true;
-                break;
-            }
-        }
-        if (isExtendPoint || objToMove.getRepositoryObjectType() == ERepositoryObjectType.PROCESS) {
+        if (objToMove.getRepositoryObjectType() == ERepositoryObjectType.PROCESS) {
             if (sourcePath != null && sourcePath.length == 1) {
                 fireRepositoryPropertyChange(ERepositoryActionName.JOB_MOVE.getName(), objToMove, new IPath[] { sourcePath[0],
                         targetPath });
@@ -785,6 +845,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @see
      * org.talend.repository.model.IProxyRepositoryFactory#lock(org.talend.core.model.repository.IRepositoryViewObject)
      */
+    @Override
     public void lock(IRepositoryViewObject obj) throws PersistenceException, LoginException {
         lock(getItem(obj));
     }
@@ -794,6 +855,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#lock(org.talend.core.model.properties.Item)
      */
+    @Override
     public void lock(Item item) throws PersistenceException, LoginException {
         // getStatus(item)
         if (getStatus(item).isPotentiallyEditable()) {
@@ -810,6 +872,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     this.repositoryFactoryFromProvider.lock(documentationItem);
                 }
             }
+            notifyLock(item, true);
             // i18n
             // log.debug("Lock [" + item + "] by \"" + getRepositoryContext().getUser() + "\".");
             String str[] = new String[] { item.toString(), getRepositoryContext().getUser().toString() };
@@ -817,16 +880,42 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         }
     }
 
+    /**
+     * DOC sgandon Comment method "notifyLock".
+     * 
+     * @param item
+     */
+    private void notifyLock(Item item, boolean lock) {
+        Bundle bundle = FrameworkUtil.getBundle(this.getClass());
+        if (bundle != null) {
+            BundleContext bundleContext = CoreRepositoryPlugin.getDefault().getBundle().getBundleContext();
+            ServiceReference ref = bundleContext != null ? bundleContext.getServiceReference(EventAdmin.class.getName()) : null;
+            if (ref != null) {
+                @SuppressWarnings("null")
+                EventAdmin eventAdmin = (EventAdmin) bundleContext.getService(ref);
+
+                Dictionary<String, Object> properties = new Hashtable<String, Object>();
+                properties.put("item", item);
+
+                Event lockEvent = new Event("org/talend/repository/item/" + (lock ? "lock" : "unlock"), properties);
+
+                eventAdmin.postEvent(lockEvent);
+            }
+        }// else no bundle for this, should never happend.
+    }
+
     /*
      * (non-Javadoc)
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#getAllVersion(java.lang.String)
      */
+    @Override
     public List<IRepositoryViewObject> getAllVersion(String id) throws PersistenceException {
         List<IRepositoryViewObject> allVersion = getAllRefVersion(projectManager.getCurrentProject(), id);
         return allVersion;
     }
 
+    @Override
     public List<IRepositoryViewObject> getAllVersion(String id, String folderPath, ERepositoryObjectType type)
             throws PersistenceException {
         List<IRepositoryViewObject> allVersion = getAllRefVersion(projectManager.getCurrentProject(), id, folderPath, type);
@@ -860,6 +949,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return allVersion;
     }
 
+    @Override
     public List<IRepositoryViewObject> getAllVersion(Project project, String id, boolean avoidSaveProject)
             throws PersistenceException {
         return this.repositoryFactoryFromProvider.getAllVersion(project, id, avoidSaveProject);
@@ -870,10 +960,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return this.repositoryFactoryFromProvider.getAllVersion(project, id, folderPath, type);
     }
 
+    @Override
     public IRepositoryViewObject getLastVersion(Project project, String id) throws PersistenceException {
         return this.repositoryFactoryFromProvider.getLastVersion(project, id);
     }
 
+    @Override
     public IRepositoryViewObject getLastVersion(Project project, String id, String folderPath, ERepositoryObjectType type)
             throws PersistenceException {
         return this.repositoryFactoryFromProvider.getLastVersion(project, id, folderPath, type);
@@ -884,6 +976,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return this.repositoryFactoryFromProvider.getLastVersion(projectManager.getCurrentProject(), id, folderPath, type);
     }
 
+    @Override
     public IRepositoryViewObject getLastVersion(String id) throws PersistenceException {
         IRepositoryViewObject lastRefVersion = getLastRefVersion(projectManager.getCurrentProject(), id);
         return lastRefVersion;
@@ -903,33 +996,40 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return lastVersion;
     }
 
+    @Override
     public List<IRepositoryViewObject> getAll(Project project, ERepositoryObjectType type) throws PersistenceException {
         return getAll(project, type, false);
     }
 
+    @Override
     public List<IRepositoryViewObject> getAll(Project project, ERepositoryObjectType type, boolean withDeleted)
             throws PersistenceException {
         return this.repositoryFactoryFromProvider.getAll(project, type, withDeleted, false);
     }
 
+    @Override
     public List<IRepositoryViewObject> getAll(Project project, ERepositoryObjectType type, boolean withDeleted,
             boolean allVersions) throws PersistenceException {
         return this.repositoryFactoryFromProvider.getAll(project, type, withDeleted, allVersions);
     }
 
+    @Override
     public List<IRepositoryViewObject> getAll(ERepositoryObjectType type) throws PersistenceException {
         return getAll(projectManager.getCurrentProject(), type, false);
     }
 
+    @Override
     public List<IRepositoryViewObject> getAll(ERepositoryObjectType type, boolean withDeleted) throws PersistenceException {
         return this.repositoryFactoryFromProvider.getAll(projectManager.getCurrentProject(), type, withDeleted, false);
     }
 
+    @Override
     public List<IRepositoryViewObject> getAll(ERepositoryObjectType type, boolean withDeleted, boolean allVersions)
             throws PersistenceException {
         return this.repositoryFactoryFromProvider.getAll(projectManager.getCurrentProject(), type, withDeleted, allVersions);
     }
 
+    @Override
     public List<String> getFolders(ERepositoryObjectType type) throws PersistenceException {
         return getFolders(projectManager.getCurrentProject(), type);
     }
@@ -983,6 +1083,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#getDocumentationStatus()
      */
+    @Override
     public List<Status> getDocumentationStatus() throws PersistenceException {
         return this.repositoryFactoryFromProvider.getDocumentationStatus();
     }
@@ -992,6 +1093,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#getTechnicalStatus()
      */
+    @Override
     public List<Status> getTechnicalStatus() throws PersistenceException {
         return this.repositoryFactoryFromProvider.getTechnicalStatus();
     }
@@ -1009,6 +1111,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#setDocumentationStatus(java.util.List)
      */
+    @Override
     public void setDocumentationStatus(List<Status> list) throws PersistenceException {
         this.repositoryFactoryFromProvider.setDocumentationStatus(list);
     }
@@ -1019,23 +1122,28 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @see org.talend.repository.model.IProxyRepositoryFactory#forceCreate(org.talend.core.model.properties.Item,
      * org.eclipse.core.runtime.IPath)
      */
+    @Override
     public void forceCreate(Item item, IPath path) throws PersistenceException {
         forceCreate(projectManager.getCurrentProject(), item, path);
     }
 
+    @Override
     public void forceCreate(Project project, Item item, IPath path) throws PersistenceException {
         this.repositoryFactoryFromProvider.create(project, item, path);
     }
 
+    @Override
     public void createParentFoldersRecursively(ERepositoryObjectType itemType, IPath path) throws PersistenceException {
         createParentFoldersRecursively(projectManager.getCurrentProject(), itemType, path);
     }
 
+    @Override
     public void createParentFoldersRecursively(Project project, ERepositoryObjectType itemType, IPath path)
             throws PersistenceException {
         createParentFoldersRecursively(project, itemType, path, false);
     }
 
+    @Override
     public void createParentFoldersRecursively(Project project, ERepositoryObjectType itemType, IPath path, boolean isImportItem)
             throws PersistenceException {
         List<String> folders = getFolders(project, itemType);
@@ -1056,6 +1164,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#setTechnicalStatus(java.util.List)
      */
+    @Override
     public void setTechnicalStatus(List<Status> list) throws PersistenceException {
         this.repositoryFactoryFromProvider.setTechnicalStatus(list);
     }
@@ -1065,10 +1174,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#setSpagoBiServer(java.util.List)
      */
+    @Override
     public void setSpagoBiServer(List<SpagoBiServer> list) throws PersistenceException {
         this.repositoryFactoryFromProvider.setSpagoBiServer(list);
     }
 
+    @Override
     public void setMigrationTasksDone(Project project, List<String> list) throws PersistenceException {
         this.repositoryFactoryFromProvider.setMigrationTasksDone(project, list);
     }
@@ -1092,10 +1203,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @see org.talend.repository.model.IProxyRepositoryFactory#create(org.talend.core.model.properties.Item,
      * org.eclipse.core.runtime.IPath)
      */
+    @Override
     public void create(Item item, IPath path, boolean... isImportItem) throws PersistenceException {
         create(projectManager.getCurrentProject(), item, path, isImportItem);
     }
 
+    @Override
     public void create(Project project, Item item, IPath path, boolean... isImportItem) throws PersistenceException {
         boolean isOherProcess = false;
         for (IRepositoryContentHandler handler : RepositoryContentManager.getHandlers()) {
@@ -1116,6 +1229,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         }
         checkFileNameAndPath(project, item, RepositoryConstants.getPattern(ERepositoryObjectType.getItemType(item)), path, false,
                 isImportItem);
+
         this.repositoryFactoryFromProvider.create(project, item, path, isImportItem);
         if ((item instanceof ProcessItem || item instanceof JobletProcessItem) && (isImportItem.length == 0)) {
             fireRepositoryPropertyChange(ERepositoryActionName.JOB_CREATE.getName(), null, item);
@@ -1127,10 +1241,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#save(org.talend.core.model.properties.Item)
      */
+    @Override
     public void save(Item item, boolean... isMigrationTask) throws PersistenceException {
         save(projectManager.getCurrentProject(), item, isMigrationTask);
     }
 
+    @Override
     public void save(Project project, Item item, boolean... isMigrationTask) throws PersistenceException {
         this.repositoryFactoryFromProvider.save(project, item);
         if ((item instanceof ProcessItem || item instanceof JobletProcessItem)
@@ -1144,10 +1260,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#save(org.talend.core.model.properties.Property)
      */
+    @Override
     public void save(Property property, String... originalNameAndVersion) throws PersistenceException {
         save(projectManager.getCurrentProject(), property, originalNameAndVersion);
     }
 
+    @Override
     public void save(Project project, Property property, String... originalNameAndVersion) throws PersistenceException {
         this.repositoryFactoryFromProvider.save(project, property);
         if (property.getItem() instanceof ProcessItem || property.getItem() instanceof JobletProcessItem) {
@@ -1161,6 +1279,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @see org.talend.repository.model.IProxyRepositoryFactory#copy(org.talend.core.model.properties.Item,
      * org.eclipse.core.runtime.IPath)
      */
+    @Override
     public Item copy(Item sourceItem, IPath targetPath) throws PersistenceException, BusinessException {
         if (sourceItem instanceof ProcessItem) {
             try {
@@ -1181,6 +1300,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
     }
 
+    @Override
     public Item copy(Item sourceItem, IPath targetPath, boolean changeLabelWithCopyPrefix) throws PersistenceException,
             BusinessException {
 
@@ -1201,6 +1321,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
     }
 
+    @Override
     public void saveCopy(Item sourceItem, Item targetItem) {
         fireRepositoryPropertyChange(ERepositoryActionName.JOB_COPY.getName(), sourceItem, targetItem);
     }
@@ -1210,6 +1331,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#reload(org.talend.core.model.properties.Property)
      */
+    @Override
     public Property reload(Property property) throws PersistenceException {
         return this.repositoryFactoryFromProvider.reload(property);
     }
@@ -1231,6 +1353,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * org.talend.repository.model.IProxyRepositoryFactory#unlock(org.talend.core.model.repository.IRepositoryViewObject
      * )
      */
+    @Override
     public void unlock(IRepositoryViewObject obj) throws PersistenceException, LoginException {
         unlock(getItem(obj));
     }
@@ -1240,6 +1363,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#unlock(org.talend.core.model.properties.Item)
      */
+    @Override
     public void unlock(Item obj) throws PersistenceException, LoginException {
         if (getStatus(obj) == ERepositoryStatus.LOCK_BY_USER || obj instanceof JobletDocumentationItem
                 || obj instanceof JobDocumentationItem) {
@@ -1258,6 +1382,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                         this.repositoryFactoryFromProvider.unlock(documentationItem);
                     }
                 }
+                notifyLock(obj, false);
                 // i18n
                 // log.debug("Unlock [" + obj + "] by \"" + getRepositoryContext().getUser() + "\".");
                 String str[] = new String[] { obj.toString(), getRepositoryContext().getUser().toString() };
@@ -1287,6 +1412,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#initialize()
      */
+    @Override
     public void initialize() throws PersistenceException {
         this.repositoryFactoryFromProvider.initialize();
     }
@@ -1318,6 +1444,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * org.talend.repository.model.IProxyRepositoryFactory#getStatus(org.talend.core.model.repository.IRepositoryViewObject
      * )
      */
+    @Override
     public ERepositoryStatus getStatus(IRepositoryViewObject obj) {
         if (obj instanceof ISubRepositoryObject) {
             ISubRepositoryObject subRepositoryObject = (ISubRepositoryObject) obj;
@@ -1331,6 +1458,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return getStatus(getItem(obj));
     }
 
+    @Override
     @Deprecated
     public boolean isDeleted(MetadataTable table) {
         // TODO SML/MHE Remove when table are items
@@ -1340,6 +1468,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return false;
     }
 
+    @Override
     public boolean isUserReadOnlyOnCurrentProject() {
         return this.repositoryFactoryFromProvider.isUserReadOnlyOnCurrentProject();
     }
@@ -1349,6 +1478,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#getStatus(org.talend.core.model.properties.Item)
      */
+    @Override
     public ERepositoryStatus getStatus(Item item) {
         ERepositoryStatus toReturn;
         toReturn = this.repositoryFactoryFromProvider.getStatus(item);
@@ -1367,6 +1497,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @see
      * org.talend.repository.model.IProxyRepositoryFactory#getStatus(org.talend.core.model.properties.InformationLevel)
      */
+    @Override
     public ERepositoryStatus getStatus(InformationLevel level) {
 
         if (level.getValue() == InformationLevel.WARN) {
@@ -1390,6 +1521,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * org.talend.repository.model.IProxyRepositoryFactory#isEditableAndLockIfPossible(org.talend.core.model.properties
      * .Item)
      */
+    @Override
     public boolean isEditableAndLockIfPossible(Item item) {
         if (!projectManager.isInCurrentMainProject(item)) {
             return false;
@@ -1440,6 +1572,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * org.talend.repository.model.IProxyRepositoryFactory#isEditableAndLockIfPossible(org.talend.core.model.repository
      * .IRepositoryViewObject)
      */
+    @Override
     public boolean isEditableAndLockIfPossible(IRepositoryViewObject obj) {
         if (obj instanceof ISubRepositoryObject) {
             AbstractMetadataObject abstractMetadataObject = ((ISubRepositoryObject) obj).getAbstractMetadataObject();
@@ -1453,6 +1586,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         }
     }
 
+    @Override
     public org.talend.core.model.properties.Project getProject(Item item) {
         EObject object = EcoreUtil.getRootContainer(item);
         if (object != null && object instanceof org.talend.core.model.properties.Project) {
@@ -1493,6 +1627,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @seeorg.talend.repository.model.IProxyRepositoryFactory#isPotentiallyEditable(org.talend.core.model.repository.
      * IRepositoryViewObject)
      */
+    @Override
     public boolean isPotentiallyEditable(IRepositoryViewObject obj) {
         // referenced project items can't be edited.
         if (!projectManager.getCurrentProject().getLabel().equals(obj.getProjectLabel())) {
@@ -1522,14 +1657,17 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return obj.getProperty().getItem();
     }
 
+    @Override
     public List<org.talend.core.model.properties.Project> getReferencedProjects(Project project) {
         return this.repositoryFactoryFromProvider.getReferencedProjects(project);
     }
 
+    @Override
     public Boolean hasChildren(Object parent) {
         return repositoryFactoryFromProvider.hasChildren(parent);
     }
 
+    @Override
     public synchronized List<ModuleNeeded> getModulesNeededForJobs() throws PersistenceException {
         return this.repositoryFactoryFromProvider.getModulesNeededForJobs();
     }
@@ -1620,10 +1758,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                     coreService.synchronizeSapLib();
                 }
 
-                if (!CommonsPlugin.isHeadless()) {
-                    coreService.initializeTemplates();
-                }
-
                 coreService.resetUniservLibraries();
                 TimeMeasure.step("logOnProject", "sync specific libraries");
 
@@ -1676,19 +1810,23 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return repositoryFactoryFromProvider.setAuthorByLogin(item, login);
     }
 
+    @Override
     public Property getUptodateProperty(Project project, Property property) throws PersistenceException {
         return repositoryFactoryFromProvider.getUptodateProperty(project, property);
     }
 
+    @Override
     public Property getUptodateProperty(Property property) throws PersistenceException {
         return getUptodateProperty(projectManager.getCurrentProject(), property);
     }
 
+    @Override
     public RootContainer<String, IRepositoryViewObject> getMetadata(Project project, ERepositoryObjectType type,
             boolean... options) throws PersistenceException {
         return this.repositoryFactoryFromProvider.getMetadata(project, type, options);
     }
 
+    @Override
     public RootContainer<String, IRepositoryViewObject> getMetadata(ERepositoryObjectType type) throws PersistenceException {
         return getMetadata(projectManager.getCurrentProject(), type);
     }
@@ -1699,6 +1837,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @see
      * org.talend.repository.model.IProxyRepositoryFactory#getRecycleBinItems(org.talend.core.model.general.Project)
      */
+    @Override
     public List<IRepositoryViewObject> getRecycleBinItems(Project project, boolean... options) throws PersistenceException {
         return this.repositoryFactoryFromProvider.getRecycleBinItems(project, options);
     }
@@ -1710,6 +1849,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * org.talend.repository.model.IProxyRepositoryFactory#getSpecificVersion(org.talend.core.model.general.Project,
      * java.lang.String, java.lang.String)
      */
+    @Override
     public IRepositoryViewObject getSpecificVersion(Project project, String id, String version, boolean avoidSaveProject)
             throws PersistenceException {
         List<IRepositoryViewObject> objList = getAllVersion(project, id, avoidSaveProject);
@@ -1726,6 +1866,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#getSpecificVersion(java.lang.String, java.lang.String)
      */
+    @Override
     public IRepositoryViewObject getSpecificVersion(String id, String version, boolean avoidSaveProject)
             throws PersistenceException {
         return getSpecificVersion(projectManager.getCurrentProject(), id, version, avoidSaveProject);
@@ -1735,6 +1876,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         this.repositoryFactoryFromProvider.checkAvailability();
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public void executeRepositoryWorkUnit(RepositoryWorkUnit workUnit) {
         this.repositoryFactoryFromProvider.executeRepositoryWorkUnit(workUnit);
@@ -1759,6 +1901,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         repositoryFactoryFromProvider.unloadResources();
     }
 
+    @Override
     public FolderItem getFolderItem(Project project, ERepositoryObjectType itemType, IPath path) {
         return repositoryFactoryFromProvider.getFolderItem(project, itemType, path);
     }
@@ -1788,6 +1931,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * org.talend.repository.model.IProxyRepositoryFactory#addRepositoryWorkUnitListener(org.talend.core.model.repository
      * .IRepositoryWorkUnitListener)
      */
+    @Override
     public void addRepositoryWorkUnitListener(IRepositoryWorkUnitListener listener) {
         repositoryFactoryFromProvider.addRepositoryWorkUnitListener(listener);
     }
@@ -1797,6 +1941,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#enableSandboxProject()
      */
+    @Override
     public boolean enableSandboxProject() throws PersistenceException {
         return repositoryFactoryFromProvider.enableSandboxProject();
     }
@@ -1806,6 +1951,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * 
      * @see org.talend.repository.model.IProxyRepositoryFactory#isLocalConnectionProvider()
      */
+    @Override
     public boolean isLocalConnectionProvider() throws PersistenceException {
         return repositoryFactoryFromProvider.isLocalConnectionProvider();
     }
@@ -1817,6 +1963,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * org.talend.repository.model.IProxyRepositoryFactory#getMetadataByFolder(org.talend.core.model.general.Project,
      * org.talend.core.model.repository.ERepositoryObjectType, org.eclipse.core.runtime.IPath)
      */
+    @Override
     public List<IRepositoryViewObject> getMetadataByFolder(Project project, ERepositoryObjectType itemType, IPath path) {
         return repositoryFactoryFromProvider.getMetadataByFolder(project, itemType, path);
     }
@@ -1827,6 +1974,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
      * @seeorg.talend.repository.model.IProxyRepositoryFactory#getMetadataByFolder(org.talend.core.model.repository.
      * ERepositoryObjectType, org.eclipse.core.runtime.IPath)
      */
+    @Override
     public List<IRepositoryViewObject> getMetadataByFolder(ERepositoryObjectType itemType, IPath path) {
         return repositoryFactoryFromProvider.getMetadataByFolder(projectManager.getCurrentProject(), itemType, path);
     }
@@ -1883,11 +2031,19 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
         return null;
     }
 
+    @Override
     public LockInfo getLockInfo(Item item) {
         return repositoryFactoryFromProvider.getLockInfo(item);
     }
 
+    @Override
     public String getNavigatorViewDescription() {
         return repositoryFactoryFromProvider.getNavigatorViewDescription();
     }
+
+    @Override
+    public void updateLockStatus() throws PersistenceException {
+        this.repositoryFactoryFromProvider.updateLockStatus();
+
+    }
 }

org.talend.core.repository/src/main/java/org/talend/core/repository/utils/XmiResourceManager.java

@@ -623,6 +623,11 @@ public class XmiResourceManager {
         }
 
         for (Resource resource : resourcesToSave) {
+            // add for bug TDI-20844
+            if (ResourceFilenameHelper.mustChangeLabel(fileNameTest) && resource.getURI() != null
+                    && resource.getURI().toString().endsWith(".screenshot")) {
+                continue;
+            }
             saveResource(resource);
         }
         if (!resourceProperty.equals(lastVersionProperty)) {

org.talend.core.repository/src/main/java/org/talend/repository/model/ProjectRepositoryNode.java

@@ -134,8 +134,6 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
 
     private RepositoryNode refProject;
 
-    private boolean mergeRefProject;
-
     public static boolean refProjectBool = false;
 
     public static boolean refreshBool = false;
@@ -1785,10 +1783,12 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
      * 
      * @see org.talend.repository.model.IProjectRepositoryNode#getProject()
      */
+    @Override
     public org.talend.core.model.general.Project getProject() {
         return this.project;
     }
 
+    @Override
     public RepositoryNode getRootRepositoryNode(ERepositoryObjectType type) {
         if (type == null) {
             return null;
@@ -1805,20 +1805,25 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
      * 
      * @see org.talend.repository.model.nodes.IProjectRepositoryNode#getRecBinNode()
      */
+    @Override
     public RepositoryNode getRecBinNode() {
         return this.recBinNode;
     }
 
     public boolean getMergeRefProject() {
         IPreferenceStore preferenceStore = RepositoryManager.getPreferenceStore();
-        this.mergeRefProject = preferenceStore.getBoolean(IRepositoryPrefConstants.MERGE_REFERENCE_PROJECT);
-        return this.mergeRefProject;
+        return preferenceStore.getBoolean(IRepositoryPrefConstants.MERGE_REFERENCE_PROJECT);
     }
 
     @Override
     public String getLabel() {
-        if (getProject() != null) {
-            return getProject().getLabel();
+        if (getProject() != null) {// compute branch url to add to the project label.
+            String urlBranch = null;
+            if (ProjectManager.getInstance().getCurrentBranchURL(project) != null) {
+                urlBranch = showSVNRoot();
+            }
+
+            return getProject().getLabel() + (urlBranch != null && !"".equals(urlBranch) ? '(' + urlBranch + ')' : ""); //$NON-NLS-1$//$NON-NLS-2$
         }
         return super.getLabel();
     }

org.talend.core.repository/src/main/java/org/talend/repository/model/SAPIDocRepositoryObject.java

@@ -136,4 +136,14 @@ public class SAPIDocRepositoryObject extends RepositoryObject implements ISubRep
         return iDocUnit;
     }
 
+    @Override
+    public IRepositoryNode getRepositoryNode() {
+        return repObj.getRepositoryNode();
+    }
+
+    @Override
+    public boolean isDeleted() {
+        return this.getProperty().getItem().getState().isDeleted();
+    }
+
 }

org.talend.core.repository/src/main/java/org/talend/repository/ui/actions/DeleteAction.java

@@ -74,7 +74,6 @@ import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.Folder;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.RepositoryManager;
-import org.talend.core.model.utils.RepositoryManagerHelper;
 import org.talend.core.repository.i18n.Messages;
 import org.talend.core.repository.model.ISubRepositoryObject;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
@@ -100,7 +99,6 @@ import org.talend.repository.model.RepositoryNode;
 import org.talend.repository.model.RepositoryNodeUtilities;
 import org.talend.repository.ui.dialog.ContextReferenceDialog;
 import org.talend.repository.ui.dialog.JobletReferenceDialog;
-import org.talend.repository.ui.views.IRepositoryView;
 
 /**
  * Action used to delete object from repository. This action manages logical and physical deletions.<br/>
@@ -126,6 +124,10 @@ public class DeleteAction extends AContextualAction {
         this.setImageDescriptor(ImageProvider.getImageDesc(EImage.DELETE_ICON));
         //        this.setActionDefinitionId("deleteItem"); //$NON-NLS-1$
         singleton = this;
+
+        // for restore, unload after, not before, since the state will change (item was normal, and change to "deleted")
+        this.setUnloadResourcesAfter(true);
+        this.setAvoidUnloadResources(true);
     }
 
     public static DeleteAction getInstance() {
@@ -295,7 +297,7 @@ public class DeleteAction extends AContextualAction {
         };
 
         try {
-            PlatformUI.getWorkbench().getProgressService().run(true, true, iRunnableWithProgress);
+            PlatformUI.getWorkbench().getProgressService().run(false, false, iRunnableWithProgress);
         } catch (Exception e) {
             ExceptionHandler.process(e);
         }
@@ -311,15 +313,6 @@ public class DeleteAction extends AContextualAction {
                         service.updatePalette();
                     }
 
-                    if (!CoreRuntimePlugin.getInstance().isDataProfilePerspectiveSelected()) {
-                        RepositoryManager.refresh(ERepositoryObjectType.JOB_SCRIPT);
-                        // bug 16594
-                        IRepositoryView repositoryView = RepositoryManagerHelper.getRepositoryView();
-                        if (repositoryView != null) {
-                            repositoryView.refresh();
-                        }
-                    }
-
                     IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
                     for (IEditorReference editors : page.getEditorReferences()) {
                         if (GlobalServiceRegister.getDefault().isServiceRegistered(IDiagramModelService.class)) {
@@ -919,7 +912,7 @@ public class DeleteAction extends AContextualAction {
                 && nodeObject.getProperty().getItem() != null
                 && (nodeObject.getRepositoryStatus() == ERepositoryStatus.LOCK_BY_OTHER
                         || nodeObject.getRepositoryStatus() == ERepositoryStatus.LOCK_BY_USER || RepositoryManager
-                        .isOpenedItemInEditor(nodeObject)) && !(DELETE_FOREVER_TITLE.equals(getText()))) {
+                            .isOpenedItemInEditor(nodeObject)) && !(DELETE_FOREVER_TITLE.equals(getText()))) {
 
             final String title = Messages.getString("DeleteAction.error.title"); //$NON-NLS-1$
             String nodeName = ERepositoryObjectType.getDeleteFolderName(nodeObject.getRepositoryObjectType());
@@ -978,7 +971,7 @@ public class DeleteAction extends AContextualAction {
         return deleteElements(factory, deleteActionCache, currentJobNode, null);
     }
 
-    boolean confirmFromDialog = false;
+    protected boolean confirmFromDialog = false;
 
     private boolean deleteElements(IProxyRepositoryFactory factory, DeleteActionCache deleteActionCache,
             final RepositoryNode currentJobNode, Boolean confirm) throws PersistenceException, BusinessException {

org.talend.core.repository/src/main/java/org/talend/repository/ui/actions/DuplicateAction.java

@@ -371,6 +371,8 @@ public class DuplicateAction extends AContextualAction {
                     item = PropertiesFactory.eINSTANCE.createSVGBusinessProcessItem();
                 } else if (repositoryType == ERepositoryObjectType.METADATA_EDIFACT) {
                     item = PropertiesFactory.eINSTANCE.createEDIFACTConnectionItem();
+                } else if (repositoryType == ERepositoryObjectType.METADATA_VALIDATION_RULES) {
+                    item = PropertiesFactory.eINSTANCE.createValidationRulesConnectionItem();
                 }
                 if (item == null) {
                     for (IRepositoryContentHandler handler : RepositoryContentManager.getHandlers()) {

org.talend.core.repository/src/main/java/org/talend/repository/ui/actions/EmptyRecycleBinAction.java

@@ -39,7 +39,6 @@ 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.commons.utils.platform.PluginChecker;
 import org.talend.core.GlobalServiceRegister;
 import org.talend.core.ITDQRepositoryService;
 import org.talend.core.model.properties.Item;
@@ -57,7 +56,6 @@ import org.talend.repository.model.IRepositoryNode;
 import org.talend.repository.model.IRepositoryNode.ENodeType;
 import org.talend.repository.model.RepositoryNode;
 import org.talend.repository.model.RepositoryNodeUtilities;
-import org.talend.repository.ui.views.IRepositoryView;
 
 /**
  * Action used to empty the recycle bin.<br/>
@@ -158,14 +156,15 @@ public class EmptyRecycleBinAction extends AContextualAction {
             ExceptionHandler.process(e);
         }
 
+        // TDI-21238, have done listener to refresh in new CNF repository view
         // MOD qiongli 2011-1-24,avoid to refresh repositoryView for top
-        if (!PluginChecker.isOnlyTopLoaded()) {
-            RepositoryManager.refresh(ERepositoryObjectType.JOB_SCRIPT);
-            IRepositoryView view = getViewPart();
-            if (view != null) {
-                view.refresh();
-            }
-        }
+        // if (!PluginChecker.isOnlyTopLoaded()) {
+        // RepositoryManager.refresh(ERepositoryObjectType.JOB_SCRIPT);
+        // IRepositoryView view = getViewPart();
+        // if (view != null) {
+        // view.refresh();
+        // }
+        // }
 
     }
 

org.talend.core.repository/src/main/java/org/talend/repository/ui/actions/RestoreAction.java

@@ -12,17 +12,26 @@
 // ============================================================================
 package org.talend.repository.ui.actions;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+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.Path;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.runtime.image.EImage;
@@ -35,7 +44,6 @@ import org.talend.core.model.properties.FolderItem;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
-import org.talend.core.model.utils.RepositoryManagerHelper;
 import org.talend.core.repository.i18n.Messages;
 import org.talend.core.repository.model.ISubRepositoryObject;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
@@ -47,7 +55,6 @@ import org.talend.repository.model.IRepositoryNode;
 import org.talend.repository.model.IRepositoryNode.EProperties;
 import org.talend.repository.model.RepositoryNode;
 import org.talend.repository.model.actions.RestoreObjectAction;
-import org.talend.repository.ui.views.IRepositoryView;
 
 /**
  * Action used to restore obects that had been logically deleted.<br/>
@@ -69,6 +76,11 @@ public class RestoreAction extends AContextualAction {
         this.setToolTipText(Messages.getString("RestoreAction.action.toolTipText")); //$NON-NLS-1$
         this.setImageDescriptor(ImageProvider.getImageDesc(EImage.RESTORE_ICON));
         this.setActionDefinitionId("restoreItem"); //$NON-NLS-1$
+
+        // for restore, unload after, not before, since the state will change (item was deleted, and change to
+        // "not deleted")
+        this.setUnloadResourcesAfter(true);
+        this.setAvoidUnloadResources(true);
     }
 
     protected void restoreNode(RepositoryNode node) {
@@ -110,17 +122,6 @@ public class RestoreAction extends AContextualAction {
                         factory.restoreObject(docObject, path);
                     }
                 }
-                // disable SVG actions
-                // if (PluginChecker.isTIS()) {
-                // if (node.getObject() != null) {
-                // if (ERepositoryObjectType.BUSINESS_PROCESS.equals(node.getObject().getRepositoryObjectType())) {
-                //                            IRepositoryViewObject svgObjectToMove = factory.getLastVersion("svg_" + node.getObject().getId()); //$NON-NLS-1$
-                // if (svgObjectToMove != null) {
-                // factory.restoreObject(svgObjectToMove, path);
-                // }
-                // }
-                // }
-                // }
             }
             if (nodeType == ERepositoryObjectType.JOBLET) {
                 needToUpdatePalette = true;
@@ -145,40 +146,69 @@ public class RestoreAction extends AContextualAction {
     @Override
     protected void doRun() {
         // used to store the database connection object that are used to notify the sqlBuilder.
-        ISelection selection = getSelection();
+        final ISelection selection = getSelection();
 
         connections = new ArrayList<IRepositoryViewObject>();
         procItems = new HashMap<String, Item>();
         needToUpdatePalette = false;
-        IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
 
-        for (Object obj : ((IStructuredSelection) selection).toArray()) {
-            if (obj instanceof RepositoryNode) {
-                RepositoryNode node = (RepositoryNode) obj;
-                restoreNode(node);
+        final IWorkspaceRunnable op = new IWorkspaceRunnable() {
 
-                // restore parents folder if deleted also
+            public void run(IProgressMonitor monitor) {
+                IProxyRepositoryFactory factory = ProxyRepositoryFactory.getInstance();
 
-                while (node.getParent().getObject() != null
-                        && factory.getStatus(node.getParent().getObject()) == ERepositoryStatus.DELETED) {
-                    node = node.getParent();
-                    if (node.getObject().getProperty().getItem() instanceof FolderItem) {
-                        node.getObject().getProperty().getItem().getState().setDeleted(false);
+                for (Object obj : ((IStructuredSelection) selection).toArray()) {
+                    if (obj instanceof RepositoryNode) {
+                        RepositoryNode node = (RepositoryNode) obj;
+                        restoreNode(node);
+
+                        // restore parents folder if deleted also
+
+                        while (node.getParent().getObject() != null
+                                && factory.getStatus(node.getParent().getObject()) == ERepositoryStatus.DELETED) {
+                            node = node.getParent();
+                            if (node.getObject().getProperty().getItem() instanceof FolderItem) {
+                                node.getObject().getProperty().getItem().getState().setDeleted(false);
+                            }
+
+                        }
                     }
-
                 }
+                try {
+                    factory.saveProject(ProjectManager.getInstance().getCurrentProject());
+                    for (String id : procItems.keySet()) {
+                        Item item = procItems.get(id);
+                        factory.save(item);
+                    }
+                } catch (PersistenceException e) {
+                    ExceptionHandler.process(e);
+                }
+                procItems = null;
             }
-        }
+        };
+
+        IRunnableWithProgress iRunnableWithProgress = new IRunnableWithProgress() {
+
+            public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+                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(op, schedulingRule, IWorkspace.AVOID_UPDATE, monitor);
+                } catch (CoreException e) {
+                    throw new InvocationTargetException(e);
+                }
+
+            }
+        };
+
         try {
-            factory.saveProject(ProjectManager.getInstance().getCurrentProject());
-            for (String id : procItems.keySet()) {
-                Item item = procItems.get(id);
-                factory.save(item);
-            }
-        } catch (PersistenceException e) {
+            PlatformUI.getWorkbench().getProgressService().run(false, false, iRunnableWithProgress);
+        } catch (Exception e) {
             ExceptionHandler.process(e);
         }
-        procItems = null;
 
         // MOD qiongli 2011-1-24,avoid to refresh repositoryView for top
         if (!org.talend.commons.utils.platform.PluginChecker.isOnlyTopLoaded()) {
@@ -186,14 +216,9 @@ public class RestoreAction extends AContextualAction {
             Display.getCurrent().syncExec(new Runnable() {
 
                 public void run() {
-                    // bug 16594
-                    IRepositoryView repositoryView = RepositoryManagerHelper.getRepositoryView();
-                    if (repositoryView != null) {
-                        repositoryView.refresh();
-                    }
-
                     if (updatePalette && GlobalServiceRegister.getDefault().isServiceRegistered(ICoreService.class)) {
-                        ICoreService service = (ICoreService) GlobalServiceRegister.getDefault().getService(ICoreService.class);
+                        ICoreService service = (ICoreService) GlobalServiceRegister.getDefault().getService(
+                                ICoreService.class);
                         service.updatePalette();
                     }
                 }

org.talend.core.repository/src/main/java/org/talend/repository/ui/utils/RecombineRepositoryNodeUtil.java

@@ -15,7 +15,6 @@ package org.talend.repository.ui.utils;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.talend.commons.utils.time.TimeMeasure;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.repository.model.IRepositoryNode;
 import org.talend.repository.model.ProjectRepositoryNode;
@@ -53,17 +52,17 @@ public final class RecombineRepositoryNodeUtil {
 
     private IRepositoryNode getFixingTypesInputRoot(IProjectRepositoryNode projectRepoNode) {
         RepositoryNode tmpRootNode = new RepositoryNode(null, null, null);
-        TimeMeasure.step(RecombineRepositoryNodeUtil.class.getSimpleName(), "before getInputRoot, in MultiTypesProcessor"); //$NON-NLS-1$
+        //        TimeMeasure.step(RecombineRepositoryNodeUtil.class.getSimpleName(), "before getInputRoot, in MultiTypesProcessor"); //$NON-NLS-1$
 
         List<RepositoryNode> rootNodes = getRepositoryNodesByTypes(projectRepoNode);
-        TimeMeasure.step(RecombineRepositoryNodeUtil.class.getSimpleName(), "finished main project, in MultiTypesProcessor"); //$NON-NLS-1$ 
+        //        TimeMeasure.step(RecombineRepositoryNodeUtil.class.getSimpleName(), "finished main project, in MultiTypesProcessor"); //$NON-NLS-1$ 
 
         if (rootNodes != null) {
             tmpRootNode.getChildren().addAll(rootNodes);
         }
         // referenced project.
         addSubReferencedProjectNodes(tmpRootNode, projectRepoNode);
-        TimeMeasure.step(RecombineRepositoryNodeUtil.class.getSimpleName(), "finished ref-projects, in MultiTypesProcessor"); //$NON-NLS-1$
+        //        TimeMeasure.step(RecombineRepositoryNodeUtil.class.getSimpleName(), "finished ref-projects, in MultiTypesProcessor"); //$NON-NLS-1$
 
         return tmpRootNode;
     }

org.talend.core.repository/src/main/java/org/talend/repository/ui/views/RepositoryDropAdapter.java

@@ -20,6 +20,8 @@ import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
@@ -30,6 +32,7 @@ import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DropTargetEvent;
 import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.ui.part.PluginDropAdapter;
+import org.osgi.framework.FrameworkUtil;
 import org.talend.commons.exception.LoginException;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
@@ -366,15 +369,33 @@ public class RepositoryDropAdapter extends PluginDropAdapter {
 
                 @Override
                 protected void run() throws LoginException, PersistenceException {
+                    final IWorkspaceRunnable op = new IWorkspaceRunnable() {
+
+                        public void run(IProgressMonitor monitor) throws CoreException {
+                            try {
+                                for (Object obj : ((StructuredSelection) data).toArray()) {
+                                    final RepositoryNode sourceNode = (RepositoryNode) obj;
+                                    monitor.subTask(Messages.getString("RepositoryDropAdapter.moving") + sourceNode.getObject().getLabel()); //$NON-NLS-1$
+                                    MoveObjectAction.getInstance().execute(sourceNode, targetNode, true);
+                                }
+                            } catch (Exception e) {
+                                throw new CoreException(new org.eclipse.core.runtime.Status(IStatus.ERROR, FrameworkUtil
+                                        .getBundle(this.getClass()).getSymbolicName(), "Error", e));
+                            }
+                        };
+
+                    };
+                    IWorkspace workspace = ResourcesPlugin.getWorkspace();
                     try {
-                        for (Object obj : ((StructuredSelection) data).toArray()) {
-                            final RepositoryNode sourceNode = (RepositoryNode) obj;
-                            monitor.subTask(Messages.getString("RepositoryDropAdapter.moving") + sourceNode.getObject().getLabel()); //$NON-NLS-1$
-                            MoveObjectAction.getInstance().execute(sourceNode, targetNode, true);
-                        }
-                    } catch (Exception e) {
-                        throw new PersistenceException(e);
+                        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(op, schedulingRule, IWorkspace.AVOID_UPDATE, new NullProgressMonitor());
+                    } catch (CoreException e) {
+                        throw new PersistenceException(e.getCause());
                     }
+
                 }
             };
             ProxyRepositoryFactory.getInstance().executeRepositoryWorkUnit(repositoryWorkUnit);

org.talend.core.repository/src/main/java/org/talend/repository/utils/LoginTaskRegistryReader.java

@@ -0,0 +1,151 @@
+// ============================================================================
+//
+// 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.repository.utils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.SafeRunner;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.osgi.framework.FrameworkUtil;
+import org.talend.core.utils.RegistryReader;
+
+/**
+ * This provides data for extensions points extending org.talend.core.repository.loginTask
+ * 
+ */
+public class LoginTaskRegistryReader extends RegistryReader {
+
+    /**
+     * 
+     */
+    private static final String PRIORITY_ATTRIBUTE = "priority"; //$NON-NLS-1$
+
+    static class LoginTask {
+
+        public final IRunnableWithProgress runnable;
+
+        public final Priority priority;
+
+        enum Priority {
+            LOWEST,
+            LOW,
+            NORMAL,
+            HIGH,
+            HIGHEST
+        }
+
+        /**
+         * DOC sgandon LoginTaskRegistryReader.LoginTask constructor comment.
+         */
+        public LoginTask(IRunnableWithProgress runnable, Priority priority) {
+            this.runnable = runnable;
+            this.priority = priority;
+        }
+    }
+
+    /**
+     * 
+     */
+    private static final String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
+
+    /**
+     * 
+     */
+    private static final String LOGIN_TASK_ELEMENT_NAME = "loginTask"; //$NON-NLS-1$
+
+    /**
+     * extension point Id
+     */
+    private static final String LOGIN_TASK_EXTENSION_POINT = "login.task"; //$NON-NLS-1$
+
+    protected List<LoginTask> allLoginTasks;// must use raw type cause the api used is return raw type
+
+    /**
+     * DOC sgandon LoginTaskRegistryReader constructor comment.
+     * 
+     * @param aPluginId
+     * @param anExtensionPoint
+     */
+    public LoginTaskRegistryReader() {
+        super(FrameworkUtil.getBundle(LoginTaskRegistryReader.class).getSymbolicName(), LOGIN_TASK_EXTENSION_POINT);
+    }
+
+    public IRunnableWithProgress[] getAllTaskListInstance() {
+        if (allLoginTasks == null) {
+            allLoginTasks = new ArrayList<LoginTask>();
+            readRegistry();
+        }
+        sortLoginTasks(allLoginTasks);
+        return getAllRunnables(allLoginTasks);
+    }
+
+    /**
+     * DOC sgandon Comment method "getAllRunnables".
+     * 
+     * @param allLoginTasks2
+     * @return
+     */
+    private IRunnableWithProgress[] getAllRunnables(List<LoginTask> allLoginTasks2) {
+        IRunnableWithProgress[] runnables = new IRunnableWithProgress[allLoginTasks2.size()];
+        int i = 0;
+        for (LoginTask loginTask : allLoginTasks2) {
+            runnables[i++] = loginTask.runnable;
+        }
+        return runnables;
+    }
+
+    /**
+     * sort all login task according to the priority
+     * 
+     * @param allLoginTasks2
+     */
+    private void sortLoginTasks(List<LoginTask> allLoginTasks2) {
+        Collections.sort(allLoginTasks2, new Comparator<LoginTask>() {
+
+            @Override
+            public int compare(LoginTask arg0, LoginTask arg1) {
+                return arg1.priority.compareTo(arg0.priority);
+            }
+        });
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.talend.core.utils.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
+     */
+    @Override
+    protected boolean readElement(final IConfigurationElement element) {
+        if (LOGIN_TASK_ELEMENT_NAME.equals(element.getName())) {
+            SafeRunner.run(new RegistryReader.RegistrySafeRunnable() {
+
+                @Override
+                public void run() throws Exception {
+                    IRunnableWithProgress runnable = (IRunnableWithProgress) element.createExecutableExtension(CLASS_ATTRIBUTE);
+                    String priorityString = element.getAttribute(PRIORITY_ATTRIBUTE);
+                    LoginTask.Priority priority = (priorityString != null && priorityString.length() > 0) ? LoginTask.Priority
+                            .valueOf(priorityString.toUpperCase()) : LoginTask.Priority.NORMAL;
+                    allLoginTasks.add(new LoginTask(runnable, priority));
+                }
+
+            });
+            return true;
+        }// else return false
+        return false;
+    }
+}

org.talend.core.runtime.nl/src/main/java/messages_fr.properties

@@ -301,7 +301,7 @@ repository.jobletdoc=Documentation du Joblet
 repository.joblets=Joblets
 repository.jobs=Jobs
 repository.metadata=Métadonnées
-repository.metadataConnections=Connexions
+repository.metadataConnections=Bases de données
 repository.metadataConnections.alias=BdD
 repository.metadataFileEDCDIC=Copybook
 repository.metadataMDMConnections=Talend MDM
@@ -429,6 +429,7 @@ EConnectionType.when=When
 EConnectionType.otherwise=Otherwise
 repository.code=Code
 repository.service=Services
+ConnectionBean.Remote=Distant
 EComponentCategory.availableExtensions=Extensions disponibles
 EComponentCategory.downloadedExtensions=Extensions téléchargées
 EComponentCategory.myExtensions=Mes extensions
@@ -440,3 +441,4 @@ TalendDataCollectorUploadingPreferencePage_UploadPeriod=P
 TalendDataCollectorUploadingPreferencePage_Days=Jours
 repository.servicesOperation=Opération
 repository.servicesPort=Port
+BinRepositoryNode.label=Corbeille

org.talend.core.runtime.test/.classpath

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

org.talend.core.runtime.test/.project

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

org.talend.core.runtime.test/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,8 @@
+#Tue May 22 14:20:11 CST 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

org.talend.core.runtime.test/META-INF/MANIFEST.MF

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

org.talend.core.runtime.test/build.properties

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

org.talend.core.runtime.test/src/org/talend/core/model/utils/UpdateRepositoryHelperTest.java

@@ -0,0 +1,87 @@
+// ============================================================================
+//
+// 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.core.model.utils;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.talend.core.model.metadata.builder.connection.ConnectionFactory;
+import org.talend.core.model.metadata.builder.connection.DatabaseConnection;
+import org.talend.core.model.properties.ContextItem;
+import org.talend.core.model.properties.DatabaseConnectionItem;
+import org.talend.core.model.properties.ItemState;
+import org.talend.core.model.properties.PropertiesFactory;
+import org.talend.core.model.properties.Property;
+
+/**
+ * DOC hcyi class global comment. Detailled comment
+ */
+public class UpdateRepositoryHelperTest {
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.utils.UpdateRepositoryHelper#getRepositorySourceName(org.talend.core.model.properties.Item)}
+     * .
+     */
+    @Test
+    public void testGetRepositorySourceName() {
+        // Test DatabaseConnectionItem
+        DatabaseConnectionItem databaseConnItem = PropertiesFactory.eINSTANCE.createDatabaseConnectionItem();
+        Property myProperty = PropertiesFactory.eINSTANCE.createProperty();
+        ItemState itemState = PropertiesFactory.eINSTANCE.createItemState();
+        DatabaseConnection databaseConnection = ConnectionFactory.eINSTANCE.createDatabaseConnection();
+        //
+        myProperty.setId("_bK4nYKPgEeGSwOgmctA-XA");
+        myProperty.setLabel("mysql");
+        myProperty.setVersion("0.1");
+        //
+        itemState.setPath("");
+        //
+        databaseConnection.setName("mysql");
+        databaseConnection.setLabel("mysql");
+        databaseConnection.setDatabaseType("MySQL");
+        databaseConnection.setURL("jdbc:mysql://127.0.0.1:3306/go?noDatetimeStringSync=true");
+        databaseConnection.setDriverClass("org.gjt.mm.mysql.Driver");
+        databaseConnection.setDbVersionString("MYSQL_5");
+        databaseConnection.setPort("3306");
+        databaseConnection.setUsername("root");
+        databaseConnection.setPassword("ekQFUSSa83o=");
+        databaseConnection.setServerName("127.0.0.1");
+        databaseConnection.setProductId("MYSQL");
+        databaseConnection.setAdditionalParams("noDatetimeStringSync=true");
+        //
+        databaseConnItem.setProperty(myProperty);
+        databaseConnItem.setState(itemState);
+        databaseConnItem.setConnection(databaseConnection);
+
+        assertEquals("DB (MYSQL):mysql", UpdateRepositoryHelper.getRepositorySourceName(databaseConnItem));
+
+        // Test ContextItem
+        ContextItem contextItem = PropertiesFactory.eINSTANCE.createContextItem();
+        Property myContextProperty = PropertiesFactory.eINSTANCE.createProperty();
+        ItemState contextItemState = PropertiesFactory.eINSTANCE.createItemState();
+        //
+        myContextProperty.setId("_DHiJ0KPlEeGSwOgmctA-XA");
+        myContextProperty.setLabel("testContext");
+        myContextProperty.setVersion("0.1");
+        //
+        contextItemState.setPath("");
+        //
+        contextItem.setProperty(myContextProperty);
+        contextItem.setState(contextItemState);
+        contextItem.setDefaultContext("Default");
+
+        assertEquals("Context:testContext", UpdateRepositoryHelper.getRepositorySourceName(contextItem));
+
+    }
+}

org.talend.core.runtime/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +0,0 @@
-#Wed Dec 08 15:09:01 CST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

org.talend.core.runtime/META-INF/MANIFEST.MF

@@ -11,6 +11,7 @@ Export-Package: org.talend.core,
  org.talend.core.database.conn,
  org.talend.core.database.conn.template,
  org.talend.core.database.conn.version,
+ org.talend.core.exception,
  org.talend.core.language,
  org.talend.core.model.business,
  org.talend.core.model.components,

org.talend.core.runtime/src/main/java/org/talend/core/ITDQRepositoryService.java

@@ -17,11 +17,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.ui.IViewPart;
 import org.talend.core.model.properties.ConnectionItem;
 import org.talend.core.model.properties.ContextItem;
 import org.talend.core.model.properties.Item;
+import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.repository.model.IRepositoryNode;
+import org.talend.utils.sugars.ReturnCode;
 
 /**
  * DOC bZhou class global comment. Detailled comment
@@ -46,6 +49,9 @@ public interface ITDQRepositoryService extends IService {
 
     public void refresh();
 
+    // Added 20120503 yyin
+    public void refresh(Object refreshObject);
+
     public void initProxyRepository();
 
     public void addPartListener();
@@ -61,7 +67,7 @@ public interface ITDQRepositoryService extends IService {
     public void reloadDatabase(ContextItem contextItem);
 
     // ADD zshen 2012-1-6 TDQ-4384
-    public void reloadDatabase(ConnectionItem connectionItem);
+    public ReturnCode reloadDatabase(ConnectionItem connectionItem);
 
     // ADD qiongli 2011-9-13 TDQ-3797
     public void updateImpactOnAnalysis(ConnectionItem connectionItem);
@@ -72,4 +78,16 @@ public interface ITDQRepositoryService extends IService {
     // ADD qiongli 2012-4-19 TDQ-5130
     public boolean hasClientDependences(ConnectionItem connectionItem);
 
+    // ADD zshen 2012-5-9 TDQ-4738
+    public int confimDelete(IRepositoryViewObject deleteObject);
+
+    // ADD zshen 2012-5-9 TDQ-4738
+    // public boolean deleteObjectPhysical(IRepositoryViewObject deleteObject, Item newItem);
+
+    // ADD zshen 2012-5-9 TDQ-4738
+    public InputDialog getInputDialog(final Item newItem);
+
+    // ADD zshen 2012-5-9 TDQ-4738
+    public void changeElementName(Item newItem, String newName);
+
 }

org.talend.core.runtime/src/main/java/org/talend/core/exception/TalendInternalPersistenceException.java

@@ -0,0 +1,28 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2011 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.core.exception;
+
+import org.talend.commons.exception.PersistenceException;
+
+/**
+ * DOC zshen  class global comment. Detailled comment
+ */
+public class TalendInternalPersistenceException extends PersistenceException {
+
+
+    private static final long serialVersionUID = 6242818542268554273L;
+
+    public TalendInternalPersistenceException(String msg) {
+        super(msg);
+    }
+}

org.talend.core.runtime/src/main/java/org/talend/core/model/repository/IRepositoryPrefConstants.java

@@ -41,6 +41,8 @@ public interface IRepositoryPrefConstants {
 
     public static final String USE_FILTER = "use_filter";
 
+    public static final String USE_PERSPECTIVE_FILTER = "use_perspective_filter";
+
     public static final String USE_EXPORT_SAVE = "use_export_save_for_jobscript";
 
     public static final String ALLOW_SPECIFIC_CHARACTERS_FOR_SCHEMA_COLUMNS = "allow_specific_characters_for_schema_columns";

org.talend.core.runtime/src/main/java/org/talend/core/model/repository/RepositoryViewObject.java

@@ -19,12 +19,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.runtime.image.ECoreImage;
@@ -303,9 +299,10 @@ public class RepositoryViewObject implements IRepositoryViewObject {
             return property;
         } catch (PersistenceException e) {
             exception = e;
-            if (!CommonsPlugin.isHeadless() && PlatformUI.isWorkbenchRunning()) {
-                MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error", exception.getMessage());
-            }
+            ExceptionHandler.process(e);
+            // if (!CommonsPlugin.isHeadless() && PlatformUI.isWorkbenchRunning()) {
+            // MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error", exception.getMessage());
+            // }
         }
         return null;
     }

org.talend.core.runtime/src/main/java/org/talend/core/ui/context/ContextTableValuesComposite.java

@@ -244,8 +244,16 @@ public class ContextTableValuesComposite extends AbstractContextTabEditComposite
 
                     @Override
                     public void sort(Viewer viewer, Object[] elements) {
-                        while (index < table.getColumns().length && table.getColumn(index) != column) {
-                            index++;
+                        boolean found = false;
+                        // find the sort column index
+                        for (index = 0; index < table.getColumns().length; index++) {
+                            if (table.getColumn(index) == table.getSortColumn()) {
+                                found = true;
+                                break;
+                            }
+                        }
+                        if (!found) {
+                            index = 0; // first one as default
                         }
                         super.sort(viewer, elements);
                     }

org.talend.core.runtime/src/main/java/org/talend/core/ui/context/model/table/GroupBySourceTableProvider.java

@@ -70,14 +70,17 @@ public class GroupBySourceTableProvider extends ContextProviderProxy {
      */
     private IContextParameter lookupContextParameter(String sourceId, String contextParaName, int index) {
         List<IContext> contextList = parentModel.getContexts();
-        IContext context = contextList.get(index);
-        List<IContextParameter> list = context.getContextParameterList();
-        if (list != null && list.size() > 0) {
-            for (IContextParameter contextPara : list) {
-                String tempSourceId = contextPara.getSource();
-                String tempContextParaName = contextPara.getName();
-                if (tempSourceId.equals(sourceId) && tempContextParaName.equals(contextParaName)) {
-                    return contextPara;
+        int size = contextList.size();
+        if (index < size) {
+            IContext context = contextList.get(index);
+            List<IContextParameter> list = context.getContextParameterList();
+            if (list != null && list.size() > 0) {
+                for (IContextParameter contextPara : list) {
+                    String tempSourceId = contextPara.getSource();
+                    String tempContextParaName = contextPara.getName();
+                    if (tempSourceId.equals(sourceId) && tempContextParaName.equals(contextParaName)) {
+                        return contextPara;
+                    }
                 }
             }
         }
@@ -130,10 +133,11 @@ public class GroupBySourceTableProvider extends ContextProviderProxy {
         String text = "";
         String sourceId = child.getContextParameter().getSource();
         String variableName = child.getContextParameter().getName();
+        List<IContext> contextList = parentModel.getContexts();
+        int size = contextList.size();
         if (columnIndex == 0)
             return child.getContextParameter().getName();
-        else {
-            List<IContext> contextList = parentModel.getContexts();
+        else if (columnIndex - 1 < size) {
             IContext context = contextList.get(columnIndex - 1);
             List<IContextParameter> list = context.getContextParameterList();
             if (list != null && list.size() > 0) {

org.talend.core.runtime/src/main/java/org/talend/core/utils/RegistryReader.java

@@ -10,7 +10,7 @@
 // 9 rue Pages 92150 Suresnes, France
 //
 // ============================================================================
-package org.talend.repository.viewer.filter;
+package org.talend.core.utils;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -22,6 +22,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.ISafeRunnable;
 import org.eclipse.core.runtime.Platform;
 
 /**
@@ -49,6 +50,21 @@ public abstract class RegistryReader {
 
     private final IExtensionRegistry registry;
 
+    /**
+     * DOC sgandon class global comment. Detailled comment <br/>
+     * 
+     * $Id: talend.epf 55206 2011-02-15 17:32:14Z mhirt $
+     * 
+     */
+    public abstract class RegistrySafeRunnable implements ISafeRunnable {
+
+        @Override
+        public void handleException(Throwable exception) {
+            log.error("error reading extention registry", exception); //$NON-NLS-1$
+
+        }
+    }
+
     /**
      * The constructor.
      */

org.talend.core.runtime/src/main/java/org/talend/repository/model/IMetadataService.java

@@ -12,6 +12,9 @@
 // ============================================================================
 package org.talend.repository.model;
 
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.wizard.WizardDialog;
@@ -49,4 +52,6 @@ public interface IMetadataService extends IService {
 
     public AbstractRlueOperationChoice getOperationChoice(Shell shell, INode node, RulesItem[] repositoryRuleItems,
             LinkRulesItem[] linkRuleItems, EProcessTypeForRule rule, String ruleToEdit, boolean readOnly);
+
+    public DatabaseMetaData findCustomizedJTDSDBMetadata(Connection conn);
 }

org.talend.core.runtime/src/main/java/org/talend/repository/model/IProxyRepositoryFactory.java

@@ -478,4 +478,6 @@ public interface IProxyRepositoryFactory {
      * @return
      */
     public String getNavigatorViewDescription();
+
+    public void updateLockStatus() throws PersistenceException;
 }

org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryConstants.java

@@ -78,11 +78,12 @@ public class RepositoryConstants {
 
     public static final String REPOSITORY_URL = "url"; //$NON-NLS-1$
 
-    public static final String TDQ_PAT_ITEM_PATTERN = ".*"; //$NON-NLS-1$
+    public static final String TDQ_ALL_ITEM_PATTERN = ".*"; //$NON-NLS-1$
 
     // GLIU: add for TESB-3837
     public static final String SERVICES_NAME_PATTERN = "[a-zA-Z_][a-zA-Z0-9\\.\\-_]*";
 
+    public static final String MDM_ITEM_PATTERN = ".*"; //$NON-NLS-1$
     public static String getPattern(ERepositoryObjectType type) {
         if (type == ERepositoryObjectType.FOLDER) {
             return FOLDER_PATTERN;
@@ -97,15 +98,17 @@ public class RepositoryConstants {
                 || type == ERepositoryObjectType.TDQ_PATTERN_REGEX || type == ERepositoryObjectType.TDQ_PATTERN_SQL
                 || type == ERepositoryObjectType.TDQ_SOURCE_FILE_ELEMENT || type == ERepositoryObjectType.TDQ_RULES
                 || type == ERepositoryObjectType.TDQ_RULES_SQL || type == ERepositoryObjectType.TDQ_INDICATOR_ELEMENT) {
-            return TDQ_PAT_ITEM_PATTERN;
-        }
+            return TDQ_ALL_ITEM_PATTERN;
+        } 
         // GLIU: add for TESB-3837
         else if (type != null && "SERVICES".equals(type.getType())) {
             return SERVICES_NAME_PATTERN;
         } else if (type != null && "ROUTES".equals(type.getType())) {
             return CODE_ITEM_PATTERN;
+        } else if (type != null && type.getType() != null && type.getType().startsWith("MDM.")) { //$NON-NLS-1$
+            return MDM_ITEM_PATTERN;
         } else {
-            return TDQ_PAT_ITEM_PATTERN;
+            return TDQ_ALL_ITEM_PATTERN;
         }
     }
 

org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNodeUtilities.java

@@ -25,6 +25,7 @@ import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
+import org.talend.core.model.general.Project;
 import org.talend.core.model.properties.ConnectionItem;
 import org.talend.core.model.properties.FolderItem;
 import org.talend.core.model.properties.FolderType;
@@ -590,7 +591,18 @@ public class RepositoryNodeUtilities {
                 IRepositoryViewObject obj = null;
                 String id = relation.getId();
                 if (RelationshipItemBuilder.ROUTINE_RELATION.equals(relation.getType())) {
-                    obj = getRoutineFromName(id, includeSystemItems);
+                    // TDI-20915
+                    Project mainProject = ProjectManager.getInstance().getCurrentProject();
+                    obj = getRoutineFromName(mainProject, id, includeSystemItems);
+                    if (obj == null) {
+                        List<Project> refProjects = ProjectManager.getInstance().getReferencedProjects(mainProject);
+                        for (Project refPro : refProjects) {
+                            obj = getRoutineFromName(refPro, id, includeSystemItems);
+                            if (obj != null) {
+                                break;
+                            }
+                        }
+                    }
                 } else {
                     if (id != null && id.indexOf(" - ") != -1) { //$NON-NLS-1$
                         id = id.substring(0, id.lastIndexOf(" - ")); //$NON-NLS-1$
@@ -663,14 +675,13 @@ public class RepositoryNodeUtilities {
         }
     }
 
-    public static IRepositoryViewObject getRoutineFromName(String name, boolean includeSystem) {
+    public static IRepositoryViewObject getRoutineFromName(Project tempProject, String name, boolean includeSystem) {
         if (name == null)
             return null;
 
         IProxyRepositoryFactory factory = CoreRuntimePlugin.getInstance().getProxyRepositoryFactory();
         try {
-            List<IRepositoryViewObject> all = factory.getAll(ProjectManager.getInstance().getCurrentProject(),
-                    ERepositoryObjectType.ROUTINES);
+            List<IRepositoryViewObject> all = factory.getAll(tempProject, ERepositoryObjectType.ROUTINES);
             for (IRepositoryViewObject obj : all) {
                 if (obj != null && obj.getProperty() != null) {
                     Item item = obj.getProperty().getItem();

org.talend.core.runtime/src/main/java/org/talend/repository/ui/actions/AContextualAction.java

@@ -91,6 +91,8 @@ public abstract class AContextualAction extends Action implements ITreeContextua
 
     private boolean avoidUnloadResources;
 
+    private boolean unloadResourcesAfter;
+
     protected RepositoryNode repositoryNode;
 
     private Item oldItem;
@@ -594,7 +596,8 @@ public abstract class AContextualAction extends Action implements ITreeContextua
                 }
             }
         };
-        repositoryWorkUnit.setAvoidUnloadResources(avoidUnloadResources);
+        repositoryWorkUnit.setAvoidUnloadResources(isAvoidUnloadResources());
+        repositoryWorkUnit.setUnloadResourcesAfterRun(isUnloadResourcesAfter());
         CoreRuntimePlugin.getInstance().getProxyRepositoryFactory().executeRepositoryWorkUnit(repositoryWorkUnit);
         oldItem = null;
     }
@@ -699,4 +702,14 @@ public abstract class AContextualAction extends Action implements ITreeContextua
     public IRepositoryNode getNode() {
         return this.node;
     }
+
+    
+    public boolean isUnloadResourcesAfter() {
+        return unloadResourcesAfter;
+    }
+
+    
+    public void setUnloadResourcesAfter(boolean unloadResourcesAfter) {
+        this.unloadResourcesAfter = unloadResourcesAfter;
+    }
 }

org.talend.core.test/META-INF/MANIFEST.MF

@@ -4,4 +4,5 @@ Bundle-Name: Test
 Bundle-SymbolicName: org.talend.core.test
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.talend.core;bundle-version="2.2.0"
-Require-Bundle: org.junit4;bundle-version="4.5.0"
+Require-Bundle: org.junit4;bundle-version="4.5.0",
+ org.mockito

org.talend.core.test/src/org/talend/core/model/metadata/MetadataToolTest.java

@@ -0,0 +1,296 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2011 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.core.model.metadata;
+
+import org.junit.Test;
+
+/**
+ * DOC Administrator class global comment. Detailled comment
+ */
+public class MetadataToolTest {
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#getColumnNameChanged(org.talend.core.model.metadata.IMetadataTable, org.talend.core.model.metadata.IMetadataTable)}
+     * .
+     */
+    @Test
+    public void testGetColumnNameChanged() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#getColumnNameChangedExt(org.talend.core.model.process.INode, org.talend.core.model.metadata.IMetadataTable, org.talend.core.model.metadata.IMetadataTable)}
+     * .
+     */
+    @Test
+    public void testGetColumnNameChangedExt() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#copyTable(org.talend.core.model.metadata.IMetadataTable, org.talend.core.model.metadata.IMetadataTable)}
+     * .
+     */
+    @Test
+    public void testCopyTableIMetadataTableIMetadataTable() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#copyTable(java.lang.String, org.talend.core.model.metadata.IMetadataTable, org.talend.core.model.metadata.IMetadataTable)}
+     * .
+     */
+    @Test
+    public void testCopyTableStringIMetadataTableIMetadataTable() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#setDBType(org.talend.core.model.metadata.IMetadataTable, java.lang.String)}
+     * .
+     */
+    @Test
+    public void testSetDBType() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#copyTable(java.util.List, org.talend.core.model.metadata.IMetadataTable)}
+     * .
+     */
+    @Test
+    public void testCopyTableListOfIMetadataColumnIMetadataTable() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#copyTable(org.talend.core.model.metadata.IMetadataTable, org.talend.core.model.metadata.IMetadataTable, java.lang.String)}
+     * .
+     */
+    @Test
+    public void testCopyTableIMetadataTableIMetadataTableString() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#copyTable(java.util.List, org.talend.core.model.metadata.IMetadataTable, java.lang.String)}
+     * .
+     */
+    @Test
+    public void testCopyTableListOfIMetadataColumnIMetadataTableString() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.MetadataTool#getQueryFromRepository(java.lang.String)}.
+     */
+    @Test
+    public void testGetQueryFromRepository() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#getMetadataTableFromRepository(java.lang.String)}.
+     */
+    @Test
+    public void testGetMetadataTableFromRepository() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.MetadataTool#getMetadataFromRepository(java.lang.String)}.
+     */
+    @Test
+    public void testGetMetadataFromRepository() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#getMetadataTableFromConnection(org.talend.core.model.metadata.builder.connection.Connection)}
+     * .
+     */
+    @Test
+    public void testGetMetadataTableFromConnection() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.MetadataTool#getConnectionFromRepository(java.lang.String)}
+     * .
+     */
+    @Test
+    public void testGetConnectionFromRepository() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#getNewMetadataColumns(org.talend.core.model.metadata.IMetadataTable, org.talend.core.model.metadata.IMetadataTable)}
+     * .
+     */
+    @Test
+    public void testGetNewMetadataColumns() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#getRemoveMetadataColumns(org.talend.core.model.metadata.IMetadataTable, org.talend.core.model.metadata.IMetadataTable)}
+     * .
+     */
+    @Test
+    public void testGetRemoveMetadataColumns() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#initilializeSchemaFromElementParameters(org.talend.core.model.metadata.IMetadataTable, java.util.List)}
+     * .
+     */
+    @Test
+    public void testInitilializeSchemaFromElementParameters() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.MetadataTool#getMappingParameter(java.util.List)}.
+     */
+    @Test
+    public void testGetMappingParameter() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#copyTable(org.talend.core.model.metadata.IMetadataTable, org.talend.designer.core.model.utils.emf.talendfile.MetadataType)}
+     * .
+     */
+    @Test
+    public void testCopyTableIMetadataTableMetadataType() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#getMetadataTableFromNode(org.talend.core.model.process.INode, java.lang.String)}
+     * .
+     */
+    @Test
+    public void testGetMetadataTableFromNode() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#getMetadataTableFromNodeLabel(org.talend.core.model.process.INode, java.lang.String)}
+     * .
+     */
+    @Test
+    public void testGetMetadataTableFromNodeLabel() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#getMetadataTableFromNodeTableName(org.talend.core.model.process.INode, java.lang.String)}
+     * .
+     */
+    @Test
+    public void testGetMetadataTableFromNodeTableName() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.MetadataTool#validateColumnName(java.lang.String, int)}.
+     */
+    @Test
+    public void testValidateColumnName() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.MetadataTool#isValidSchemaName(java.lang.String)}.
+     */
+    @Test
+    public void testIsValidSchemaName() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.MetadataTool#isValidColumnName(java.lang.String)}.
+     */
+    @Test
+    public void testIsValidColumnName() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.MetadataTool#validateValue(java.lang.String)}.
+     */
+    @Test
+    public void testValidateValue() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.MetadataTool#validateValueForDBType(java.lang.String)}.
+     */
+    @Test
+    public void testValidateValueForDBType() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#checkSchema(org.eclipse.swt.widgets.Shell, org.eclipse.swt.events.KeyEvent)}
+     * .
+     */
+    @Test
+    public void testCheckSchema() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.MetadataTool#validateSchema(java.lang.String)}.
+     */
+    @Test
+    public void testValidateSchema() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#validateSchemaValue(java.lang.String, int, java.util.List)}.
+     */
+    @Test
+    public void testValidateSchemaValue() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#hasCustomColumns(org.talend.core.model.metadata.IMetadataTable)}
+     * .
+     */
+    @Test
+    public void testHasCustomColumns() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#getContextDependenciesOfMetadataConnection(java.util.Collection)}
+     * .
+     */
+    @Test
+    public void testGetContextDependenciesOfMetadataConnection() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#processFieldsLength(org.eclipse.emf.ecore.EObject)}.
+     */
+    @Test
+    public void testProcessFieldsLength() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.MetadataTool#getSAPFunctionFromRepository(java.lang.String)}.
+     */
+    @Test
+    public void testGetSAPFunctionFromRepository() {
+    }
+
+}

org.talend.core.test/src/org/talend/core/model/metadata/QueryUtilTest.java

@@ -0,0 +1,197 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2011 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.core.model.metadata;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.talend.core.database.EDatabaseTypeName;
+
+/**
+ * DOC Administrator class global comment. Detailled comment
+ */
+public class QueryUtilTest {
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.QueryUtil#needFormatSQL(java.lang.String)}.
+     */
+    @Test
+    public void testNeedFormatSQL() {
+        assertFalse(QueryUtil.needFormatSQL(null));
+
+        assertFalse(QueryUtil.needFormatSQL(EDatabaseTypeName.NETEZZA.getDisplayName()));
+
+        assertFalse(QueryUtil.needFormatSQL(EDatabaseTypeName.ORACLE_OCI.getDisplayName()));
+
+        assertFalse(QueryUtil.needFormatSQL(EDatabaseTypeName.ORACLEFORSID.getDisplayName()));
+
+        assertFalse(QueryUtil.needFormatSQL(EDatabaseTypeName.ORACLESN.getDisplayName()));
+
+        assertFalse(QueryUtil.needFormatSQL(EDatabaseTypeName.PSQL.getDisplayName()));
+
+        assertFalse(QueryUtil.needFormatSQL(EDatabaseTypeName.PLUSPSQL.getDisplayName()));
+
+        assertFalse(QueryUtil.needFormatSQL(EDatabaseTypeName.AS400.getDisplayName()));
+
+        assertFalse(QueryUtil.needFormatSQL(EDatabaseTypeName.ACCESS.getDisplayName()));
+
+        assertFalse(QueryUtil.needFormatSQL(EDatabaseTypeName.MYSQL.getDisplayName()));
+
+        assertFalse(QueryUtil.needFormatSQL(EDatabaseTypeName.IBMDB2.getDisplayName()));
+
+        assertFalse(QueryUtil.needFormatSQL(EDatabaseTypeName.IBMDB2ZOS.getDisplayName()));
+
+        assertTrue(QueryUtil.needFormatSQL(EDatabaseTypeName.H2.getDisplayName()));
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.QueryUtil#generateNewQuery(org.talend.core.model.process.IElement, org.talend.core.model.metadata.IMetadataTable, java.lang.String, java.lang.String, java.lang.String)}
+     * .
+     */
+    @Test
+    public void testGenerateNewQueryIElementIMetadataTableStringStringString() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.QueryUtil#generateNewQuery(org.talend.core.model.process.IElement, org.talend.core.model.metadata.IMetadataTable, boolean, java.lang.String, java.lang.String, java.lang.String)}
+     * .
+     */
+    @Test
+    public void testGenerateNewQueryIElementIMetadataTableBooleanStringStringString() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.QueryUtil#generateNewQuery(org.talend.core.model.process.IElement, org.talend.core.model.metadata.IMetadataTable, java.lang.String, java.lang.String, java.lang.String, boolean)}
+     * .
+     */
+    @Test
+    public void testGenerateNewQueryIElementIMetadataTableStringStringStringBoolean() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.QueryUtil#generateNewQueryDelegate(org.talend.core.model.process.IElement, org.talend.core.model.metadata.IMetadataTable, java.lang.String, java.lang.String, java.lang.String)}
+     * .
+     */
+    @Test
+    public void testGenerateNewQueryDelegateIElementIMetadataTableStringStringString() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.QueryUtil#generateNewQueryDelegate(org.talend.core.model.process.IElement, org.talend.core.model.metadata.IMetadataTable, java.lang.String, java.lang.String, java.lang.String, boolean)}
+     * .
+     */
+    @Test
+    public void testGenerateNewQueryDelegateIElementIMetadataTableStringStringStringBoolean() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.QueryUtil#generateNewQuery(org.talend.core.model.metadata.IMetadataTable, java.lang.String, java.lang.String, boolean)}
+     * .
+     */
+    @Test
+    public void testGenerateNewQueryIMetadataTableStringStringBoolean() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.QueryUtil#generateNewQuery(org.talend.core.model.metadata.IMetadataTable, java.lang.String, java.lang.String, java.lang.String[])}
+     * .
+     */
+    @Test
+    public void testGenerateNewQueryIMetadataTableStringStringStringArray() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.model.metadata.QueryUtil#getTableName(org.talend.core.model.process.IElement, org.talend.core.model.metadata.IMetadataTable, java.lang.String, java.lang.String, java.lang.String)}
+     * .
+     */
+    @Test
+    public void testGetTableName() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.QueryUtil#checkAndAddQuotes(java.lang.String)}.
+     */
+    @Test
+    public void testCheckAndAddQuotes() {
+        String testQuery = "select mytable.ID from mytable";
+
+        String expectQuery = "\"select mytable.ID from mytable\"";
+
+        assertNotNull(QueryUtil.checkAndAddQuotes(testQuery));
+
+        assertEquals(QueryUtil.checkAndAddQuotes(testQuery), expectQuery);
+
+        assertNotNull(QueryUtil.checkAndAddQuotes(expectQuery));
+
+        assertEquals(QueryUtil.checkAndAddQuotes(expectQuery), expectQuery);
+
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.QueryUtil#checkAndRemoveQuotes(java.lang.String)}.
+     */
+    @Test
+    public void testCheckAndRemoveQuotes() {
+        String testQuery = "select mytable.ID from mytable";
+
+        String expectQuery = "\"select mytable.ID from mytable\"";
+
+        assertNotNull(QueryUtil.checkAndRemoveQuotes(testQuery));
+
+        assertEquals(QueryUtil.checkAndRemoveQuotes(testQuery), testQuery);
+
+        assertNotNull(QueryUtil.checkAndRemoveQuotes(expectQuery));
+
+        assertEquals(QueryUtil.checkAndRemoveQuotes(expectQuery), testQuery);
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.QueryUtil#checkIfIsNoQuotesAtAll(java.lang.String)}.
+     */
+    @Test
+    public void testCheckIfIsNoQuotesAtAll() {
+        String testQuery = "select mytable.ID from mytable";
+
+        String testQuery1 = "select mytable.\\\"ID\\\" form mytable";
+
+        assertTrue(QueryUtil.checkIfIsNoQuotesAtAll(testQuery));
+
+        assertTrue(!QueryUtil.checkIfIsNoQuotesAtAll(testQuery1));
+    }
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.QueryUtil#checkIfHasSpecialEscapeValue(java.lang.String)}.
+     */
+    @Test
+    public void testCheckIfHasSpecialEscapeValue() {
+        assertTrue(QueryUtil.checkIfHasSpecialEscapeValue("select \\n"));
+
+        assertTrue(QueryUtil.checkIfHasSpecialEscapeValue("select \\r"));
+
+        assertTrue(QueryUtil.checkIfHasSpecialEscapeValue("select \\t"));
+
+        assertFalse(QueryUtil.checkIfHasSpecialEscapeValue("test"));
+    }
+
+}

org.talend.core.test/src/org/talend/core/model/metadata/query/generator/AS400QueryGeneratorTest.java

@@ -0,0 +1,105 @@
+package org.talend.core.model.metadata.query.generator;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.talend.core.CorePlugin;
+import org.talend.core.model.metadata.IMetadataColumn;
+import org.talend.core.model.metadata.IMetadataTable;
+import org.talend.core.model.metadata.MetadataColumn;
+import org.talend.core.model.metadata.MetadataTable;
+import org.talend.core.model.process.EParameterFieldType;
+import org.talend.core.model.process.IElement;
+import org.talend.core.model.process.IElementParameter;
+import org.talend.core.model.utils.TalendTextUtils;
+import org.talend.core.prefs.ITalendCorePrefConstants;
+
+public class AS400QueryGeneratorTest {
+
+    @Test
+    public void testGenerateQuery() {
+        IElement as400Element = mock(IElement.class);
+        IElementParameter newParam = mock(IElementParameter.class);
+        List<? extends IElementParameter> elementParameters = as400Element.getElementParameters();
+        when(newParam.getName()).thenReturn("DBNAME");
+        when(newParam.getFieldType()).thenReturn(EParameterFieldType.TEXT);
+        when(newParam.getValue()).thenReturn("talend");
+        when(newParam.isShow(elementParameters)).thenReturn(true);
+        when(as400Element.getElementParameter("DBNAME")).thenReturn(newParam);
+
+        newParam = mock(IElementParameter.class);
+        when(newParam.getName()).thenReturn("DBTABLE");
+        when(newParam.getFieldType()).thenReturn(EParameterFieldType.DBTABLE);
+        when(newParam.getValue()).thenReturn("mytable");
+        when(newParam.isShow(elementParameters)).thenReturn(true);
+        when(as400Element.getElementParameterFromField(EParameterFieldType.DBTABLE)).thenReturn(newParam);
+
+        AS400QueryGenerator asQg = new AS400QueryGenerator();
+
+        // AS400 has two diffenect sql,need both test
+
+        String testStandardSQL = "SELECT \n  mytable.newColumn\nFROM mytable";
+
+        String testSystemSQL = "SELECT \n  mytable/newColumn\nFROM mytable";
+
+        CorePlugin.getDefault().getPreferenceStore().setValue(ITalendCorePrefConstants.AS400_SQL_SEG, true);
+
+        IMetadataTable newTable = new MetadataTable();
+
+        newTable.setLabel("mytable");
+
+        MetadataColumn newColumn = new MetadataColumn();
+
+        newColumn.setLabel("newColumn");
+
+        newColumn.setOriginalDbColumnName("newColumn");
+
+        List<IMetadataColumn> columnsList = new ArrayList<IMetadataColumn>();
+
+        columnsList.add(newColumn);
+
+        newTable.setListColumns(columnsList);
+
+        asQg.setParameters(as400Element, newTable, "", "mytable");
+
+        // test standardSql for AS400
+        String resultString = asQg.generateQuery();
+
+        StringBuilder expectSql = new StringBuilder();
+
+        expectSql.append(TalendTextUtils.getQuoteChar()).append(testStandardSQL).append(TalendTextUtils.getQuoteChar());
+
+        String expectString = expectSql.toString();
+
+        assertNotNull(resultString);
+
+        assertTrue(!"".equals(resultString));
+
+        assertTrue(expectString.equals(resultString));
+
+        // test system Sql for AS400
+        CorePlugin.getDefault().getPreferenceStore().setValue(ITalendCorePrefConstants.AS400_SQL_SEG, false);
+
+        asQg.setParameters(as400Element, newTable, "", "mytable");
+
+        String resultString1 = asQg.generateQuery();
+
+        StringBuilder expectSql1 = new StringBuilder();
+
+        expectSql1.append(TalendTextUtils.getQuoteChar()).append(testSystemSQL).append(TalendTextUtils.getQuoteChar());
+        String expectString1 = expectSql1.toString();
+
+        assertNotNull(resultString1);
+
+        assertTrue(!"".equals(resultString1));
+
+        assertTrue(expectString1.equals(resultString1));
+    }
+
+}

org.talend.core.test/src/org/talend/core/model/metadata/query/generator/H2QueryGeneratorTest.java

@@ -0,0 +1,75 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2011 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.core.model.metadata.query.generator;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.talend.core.database.EDatabaseTypeName;
+import org.talend.core.model.metadata.IMetadataColumn;
+import org.talend.core.model.metadata.IMetadataTable;
+import org.talend.core.model.metadata.MetadataColumn;
+import org.talend.core.model.metadata.MetadataTable;
+import org.talend.core.model.utils.TalendTextUtils;
+
+/**
+ * DOC Administrator class global comment. Detailled comment
+ */
+public class H2QueryGeneratorTest {
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.query.AbstractQueryGenerator#generateQuery()}.
+     */
+    @Test
+    public void testGenerateQuery() {
+        // since H2 only need the table,no need to fake a node(for get db and schema) for it
+        H2QueryGenerator h2QG = new H2QueryGenerator(EDatabaseTypeName.H2);
+
+        IMetadataTable newTable = new MetadataTable();
+
+        newTable.setLabel("mytable");
+
+        MetadataColumn newColumn = new MetadataColumn();
+
+        newColumn.setLabel("newColumn");
+
+        newColumn.setOriginalDbColumnName("newColumn");
+
+        List<IMetadataColumn> columnsList = new ArrayList<IMetadataColumn>();
+
+        columnsList.add(newColumn);
+
+        newTable.setListColumns(columnsList);
+
+        h2QG.setParameters(null, newTable, "", "mytable");
+
+        String resultString = h2QG.generateQuery();
+
+        StringBuilder expectSql = new StringBuilder();
+        expectSql.append(TalendTextUtils.getQuoteChar())
+                .append("SELECT \n  \\\"mytable\\\".\\\"newColumn\\\"\n FROM \\\"mytable\\\"")
+                .append(TalendTextUtils.getQuoteChar());
+        String expectString = expectSql.toString();
+
+        assertNotNull(resultString);
+
+        assertTrue(!"".equals(resultString));
+
+        assertTrue(expectString.equals(resultString));
+    }
+
+}

org.talend.core.test/src/org/talend/core/model/metadata/query/generator/NonDatabaseDefaultQueryGeneratorTest.java

@@ -0,0 +1,96 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2011 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.core.model.metadata.query.generator;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.talend.core.database.EDatabaseTypeName;
+import org.talend.core.model.metadata.IMetadataColumn;
+import org.talend.core.model.metadata.IMetadataTable;
+import org.talend.core.model.metadata.MetadataColumn;
+import org.talend.core.model.metadata.MetadataTable;
+import org.talend.core.model.process.EParameterFieldType;
+import org.talend.core.model.process.IElement;
+import org.talend.core.model.process.IElementParameter;
+import org.talend.core.model.utils.TalendTextUtils;
+
+/**
+ * DOC Administrator class global comment. Detailled comment
+ */
+public class NonDatabaseDefaultQueryGeneratorTest {
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.query.AbstractQueryGenerator#generateQuery()}.
+     */
+    @Test
+    public void testGenerateQuery() {
+        NonDatabaseDefaultQueryGenerator nonQG = new NonDatabaseDefaultQueryGenerator(EDatabaseTypeName.MYSQL);
+
+        IElement mySQLElement = mock(IElement.class);
+        IElementParameter newParam = mock(IElementParameter.class);
+        List<? extends IElementParameter> elementParameters = mySQLElement.getElementParameters();
+        when(newParam.getName()).thenReturn("DBNAME");
+        when(newParam.getFieldType()).thenReturn(EParameterFieldType.TEXT);
+        when(newParam.getValue()).thenReturn("talend");
+        when(newParam.isShow(elementParameters)).thenReturn(true);
+        when(mySQLElement.getElementParameter("DBNAME")).thenReturn(newParam);
+
+        newParam = mock(IElementParameter.class);
+        when(newParam.getName()).thenReturn("DBTABLE");
+        when(newParam.getFieldType()).thenReturn(EParameterFieldType.DBTABLE);
+        when(newParam.getValue()).thenReturn("mytable");
+        when(newParam.isShow(elementParameters)).thenReturn(true);
+        when(mySQLElement.getElementParameterFromField(EParameterFieldType.DBTABLE)).thenReturn(newParam);
+
+        IMetadataTable newTable = new MetadataTable();
+
+        newTable.setLabel("mytable");
+
+        MetadataColumn newColumn = new MetadataColumn();
+
+        newColumn.setLabel("newColumn");
+
+        newColumn.setOriginalDbColumnName("newColumn");
+
+        List<IMetadataColumn> columnsList = new ArrayList<IMetadataColumn>();
+
+        columnsList.add(newColumn);
+
+        newTable.setListColumns(columnsList);
+
+        nonQG.setParameters(mySQLElement, newTable, "", "mytable");
+
+        String resultString = nonQG.generateQuery();
+
+        StringBuilder expectSql = new StringBuilder();
+
+        expectSql.append(TalendTextUtils.getQuoteChar()).append("SELECT \n  `mytable`.`newColumn`\nFROM `mytable`")
+                .append(TalendTextUtils.getQuoteChar());
+
+        String expectString = expectSql.toString();
+
+        assertNotNull(resultString);
+
+        assertTrue(!"".equals(resultString));
+
+        assertTrue(expectString.equals(resultString));
+    }
+
+}

org.talend.core.test/src/org/talend/core/model/metadata/query/generator/OldDelegateQueryGeneratorTest.java

@@ -0,0 +1,104 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2011 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.core.model.metadata.query.generator;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.talend.core.database.EDatabaseTypeName;
+import org.talend.core.model.metadata.IMetadataColumn;
+import org.talend.core.model.metadata.IMetadataTable;
+import org.talend.core.model.metadata.MetadataColumn;
+import org.talend.core.model.metadata.MetadataTable;
+import org.talend.core.model.process.EParameterFieldType;
+import org.talend.core.model.process.IElement;
+import org.talend.core.model.process.IElementParameter;
+import org.talend.core.model.utils.TalendTextUtils;
+
+/**
+ * DOC Administrator class global comment. Detailled comment
+ */
+public class OldDelegateQueryGeneratorTest {
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.query.AbstractQueryGenerator#generateQuery()}.
+     */
+    @Test
+    public void testGenerateQuery() {
+        NonDatabaseDefaultQueryGenerator sybaseQG = new NonDatabaseDefaultQueryGenerator(EDatabaseTypeName.SYBASEASE);
+
+        IElement sybaseElement = mock(IElement.class);
+        IElementParameter newParam = mock(IElementParameter.class);
+        List<? extends IElementParameter> elementParameters = sybaseElement.getElementParameters();
+        when(newParam.getName()).thenReturn("DBNAME");
+        when(newParam.getFieldType()).thenReturn(EParameterFieldType.TEXT);
+        when(newParam.getValue()).thenReturn("talend");
+        when(newParam.isShow(elementParameters)).thenReturn(true);
+        when(sybaseElement.getElementParameter("DBNAME")).thenReturn(newParam);
+
+        newParam = mock(IElementParameter.class);
+        when(newParam.getName()).thenReturn("DBTABLE");
+        when(newParam.getFieldType()).thenReturn(EParameterFieldType.DBTABLE);
+        when(newParam.getValue()).thenReturn("test");
+        when(newParam.isShow(elementParameters)).thenReturn(true);
+        when(sybaseElement.getElementParameterFromField(EParameterFieldType.DBTABLE)).thenReturn(newParam);
+
+        IMetadataTable newTable = new MetadataTable();
+
+        newTable.setLabel("test");
+
+        List<IMetadataColumn> columnsList = new ArrayList<IMetadataColumn>();
+
+        MetadataColumn newColumn = new MetadataColumn();
+
+        newColumn.setLabel("ID"); // ID is a keywords for Sybase,need a special tests
+
+        newColumn.setOriginalDbColumnName("ID");
+
+        columnsList.add(newColumn);
+
+        newColumn = new MetadataColumn();
+
+        newColumn.setLabel("NAME");
+
+        newColumn.setOriginalDbColumnName("NAME");
+
+        columnsList.add(newColumn);
+
+        newTable.setListColumns(columnsList);
+
+        sybaseQG.setParameters(sybaseElement, newTable, "", "test");
+
+        String resultString = sybaseQG.generateQuery();
+
+        StringBuilder expectSql = new StringBuilder();
+
+        expectSql.append(TalendTextUtils.getQuoteChar()).append("SELECT \n  test.\\\"ID\\\", \n  test.NAME\nFROM test")
+                .append(TalendTextUtils.getQuoteChar());
+
+        String expectString = expectSql.toString();
+
+        assertNotNull(resultString);
+
+        assertTrue(!"".equals(resultString));
+
+        assertTrue(expectString.equals(resultString));
+    }
+
+}

org.talend.core.test/src/org/talend/core/model/metadata/query/generator/OracleQueryGeneratorTest.java

@@ -0,0 +1,93 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2011 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.core.model.metadata.query.generator;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.talend.core.database.EDatabaseTypeName;
+import org.talend.core.model.metadata.IMetadataColumn;
+import org.talend.core.model.metadata.IMetadataTable;
+import org.talend.core.model.metadata.MetadataColumn;
+import org.talend.core.model.metadata.MetadataTable;
+import org.talend.core.model.process.EParameterFieldType;
+import org.talend.core.model.process.IElement;
+import org.talend.core.model.process.IElementParameter;
+import org.talend.core.model.utils.TalendTextUtils;
+
+/**
+ * DOC Administrator class global comment. Detailled comment
+ */
+public class OracleQueryGeneratorTest {
+
+    /**
+     * Test method for {@link org.talend.core.model.metadata.query.AbstractQueryGenerator#generateQuery()}.
+     */
+    @Test
+    public void testGenerateQuery() {
+        OracleQueryGenerator oraclegenerator = new OracleQueryGenerator(EDatabaseTypeName.ORACLEFORSID);
+        IElement OracleSQLElement = mock(IElement.class);
+        IElementParameter newParam = mock(IElementParameter.class);
+        List<? extends IElementParameter> elementParameters = OracleSQLElement.getElementParameters();
+        when(newParam.getName()).thenReturn("DBNAME");
+        when(newParam.getFieldType()).thenReturn(EParameterFieldType.TEXT);
+        when(newParam.getValue()).thenReturn("talend");
+        when(newParam.isShow(elementParameters)).thenReturn(true);
+        when(OracleSQLElement.getElementParameter("DBNAME")).thenReturn(newParam);
+
+        newParam = mock(IElementParameter.class);
+        when(newParam.getName()).thenReturn("DBTABLE");
+        when(newParam.getFieldType()).thenReturn(EParameterFieldType.DBTABLE);
+        when(newParam.getValue()).thenReturn("mytable");
+        when(newParam.isShow(elementParameters)).thenReturn(true);
+        when(OracleSQLElement.getElementParameterFromField(EParameterFieldType.DBTABLE)).thenReturn(newParam);
+
+        IMetadataTable newTable = new MetadataTable();
+
+        newTable.setLabel("mytable");
+
+        MetadataColumn newColumn = new MetadataColumn();
+
+        newColumn.setLabel("newColumn");
+
+        newColumn.setOriginalDbColumnName("newColumn");
+
+        List<IMetadataColumn> columnsList = new ArrayList<IMetadataColumn>();
+
+        columnsList.add(newColumn);
+
+        newTable.setListColumns(columnsList);
+
+        oraclegenerator.setParameters(OracleSQLElement, newTable, "myschema", "mytable");
+
+        String resultString = oraclegenerator.generateQuery();
+
+        StringBuilder expectSql = new StringBuilder();
+        expectSql.append(TalendTextUtils.getQuoteChar()).append("SELECT \n  myschema.mytable.newColumn\nFROM myschema.mytable")
+                .append(TalendTextUtils.getQuoteChar());
+        String expectString = expectSql.toString();
+
+        assertNotNull(resultString);
+
+        assertTrue(!"".equals(resultString));
+
+        assertTrue(expectString.equals(resultString));
+    }
+
+}

org.talend.core.test/src/org/talend/core/model/metadata/query/generator/PostgreQueryGeneratorTest.java

@@ -0,0 +1,76 @@
+package org.talend.core.model.metadata.query.generator;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.talend.core.database.EDatabaseTypeName;
+import org.talend.core.model.metadata.IMetadataColumn;
+import org.talend.core.model.metadata.IMetadataTable;
+import org.talend.core.model.metadata.MetadataColumn;
+import org.talend.core.model.metadata.MetadataTable;
+import org.talend.core.model.process.EParameterFieldType;
+import org.talend.core.model.process.IElement;
+import org.talend.core.model.process.IElementParameter;
+import org.talend.core.model.utils.TalendTextUtils;
+
+public class PostgreQueryGeneratorTest {
+
+    @Test
+    public void testGenerateQuery() {
+        IElement postGreSQLElement = mock(IElement.class);
+        IElementParameter newParam = mock(IElementParameter.class);
+        List<? extends IElementParameter> elementParameters = postGreSQLElement.getElementParameters();
+        when(newParam.getName()).thenReturn("DBNAME");
+        when(newParam.getFieldType()).thenReturn(EParameterFieldType.TEXT);
+        when(newParam.getValue()).thenReturn("talend");
+        when(newParam.isShow(elementParameters)).thenReturn(true);
+        when(postGreSQLElement.getElementParameter("DBNAME")).thenReturn(newParam);
+
+        newParam = mock(IElementParameter.class);
+        when(newParam.getName()).thenReturn("DBTABLE");
+        when(newParam.getFieldType()).thenReturn(EParameterFieldType.DBTABLE);
+        when(newParam.getValue()).thenReturn("mytable");
+        when(newParam.isShow(elementParameters)).thenReturn(true);
+        when(postGreSQLElement.getElementParameterFromField(EParameterFieldType.DBTABLE)).thenReturn(newParam);
+        PostgreQueryGenerator pQG = new PostgreQueryGenerator(EDatabaseTypeName.PSQL);
+
+        IMetadataTable newTable = new MetadataTable();
+
+        newTable.setLabel("mytable");
+
+        MetadataColumn newColumn = new MetadataColumn();
+
+        newColumn.setLabel("newColumn");
+
+        newColumn.setOriginalDbColumnName("newColumn");
+
+        List<IMetadataColumn> columnsList = new ArrayList<IMetadataColumn>();
+
+        columnsList.add(newColumn);
+
+        newTable.setListColumns(columnsList);
+
+        pQG.setParameters(postGreSQLElement, newTable, "myschema", "mytable");
+
+        String resultString = pQG.generateQuery();
+
+        StringBuilder expectSql = new StringBuilder();
+        expectSql
+                .append(TalendTextUtils.getQuoteChar())
+                .append("SELECT \n  \\\"talend\\\".\\\"myschema\\\".\\\"mytable\\\".\\\"newColumn\\\"\nFROM \\\"talend\\\".\\\"myschema\\\".\\\"mytable\\\"")
+                .append(TalendTextUtils.getQuoteChar());
+
+        assertNotNull(resultString);
+
+        assertTrue(!"".equals(resultString));
+
+        assertTrue(expectSql.toString().equals(resultString));
+    }
+
+}

org.talend.core.test/src/org/talend/core/sqlbuilder/util/TextUtilTest.java

@@ -0,0 +1,225 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2011 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.core.sqlbuilder.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import org.junit.Test;
+import org.talend.core.database.EDatabaseTypeName;
+
+/**
+ * DOC Administrator class global comment. Detailled comment
+ */
+public class TextUtilTest {
+
+    /**
+     * Test method for {@link org.talend.core.sqlbuilder.util.TextUtil#TextUtil()}.
+     */
+    @Test
+    public void testTextUtil() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.sqlbuilder.util.TextUtil#getNewQueryLabel()}.
+     */
+    @Test
+    public void testGetNewQueryLabel() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.sqlbuilder.util.TextUtil#removeLineBreaks(java.lang.String)}.
+     */
+    @Test
+    public void testRemoveLineBreaks() {
+        String testString = "select \n from\t test where \r id='4' ";
+
+        String expertString = "select   from  test where  id='4' ";
+        assertNull(TextUtil.removeLineBreaks(null));
+
+        assertEquals(TextUtil.removeLineBreaks(testString), expertString);
+    }
+
+    /**
+     * Test method for {@link org.talend.core.sqlbuilder.util.TextUtil#getWrappedText(java.lang.String)}.
+     */
+    @Test
+    public void testGetWrappedTextString() {
+        StringBuilder testString = new StringBuilder();
+
+        String testString1 = null;
+
+        StringBuilder testString2 = new StringBuilder();
+
+        for (int i = 0; i < TextUtil.DEFAULT_WRAPLENGTH; i++) {
+            testString.append("a");
+        }
+
+        for (int i = 0; i < 200; i++) {
+            testString2.append("a");
+        }
+
+        assertEquals(TextUtil.DEFAULT_WRAPLENGTH, TextUtil.getWrappedText(testString.toString()).length());
+
+        assertEquals(testString.substring(0, testString.length()),
+                TextUtil.getWrappedText(testString.toString()).substring(0, testString.length()));
+
+        assertEquals("", TextUtil.getWrappedText(testString1));
+
+        assertEquals(TextUtil.DEFAULT_WRAPLENGTH, TextUtil.getWrappedText(testString2.toString()).length() - 2);
+
+        assertEquals(testString2.substring(0, TextUtil.DEFAULT_WRAPLENGTH + 1),
+                TextUtil.getWrappedText(testString2.toString()).substring(0, TextUtil.DEFAULT_WRAPLENGTH + 1));
+    }
+
+    /**
+     * Test method for {@link org.talend.core.sqlbuilder.util.TextUtil#getWrappedText(java.lang.String, int)}.
+     */
+    @Test
+    public void testGetWrappedTextStringInt() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.sqlbuilder.util.TextUtil#replaceChar(java.lang.String, char, java.lang.String)}.
+     */
+    @Test
+    public void testReplaceChar() {
+        String testString1 = "abcdedfwersdf";
+
+        String testString2 = "";
+
+        String testString3 = null;
+
+        TextUtil TextUtil = mock(TextUtil.class);
+        assertEquals("", TextUtil.replaceChar(testString2, 'a', ""));
+
+        assertNull(TextUtil.replaceChar(testString3, 'a', ""));
+
+        assertEquals("abwhatdedfwersdf", TextUtil.replaceChar(testString1, 'c', "what"));
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.sqlbuilder.util.TextUtil#addSqlQuots(java.lang.String, java.lang.String, java.lang.String)}
+     * .
+     */
+    @Test
+    public void testAddSqlQuots() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.sqlbuilder.util.TextUtil#removeQuots(java.lang.String)}.
+     */
+    @Test
+    public void testRemoveQuots() {
+        String expectString = "select * from test";
+
+        assertEquals("", TextUtil.removeQuots(null));
+
+        assertNotNull(TextUtil.removeQuots("select * from test"));
+
+        assertEquals(expectString, TextUtil.removeQuots("select * from test"));
+
+        assertNotNull(TextUtil.removeQuots("\"select * from test\""));
+
+        assertEquals(expectString, TextUtil.removeQuots("\"select * from test\""));
+    }
+
+    /**
+     * Test method for {@link org.talend.core.sqlbuilder.util.TextUtil#getDialogTitle()}.
+     */
+    @Test
+    public void testGetDialogTitle() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.sqlbuilder.util.TextUtil#setDialogTitle(java.lang.String)}.
+     */
+    @Test
+    public void testSetDialogTitleString() {
+    }
+
+    /**
+     * Test method for
+     * {@link org.talend.core.sqlbuilder.util.TextUtil#setDialogTitle(java.lang.String, java.lang.String, java.lang.String)}
+     * .
+     */
+    @Test
+    public void testSetDialogTitleStringStringString() {
+    }
+
+    /**
+     * Test method for {@link org.talend.core.sqlbuilder.util.TextUtil#isDoubleQuotesNeededDbType(java.lang.String)}.
+     */
+    @Test
+    public void testIsDoubleQuotesNeededDbType() {
+        assertTrue(TextUtil.isDoubleQuotesNeededDbType(EDatabaseTypeName.PSQL.getXmlName()));
+
+        assertTrue(TextUtil.isDoubleQuotesNeededDbType(EDatabaseTypeName.GREENPLUM.getXmlName()));
+
+        assertTrue(TextUtil.isDoubleQuotesNeededDbType(EDatabaseTypeName.PARACCEL.getXmlName()));
+
+        assertTrue(TextUtil.isDoubleQuotesNeededDbType(EDatabaseTypeName.H2.getXmlName()));
+
+        assertFalse(TextUtil.isDoubleQuotesNeededDbType(EDatabaseTypeName.MYSQL.getXmlName()));
+
+        assertFalse(TextUtil.isDoubleQuotesNeededDbType("test"));
+    }
+
+    /**
+     * Test method for {@link org.talend.core.sqlbuilder.util.TextUtil#isOracleDbType(java.lang.String)}.
+     */
+    @Test
+    public void testIsOracleDbType() {
+        assertTrue(TextUtil.isOracleDbType(EDatabaseTypeName.ORACLEFORSID.getXmlName()));
+
+        assertTrue(TextUtil.isOracleDbType(EDatabaseTypeName.ORACLEFORSID.getDisplayName()));
+
+        assertTrue(TextUtil.isOracleDbType(EDatabaseTypeName.ORACLESN.getXmlName()));
+
+        assertTrue(TextUtil.isOracleDbType(EDatabaseTypeName.ORACLESN.getDisplayName()));
+
+        assertTrue(TextUtil.isOracleDbType(EDatabaseTypeName.ORACLE_OCI.getXmlName()));
+        assertTrue(TextUtil.isOracleDbType(EDatabaseTypeName.ORACLE_OCI.getDisplayName()));
+
+        assertFalse(TextUtil.isOracleDbType(EDatabaseTypeName.MYSQL.getDisplayName()));
+
+        assertFalse(TextUtil.isOracleDbType("test"));
+    }
+
+    /**
+     * Test method for {@link org.talend.core.sqlbuilder.util.TextUtil#calEscapeValue(java.lang.String)}.
+     */
+    @Test
+    public void testCalEscapeValue() {
+        String testString = null;
+
+        String testString1 = "select * \\n \\t \\r from test";
+
+        String testString2 = "select * from test";
+
+        assertNull(TextUtil.calEscapeValue(testString));
+
+        assertNotNull(TextUtil.calEscapeValue(testString1));
+
+        assertEquals("select * \n \t \r from test", TextUtil.calEscapeValue(testString1));
+
+        assertEquals(testString2, TextUtil.calEscapeValue(testString2));
+    }
+
+}

org.talend.core/src/main/java/org/talend/core/CoreService.java

@@ -481,6 +481,11 @@ public class CoreService implements ICoreService {
                     BaseData baseData = (BaseData) bundleData;
                     final BundleFile bundleFile = baseData.getBundleFile();
                     final File baseFile = bundleFile.getBaseFile();
+                    // fix for TDI-21162
+                    File jarFile = new File(baseFile.getAbsolutePath(), jarNeeded);
+                    if (jarFile.exists()) {
+                        return;
+                    }
 
                     libManager.retrieve(jarNeeded, baseFile.getAbsolutePath(), new NullProgressMonitor());
                 }

org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java

@@ -525,9 +525,13 @@ public class ProcessorUtilities {
         TimeMeasure.displaySteps = CommonsPlugin.isDebugMode();
         TimeMeasure.measureActive = CommonsPlugin.isDebugMode();
 
-        String idTimer = "generateCode for job: " + jobInfo.getJobName();
-        TimeMeasure.begin(idTimer);
-
+        boolean timerStarted = false;
+        String idTimer = "generateCode for job: <job not loaded yet>";
+        if (jobInfo.getJobName() != null) {
+            idTimer = "generateCode for job: " + jobInfo.getJobName();
+            timerStarted = true;
+            TimeMeasure.begin(idTimer);
+        }
         try {
             if (progressMonitor == null) {
                 progressMonitor = new NullProgressMonitor();
@@ -586,8 +590,12 @@ public class ProcessorUtilities {
             } else {
                 currentProcess = jobInfo.getProcess();
             }
-            TimeMeasure.step(idTimer, "Loading job");
-
+            if (!timerStarted) {
+                idTimer = "generateCode for job: " + currentProcess.getName();
+                TimeMeasure.begin(idTimer);
+            } else {
+                TimeMeasure.step(idTimer, "Loading job");
+            }
             generateJobInfo(jobInfo, isMainJob, currentProcess, selectedProcessItem);
             TimeMeasure.step(idTimer, "generateJobInfo");
 

org.talend.developpement/script/test/run.swtbot.and.unit.test.ant.xml

@@ -97,7 +97,7 @@
                     <include name="org.eclipse.equinox.launcher_*.jar"/>
                 </fileset>
             </classpath>
-            <arg line="-application org.eclipse.test.uitestapplication"/>
+            <arg line="-application org.eclipse.swtbot.eclipse.junit4.headless.swtbottestapplication"/>
             <arg line="-testpluginname ${unit.test-plugin-name}"/>
             <arg line="-testApplication ${test-application} -clean -nl ta --disableLoginDialog -project TEST_NOLOGIN --deleteProjectIfExist -language java -login a@b.c"/>
             <arg line="-classname ${unit.test-class-name}"/>

org.talend.libraries.apache.axis2/.classpath

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/XmlSchema-1.4.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/axiom-api-1.2.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/axiom-impl-1.2.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/axis2-adb-1.5.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/axis2-kernel-1.5.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/axis2-transport-http-1.5.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/axis2-transport-local-1.5.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/axiom-api-1.2.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/axiom-impl-1.2.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/axis2-adb-1.6.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/axis2-kernel-1.6.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/axis2-transport-http-1.6.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/axis2-transport-local-1.6.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/mail-1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/neethi-2.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/neethi-3.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/wstx-asl-3.2.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xmlschema-core-2.0.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/main/java"/>

org.talend.libraries.apache.axis2/META-INF/MANIFEST.MF

@@ -3,26 +3,24 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Axis2
 Bundle-SymbolicName: org.talend.libraries.apache.axis2
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.talend.libraries.apache.axis2.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.apache.commons.httpclient,
  javax.wsdl,
  org.talend.libraries.apache
-Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: lib/activation-1.1.jar,
- lib/axiom-api-1.2.9.jar,
- lib/axiom-impl-1.2.9.jar,
- lib/axis2-adb-1.5.2.jar,
- lib/axis2-kernel-1.5.2.jar,
- lib/axis2-transport-http-1.5.2.jar,
- lib/axis2-transport-local-1.5.2.jar,
+ lib/axiom-api-1.2.13.jar,
+ lib/axiom-impl-1.2.13.jar,
+ lib/axis2-adb-1.6.2.jar,
+ lib/axis2-kernel-1.6.2.jar,
+ lib/axis2-transport-http-1.6.2.jar,
+ lib/axis2-transport-local-1.6.2.jar,
  lib/geronimo-stax-api_1.0_spec-1.0.1.jar,
- lib/httpcore-4.0.jar,
+ lib/httpcore-4.0.1.jar,
  lib/mail-1.4.jar,
- lib/neethi-2.0.4.jar,
+ lib/neethi-3.0.1.jar,
  lib/wstx-asl-3.2.9.jar,
- lib/XmlSchema-1.4.5.jar,
+ lib/xmlschema-core-2.0.1.jar,
  .
 Export-Package: com.ctc.wstx.api,
  com.ctc.wstx.cfg,
@@ -66,9 +64,13 @@ Export-Package: com.ctc.wstx.api,
  org.apache.axiom.ext.io,
  org.apache.axiom.ext.stax,
  org.apache.axiom.ext.stax.datahandler,
+ org.apache.axiom.locator,
+ org.apache.axiom.locator.loader,
  org.apache.axiom.mime,
+ org.apache.axiom.mime.impl.axiom,
  org.apache.axiom.mime.impl.javamail,
  org.apache.axiom.om,
+ org.apache.axiom.om.dom,
  org.apache.axiom.om.ds,
  org.apache.axiom.om.ds.custombuilder,
  org.apache.axiom.om.impl,
@@ -83,7 +85,6 @@ Export-Package: com.ctc.wstx.api,
  org.apache.axiom.om.impl.util,
  org.apache.axiom.om.util,
  org.apache.axiom.om.xpath,
- org.apache.axiom.osgi,
  org.apache.axiom.soap,
  org.apache.axiom.soap.impl.builder,
  org.apache.axiom.soap.impl.llom,
@@ -94,6 +95,7 @@ Export-Package: com.ctc.wstx.api,
  org.apache.axiom.util.base64,
  org.apache.axiom.util.blob,
  org.apache.axiom.util.namespace,
+ org.apache.axiom.util.sax,
  org.apache.axiom.util.stax,
  org.apache.axiom.util.stax.debug,
  org.apache.axiom.util.stax.dialect,
@@ -110,8 +112,8 @@ Export-Package: com.ctc.wstx.api,
  org.apache.axis2.client,
  org.apache.axis2.client.async,
  org.apache.axis2.clustering,
- org.apache.axis2.clustering.configuration,
- org.apache.axis2.clustering.context,
+ org.apache.axis2.clustering.management,
+ org.apache.axis2.clustering.state,
  org.apache.axis2.context,
  org.apache.axis2.context.externalize,
  org.apache.axis2.databinding,
@@ -138,6 +140,8 @@ Export-Package: com.ctc.wstx.api,
  org.apache.axis2.handlers,
  org.apache.axis2.i18n,
  org.apache.axis2.java.security,
+ org.apache.axis2.jaxrs,
+ org.apache.axis2.jsr181,
  org.apache.axis2.modules,
  org.apache.axis2.namespace,
  org.apache.axis2.phaseresolver,
@@ -169,16 +173,17 @@ Export-Package: com.ctc.wstx.api,
  org.apache.http.util,
  org.apache.neethi,
  org.apache.neethi.builders,
+ org.apache.neethi.builders.converters,
  org.apache.neethi.builders.xml,
  org.apache.neethi.util,
  org.apache.ws.commons.schema,
  org.apache.ws.commons.schema.constants,
  org.apache.ws.commons.schema.extensions,
+ org.apache.ws.commons.schema.internal,
  org.apache.ws.commons.schema.resolver,
  org.apache.ws.commons.schema.utils,
  org.codehaus.stax2,
  org.codehaus.stax2.evt,
  org.codehaus.stax2.io,
  org.codehaus.stax2.ri,
- org.codehaus.stax2.validation,
- org.talend.libraries.apache.axis2
+ org.codehaus.stax2.validation

org.talend.libraries.apache.axis2/build.properties

@@ -1,17 +1,15 @@
-source.. = src/main/java/
 output.. = class/
 bin.includes = META-INF/,\
-               .,\
                lib/activation-1.1.jar,\
-               lib/axiom-api-1.2.9.jar,\
-               lib/axiom-impl-1.2.9.jar,\
-               lib/axis2-adb-1.5.2.jar,\
-               lib/axis2-kernel-1.5.2.jar,\
-               lib/axis2-transport-http-1.5.2.jar,\
-               lib/axis2-transport-local-1.5.2.jar,\
+               lib/axiom-api-1.2.13.jar,\
+               lib/axiom-impl-1.2.13.jar,\
+               lib/axis2-adb-1.6.2.jar,\
+               lib/axis2-kernel-1.6.2.jar,\
+               lib/axis2-transport-http-1.6.2.jar,\
+               lib/axis2-transport-local-1.6.2.jar,\
                lib/geronimo-stax-api_1.0_spec-1.0.1.jar,\
-               lib/httpcore-4.0.jar,\
+               lib/httpcore-4.0.1.jar,\
                lib/mail-1.4.jar,\
-               lib/neethi-2.0.4.jar,\
+               lib/neethi-3.0.1.jar,\
                lib/wstx-asl-3.2.9.jar,\
-               lib/XmlSchema-1.4.5.jar
+               lib/xmlschema-core-2.0.1.jar