[MRM-1168]

submitted by Jevica Arianne Zurbano

o add info message for account locked

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@781339 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
index 4060df7301fda8a14d68fa087a6854872d52e8c2..ac91cd9e9154e392de9401d685d2a54f8dd61d0a 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
@@ -124,6 +124,8 @@ public class SearchAction
     private RepositorySearch nexusSearch;
     
     private Map<String, String> searchFields;
+
+    private String infoMessage;
         
     public boolean isFromResultsPage()
     {
@@ -659,4 +661,14 @@ public class SearchAction
     {
         this.searchFields = searchFields;
     }
+    
+    public String getInfoMessage()
+    {
+        return infoMessage;
+    }
+
+    public void setInfoMessage( String infoMessage )
+    {
+        this.infoMessage = infoMessage;
+    }
 }

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
index b29ea21c6e26f32a3b066825515c3d86330df371..8df1acfddd5ba7958afec57346501f9c6f44697f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
@@ -82,8 +82,8 @@
       <result name="security-login-success" type="redirect-action">index</result>
       <result name="security-login-cancel" type="redirect-action">index</result>
       <result name="security-login-locked" type="redirect-action">
-        <param name="infoMessage">Account Locked</param>
         <param name="actionName">index</param>
+        <param name="infoMessage">Account Locked</param>
       </result>
       <result name="security-logout" type="redirect-action">index</result>
       <result name="requires-authentication" type="redirect-action">