added option to skip failed authenticators

This commit is contained in:
Sebastian Sdorra
2014-02-16 15:41:48 +01:00
parent cb3ad8f19b
commit 7d198a2d95
5 changed files with 160 additions and 60 deletions

View File

@@ -233,17 +233,6 @@ public class ScmConfiguration
return baseUrl;
}
/**
* Returns the realm description.
*
*
* @return realm description
*/
public String getRealmDescription()
{
return realmDescription;
}
/**
* Returns the date format for the user interface. This format is a
* JavaScript date format, from the library moment.js.
@@ -375,6 +364,17 @@ public class ScmConfiguration
return proxyUser;
}
/**
* Returns the realm description.
*
*
* @return realm description
*/
public String getRealmDescription()
{
return realmDescription;
}
/**
* Returns the servername of the SCM-Manager host.
*
@@ -482,6 +482,19 @@ public class ScmConfiguration
return forceBaseUrl;
}
/**
* Method description
*
*
* @return
*
* @since 1.36
*/
public boolean isSkipFailedAuthenticators()
{
return skipFailedAuthenticators;
}
//~--- set methods ----------------------------------------------------------
/**
@@ -529,17 +542,6 @@ public class ScmConfiguration
this.baseUrl = baseUrl;
}
/**
* Sets the realm description.
*
*
* @param realmDescription
*/
public void setRealmDescription(String realmDescription)
{
this.realmDescription = realmDescription;
}
/**
* Sets the date format for the ui.
*
@@ -733,6 +735,17 @@ public class ScmConfiguration
this.proxyUser = proxyUser;
}
/**
* Sets the realm description.
*
*
* @param realmDescription
*/
public void setRealmDescription(String realmDescription)
{
this.realmDescription = realmDescription;
}
/**
* Method description
*
@@ -745,6 +758,19 @@ public class ScmConfiguration
this.servername = servername;
}
/**
* Method description
*
*
* @param skipFailedAuthenticators
*
* @since 1.36
*/
public void setSkipFailedAuthenticators(boolean skipFailedAuthenticators)
{
this.skipFailedAuthenticators = skipFailedAuthenticators;
}
/**
* Method description
*
@@ -790,21 +816,6 @@ public class ScmConfiguration
@XmlElement(name = "login-attempt-limit")
private int loginAttemptLimit = -1;
/**
* Login attempt timeout.
*
* @since 1.34
*/
@XmlElement(name = "login-attempt-limit-timeout")
private long loginAttemptLimitTimeout = TimeUnit.MINUTES.toSeconds(5l);
/** Field description */
private boolean enableProxy = false;
/** Field description */
@XmlElement(name = "plugin-url")
private String pluginUrl = DEFAULT_PLUGINURL;
/** glob patterns for urls which are excluded from proxy */
@XmlElement(name = "proxy-excludes")
@XmlJavaTypeAdapter(XmlSetStringAdapter.class)
@@ -825,10 +836,33 @@ public class ScmConfiguration
/** @deprecated use {@link #baseUrl} */
private String servername = "localhost";
/**
* Skip failed authenticators.
*
* @since 1.36
*/
@XmlElement(name = "skip-failed-authenticators")
private boolean skipFailedAuthenticators = false;
/** Field description */
@XmlElement(name = "plugin-url")
private String pluginUrl = DEFAULT_PLUGINURL;
/**
* Login attempt timeout.
*
* @since 1.34
*/
@XmlElement(name = "login-attempt-limit-timeout")
private long loginAttemptLimitTimeout = TimeUnit.MINUTES.toSeconds(5l);
/** @deprecated use {@link #baseUrl} and {@link #forceBaseUrl} */
@Deprecated
private boolean enableSSL = false;
/** Field description */
private boolean enableProxy = false;
/** @deprecated use {@link #baseUrl} */
@Deprecated
private boolean enablePortForward = false;
@@ -837,6 +871,13 @@ public class ScmConfiguration
@Deprecated
private int sslPort = 8181;
/**
*
* Authentication realm for basic authentication.
*
*/
private String realmDescription = HttpUtil.AUTHENTICATION_REALM;
/** Configuration change listeners */
@XmlTransient
private Set<ConfigChangedListener> listeners =
@@ -848,13 +889,6 @@ public class ScmConfiguration
/** Field description */
private boolean disableGroupingGrid = false;
/**
*
* Authentication realm for basic authentication.
*
*/
private String realmDescription = HttpUtil.AUTHENTICATION_REALM;
/**
* JavaScript date format from moment.js
* @see <a href="http://momentjs.com/docs/#/parsing/" target="_blank">http://momentjs.com/docs/#/parsing/</a>