mirror of https://github.com/apache/archiva.git
PR: MRM-246
Added display of error messages when an account is locked after 3 unsuccessful login attempts. git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@483341 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
46a6f6866e
commit
a70aca498a
|
@ -80,6 +80,8 @@ public class SearchAction
|
||||||
|
|
||||||
private static final String ARTIFACT = "artifact";
|
private static final String ARTIFACT = "artifact";
|
||||||
|
|
||||||
|
private String infoMessage;
|
||||||
|
|
||||||
public String quickSearch()
|
public String quickSearch()
|
||||||
throws MalformedURLException, RepositoryIndexException, RepositoryIndexSearchException,
|
throws MalformedURLException, RepositoryIndexException, RepositoryIndexSearchException,
|
||||||
ConfigurationStoreException, ParseException
|
ConfigurationStoreException, ParseException
|
||||||
|
@ -185,4 +187,14 @@ public class SearchAction
|
||||||
{
|
{
|
||||||
return searchResults;
|
return searchResults;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getInfoMessage()
|
||||||
|
{
|
||||||
|
return infoMessage;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setInfoMessage( String infoMessage )
|
||||||
|
{
|
||||||
|
this.infoMessage = infoMessage;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,7 +76,10 @@
|
||||||
<!-- The following security-* result names arrive from the plexus-security package -->
|
<!-- The following security-* result names arrive from the plexus-security package -->
|
||||||
<result name="security-login-success" type="redirect-action">index</result>
|
<result name="security-login-success" type="redirect-action">index</result>
|
||||||
<result name="security-login-cancel" type="redirect-action">index</result>
|
<result name="security-login-cancel" type="redirect-action">index</result>
|
||||||
<result name="security-login-locked" type="redirect-action">index</result>
|
<result name="security-login-locked" type="redirect-action">
|
||||||
|
<param name="infoMessage">Account Locked</param>
|
||||||
|
<param name="actionName">index</param>
|
||||||
|
</result>
|
||||||
<result name="security-logout" type="redirect-action">index</result>
|
<result name="security-logout" type="redirect-action">index</result>
|
||||||
<result name="requires-authentication" type="redirect-action">
|
<result name="requires-authentication" type="redirect-action">
|
||||||
<param name="actionName">login</param>
|
<param name="actionName">login</param>
|
||||||
|
|
|
@ -21,6 +21,10 @@
|
||||||
<ww:head />
|
<ww:head />
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
<ww:if test="%{infoMessage != null}">
|
||||||
|
<p>${infoMessage}</p>
|
||||||
|
</ww:if>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<h1>Search</h1>
|
<h1>Search</h1>
|
||||||
|
|
Loading…
Reference in New Issue