From: Maria Odea B. Ching Date: Thu, 7 Dec 2006 04:08:03 +0000 (+0000) Subject: PR: MRM-246 X-Git-Tag: archiva-0.9-alpha-1~240 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a70aca498a25981517b224bee246a73ca5226298;p=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 --- diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java index bc6f44321..97ec432bc 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java @@ -80,6 +80,8 @@ public class SearchAction private static final String ARTIFACT = "artifact"; + private String infoMessage; + public String quickSearch() throws MalformedURLException, RepositoryIndexException, RepositoryIndexSearchException, ConfigurationStoreException, ParseException @@ -185,4 +187,14 @@ public class SearchAction { return searchResults; } + + public String getInfoMessage() + { + return infoMessage; + } + + public void setInfoMessage( String infoMessage ) + { + this.infoMessage = infoMessage; + } } diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml index 0b7f19c8f..b996394c3 100644 --- a/archiva-webapp/src/main/resources/xwork.xml +++ b/archiva-webapp/src/main/resources/xwork.xml @@ -76,7 +76,10 @@ index index - index + + Account Locked + index + index login diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp index 82ed0351c..8fed222dd 100644 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp +++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp @@ -21,6 +21,10 @@ + +

${infoMessage}

+ +