Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge pull request #2281 from kzantow/JENKINS-33663-upgrade-wizard
[JENKINS-33663] - Upgrade wizard
- Loading branch information
Showing
with
1,122 additions
and 508 deletions.
- +7 −11 core/src/main/java/hudson/PluginManager.java
- +127 −20 core/src/main/java/jenkins/install/InstallState.java
- +26 −0 core/src/main/java/jenkins/install/InstallStateFilter.java
- +81 −9 core/src/main/java/jenkins/install/InstallUtil.java
- +144 −100 core/src/main/java/jenkins/install/SetupWizard.java
- +103 −99 core/src/main/java/jenkins/install/UpgradeWizard.java
- +30 −29 core/src/main/java/jenkins/model/Jenkins.java
- +1 −1 core/src/main/resources/hudson/security/GlobalSecurityConfiguration/index.groovy
- +3 −2 core/src/main/resources/jenkins/install/SetupWizard/authenticate-security-token.jelly
- +7 −0 core/src/main/resources/jenkins/install/SetupWizard/client-scripts.jelly
- +6 −0 core/src/main/resources/jenkins/install/SetupWizard/footer.jelly
- +1 −2 core/src/main/resources/jenkins/install/SetupWizard/index.jelly
- +13 −0 core/src/main/resources/jenkins/install/SetupWizard/wizard-ui.jelly
- +17 −5 core/src/main/resources/jenkins/install/UpgradeWizard/{footer.jelly → client-scripts.jelly}
- +3 −0 core/src/main/resources/jenkins/install/UpgradeWizard/client-scripts.properties
- 0 ...ain/resources/jenkins/install/UpgradeWizard/{footer_fr.properties → client-scripts_fr.properties}
- 0 ...ain/resources/jenkins/install/UpgradeWizard/{footer_lt.properties → client-scripts_lt.properties}
- +0 −3 core/src/main/resources/jenkins/install/UpgradeWizard/footer.properties
- +18 −1 core/src/main/resources/jenkins/install/pluginSetupWizard.properties
- +1 −1 core/src/main/resources/jenkins/model/Jenkins/login.jelly
- +1 −1 core/src/main/resources/jenkins/model/Jenkins/loginError.jelly
- +1 −7 core/src/main/resources/lib/layout/html.jelly
- +8 −6 test/src/test/java/jenkins/install/InstallUtilTest.java
- +2 −2 test/src/test/java/jenkins/install/SetupWizardTest.java
- +86 −33 test/src/test/java/jenkins/install/UpgradeWizardTest.java
- +0 −7 test/src/test/java/jenkins/util/SystemPropertiesTest.java
- +9 −0 war/gulpfile.js
- +0 −4 war/src/main/js/api/pluginManager.js
- +177 −82 war/src/main/js/pluginSetupWizardGui.js
- +33 −0 war/src/main/js/templates/pluginSelectList.hbs
- +34 −66 war/src/main/js/templates/pluginSelectionPanel.hbs
- +1 −1 war/src/main/js/templates/successPanel.hbs
- +38 −0 war/src/main/js/templates/upgradePanel.hbs
- +17 −0 war/src/main/js/templates/upgradeSkippedPanel.hbs
- +20 −0 war/src/main/js/templates/upgradeSuccessPanel.hbs
- +40 −0 war/src/main/js/upgradeWizard.js
- +31 −4 war/src/main/js/util/jenkins.js
- +11 −2 war/src/main/less/pluginSetupWizard.less
- +0 −5 war/src/main/webapp/WEB-INF/web.xml
- +12 −0 war/src/main/webapp/css/style.css
- +13 −5 war/src/test/js/pluginSetupWizard-spec.js
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@@ -0,0 +1,26 @@ | ||
package jenkins.install; | ||
|
||
import java.util.List; | ||
|
||
import javax.inject.Provider; | ||
|
||
import hudson.ExtensionList; | ||
import hudson.ExtensionPoint; | ||
|
||
/** | ||
* Allows plugging in to the lifecycle when determining InstallState | ||
* from {@link InstallUtil#getNextInstallState(InstallState)} | ||
*/ | ||
public abstract class InstallStateFilter implements ExtensionPoint { | ||
/** | ||
* Determine the current or next install state, proceed with `return proceed.next()` | ||
*/ | ||
public abstract InstallState getNextInstallState(InstallState current, Provider<InstallState> proceed); | ||
|
||
/** | ||
* Get all the InstallStateFilters, in extension order | ||
*/ | ||
public static List<InstallStateFilter> all() { | ||
return ExtensionList.lookup(InstallStateFilter.class); | ||
} | ||
} |
Oops, something went wrong.