feat(TUP-18730): merge master

* fix(TUP-18738):UHG - Configuring SVN Polling from TAC

* fix(TUP-18738):UHG - Configuring SVN Polling from TAC

main/plugins/org.talend.repository/plugin.xml

@@ -2938,6 +2938,14 @@
               name="UpdateToJava8VersionMigrationTask"
               version="6.5.1">
         </projecttask>
+       <projecttask
+              beforeLogon="false"
+              breaks="6.5.1"
+              class="org.talend.repository.model.migration.ItemSaveTriggerProjectMigrationTask"
+              id="org.talend.repository.model.migration.ItemSaveTriggerProjectMigrationTask"
+              name="Item Save Trigger"
+              version="7.0.1">
+        </projecttask>
    </extension>
 
    <extension

main/plugins/org.talend.repository/src/main/java/org/talend/repository/model/migration/ItemSaveTriggerProjectMigrationTask.java

@@ -0,0 +1,73 @@
+// ============================================================================
+//
+// Copyright (C) 2006-2017 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.model.migration;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+
+import org.talend.commons.exception.ExceptionHandler;
+import org.talend.core.GlobalServiceRegister;
+import org.talend.core.PluginChecker;
+import org.talend.core.model.general.Project;
+import org.talend.core.model.migration.AbstractJobMigrationTask;
+import org.talend.core.model.properties.Item;
+import org.talend.core.model.repository.ERepositoryObjectType;
+import org.talend.designer.core.model.utils.emf.talendfile.ProcessType;
+import org.talend.repository.model.IProxyRepositoryFactory;
+import org.talend.repository.model.IRepositoryService;
+
+/**
+ * DOC ggu class global comment. Detailled comment
+ */
+public class ItemSaveTriggerProjectMigrationTask extends AbstractJobMigrationTask {
+
+    public List<ERepositoryObjectType> getTypes() {
+        // all items
+        return Arrays.asList((ERepositoryObjectType[]) ERepositoryObjectType.values());
+    }
+
+    @Override
+    public Date getOrder() {
+        GregorianCalendar gc = new GregorianCalendar(2017, 11, 2, 12, 0, 0);
+        return gc.getTime();
+    }
+
+    public ExecutionResult execute(Project project) {
+        if (PluginChecker.isTIS()) {
+            return super.execute(project);
+        }
+        return ExecutionResult.NOTHING_TO_DO;
+    }
+
+    @Override
+    public ExecutionResult execute(Item item) {
+        final ProcessType processType = getProcessType(item);
+        try {
+            if (processType != null) { // for all jobs
+                IRepositoryService service = (IRepositoryService) GlobalServiceRegister.getDefault().getService(
+                        IRepositoryService.class);
+                IProxyRepositoryFactory factory = service.getProxyRepositoryFactory();
+
+                factory.save(item, true); // only need re-save the item to trigger action
+                return ExecutionResult.SUCCESS_NO_ALERT;
+            }
+        } catch (Exception e) {
+            ExceptionHandler.process(e);
+            return ExecutionResult.FAILURE;
+        }
+        return ExecutionResult.NOTHING_TO_DO;
+    }
+
+}

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/actions/importproject/ImportDemoProjectItemsPage.java

@@ -57,6 +57,9 @@ import org.eclipse.ui.internal.wizards.datatransfer.TarFile;
 import org.eclipse.ui.internal.wizards.datatransfer.WizardFileSystemResourceExportPage1;
 import org.osgi.framework.Bundle;
 import org.talend.commons.exception.ExceptionHandler;
+import org.talend.commons.runtime.model.emf.provider.OptionProvider;
+import org.talend.commons.runtime.model.emf.provider.EOptionProvider;
+import org.talend.commons.runtime.model.emf.provider.EmfResourcesFactoryReader;
 import org.talend.commons.ui.runtime.exception.MessageBoxExceptionHandler;
 import org.talend.commons.ui.swt.dialogs.EventLoopProgressMonitor;
 import org.talend.commons.ui.swt.dialogs.ProgressDialog;
@@ -87,6 +90,19 @@ public class ImportDemoProjectItemsPage extends WizardFileSystemResourceExportPa
 
     private final ImportExportHandlersManager importManager = new ImportExportHandlersManager();
 
+    private EOptionProvider demoOption = new OptionProvider() {
+
+        @Override
+        public String getName() {
+            return "RESOURCE_DEMO";
+        }
+
+        @Override
+        public Object getValue() {
+            return Boolean.TRUE;
+        }
+    };
+
     /**
      * ImportDemoProjectPage constructor.
      * 
@@ -332,6 +348,7 @@ public class ImportDemoProjectItemsPage extends WizardFileSystemResourceExportPa
             public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
                 monitorWrap = new EventLoopProgressMonitor(monitor);
                 try {
+                    EmfResourcesFactoryReader.INSTANCE.getLoadOptionsProviders().put(demoOption.getName(), demoOption);
                     for (ResourcesManager resManager : finalCheckManagers) {
                         List<ImportItem> projectRecords = importManager.populateImportingItems(resManager, true, monitorWrap);
                         // clearOverWriteErrorMessages(projectRecords, overwrite);
@@ -340,6 +357,8 @@ public class ImportDemoProjectItemsPage extends WizardFileSystemResourceExportPa
                     }
                 } catch (Exception e) {
                     ExceptionHandler.process(e);
+                } finally {
+                    EmfResourcesFactoryReader.INSTANCE.getLoadOptionsProviders().remove(demoOption.getName());
                 }
                 monitorWrap.done();
                 if (monitor.isCanceled()) {