diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java index f8d5da9757..ef4b338822 100644 --- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java +++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java @@ -81,6 +81,8 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; /** * {@link SecurityRealm} that performs authentication by looking up {@link User}. @@ -130,6 +132,11 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea return !disableSignup; } + @Restricted(NoExternalUse.class) // Jelly + public boolean getAllowsSignup() { + return allowsSignup(); + } + /** * Checks if captcha is enabled on user signup. * @@ -681,11 +688,6 @@ public class HudsonPrivateSecurityRealm extends AbstractPasswordBasedSecurityRea public String getDisplayName() { return Messages.HudsonPrivateSecurityRealm_DisplayName(); } - - @Override - public String getHelpFile() { - return "/help/security/private-realm.html"; - } } private static final Filter CREATE_FIRST_USER_FILTER = new Filter() { diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly index a60438f425..c6a016f60e 100644 --- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly +++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/config.jelly @@ -25,8 +25,8 @@ THE SOFTWARE. - - + + diff --git a/war/src/main/webapp/help/security/private-realm/allow-signup.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm/allow-signup.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup.html diff --git a/war/src/main/webapp/help/security/private-realm/allow-signup_de.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_de.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm/allow-signup_de.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_de.html diff --git a/war/src/main/webapp/help/security/private-realm/allow-signup_fr.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_fr.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm/allow-signup_fr.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_fr.html diff --git a/war/src/main/webapp/help/security/private-realm/allow-signup_ja.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_ja.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm/allow-signup_ja.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_ja.html diff --git a/war/src/main/webapp/help/security/private-realm/allow-signup_tr.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_tr.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm/allow-signup_tr.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_tr.html diff --git a/war/src/main/webapp/help/security/private-realm/allow-signup_zh_CN.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_zh_CN.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm/allow-signup_zh_CN.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_zh_CN.html diff --git a/war/src/main/webapp/help/security/private-realm/allow-signup_zh_TW.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_zh_TW.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm/allow-signup_zh_TW.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help-allowsSignup_zh_TW.html diff --git a/war/src/main/webapp/help/security/private-realm.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help.html diff --git a/war/src/main/webapp/help/security/private-realm_de.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_de.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm_de.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_de.html diff --git a/war/src/main/webapp/help/security/private-realm_fr.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_fr.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm_fr.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_fr.html diff --git a/war/src/main/webapp/help/security/private-realm_ja.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_ja.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm_ja.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_ja.html diff --git a/war/src/main/webapp/help/security/private-realm_pt_BR.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_pt_BR.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm_pt_BR.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_pt_BR.html diff --git a/war/src/main/webapp/help/security/private-realm_ru.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_ru.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm_ru.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_ru.html diff --git a/war/src/main/webapp/help/security/private-realm_tr.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_tr.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm_tr.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_tr.html diff --git a/war/src/main/webapp/help/security/private-realm_zh_CN.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_zh_CN.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm_zh_CN.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_zh_CN.html diff --git a/war/src/main/webapp/help/security/private-realm_zh_TW.html b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_zh_TW.html similarity index 100% rename from war/src/main/webapp/help/security/private-realm_zh_TW.html rename to core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/help_zh_TW.html