[314823] No Apply/Restart prompt after server adapter installation
diff --git a/plugins/org.eclipse.wst.server.discovery/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.discovery/META-INF/MANIFEST.MF index eaa669d..b47d0b2 100644 --- a/plugins/org.eclipse.wst.server.discovery/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.wst.server.discovery/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-Name: %bundleName Bundle-Vendor: %bundleVendor Bundle-SymbolicName: org.eclipse.wst.server.discovery;singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 1.0.200.qualifier Bundle-Activator: org.eclipse.wst.server.discovery.internal.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0)", org.eclipse.ui;bundle-version="[3.5.0,4.0)",
diff --git a/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/ExtensionWizard.java b/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/ExtensionWizard.java index 96f7e8a..ed9cb12 100644 --- a/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/ExtensionWizard.java +++ b/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/ExtensionWizard.java
@@ -13,7 +13,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.equinox.internal.p2.ui.ProvisioningOperationRunner; import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.p2.operations.ProvisioningJob; import org.eclipse.equinox.p2.ui.AcceptLicensesWizardPage; import org.eclipse.equinox.p2.ui.ProvisioningUI; import org.eclipse.jface.dialogs.MessageDialog; @@ -123,6 +125,11 @@ return extension.install(monitor); } }; + + // Request a restart when the installation is completed (bugzilla# 314823) + ProvisioningOperationRunner por = new ProvisioningOperationRunner(ProvisioningUI.getDefaultUI()); + por.manageJob(job, ProvisioningJob.RESTART_OR_APPLY); + job.setUser(true); job.schedule(); return true;
diff --git a/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/Messages.properties b/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/Messages.properties index 706bf8b..2d6534b 100644 --- a/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/Messages.properties +++ b/plugins/org.eclipse.wst.server.discovery/src/org/eclipse/wst/server/discovery/internal/Messages.properties
@@ -18,7 +18,7 @@ discoverSearching=Searching {0} discoverSiteError=Could not connect to {0} -installConfirm=Support for {0} will now be downloaded and installed. You will need to restart once the installation is complete. +installConfirm=Support for {0} will now be downloaded and installed. You will be prompted to restart once the installation is complete. installJobName=Installing {0} dialogTitle=Install Extension