Return-Path: 
 <continuum-commits-return-2447-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org
Received: (qmail 88779 invoked from network); 5 Oct 2006 02:56:00 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 5 Oct 2006 02:56:00 -0000
Received: (qmail 98788 invoked by uid 500); 5 Oct 2006 02:56:00 -0000
Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org
Received: (qmail 98772 invoked by uid 500); 5 Oct 2006 02:56:00 -0000
Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:continuum-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:continuum-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:continuum-commits@maven.apache.org>
List-Id: <continuum-commits.maven.apache.org>
Reply-To: continuum-dev@maven.apache.org
Delivered-To: mailing list continuum-commits@maven.apache.org
Received: (qmail 98759 invoked by uid 99); 5 Oct 2006 02:56:00 -0000
Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org)
 (140.211.166.84)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Oct 2006 19:56:00 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME
Received: from [140.211.166.113] ([140.211.166.113:60303]
 helo=eris.apache.org)
	by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP
	id EA/AA-20288-F3474254 for <continuum-commits@maven.apache.org>;
 Wed, 04 Oct 2006 19:55:59 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4082C1A981A; Wed,  4 Oct 2006 19:55:55 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r453093 - in
 /maven/continuum/branches/rbac-integration/continuum-webapp/src/main:
 java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
 resources/xwork.xml webapp/groupSummary.jsp
Date: Thu, 05 Oct 2006 02:55:55 -0000
To: continuum-commits@maven.apache.org
From: jmcconnell@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061005025555.4082C1A981A@eris.apache.org>
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jmcconnell
Date: Wed Oct  4 19:55:54 2006
New Revision: 453093

URL: http://svn.apache.org/viewvc?view=rev&rev=453093
Log:
added an information message should the user attempt to log in on a locked account.  I ended up going this route since the redirect-action result seems to drop the actionError message that plexus-security is inserting

Modified:
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/groupSummary.jsp

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java?view=diff&rev=453093&r1=453092&r2=453093
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java Wed Oct  4 19:55:54 2006
@@ -53,6 +53,7 @@
 public class GroupSummaryAction
     extends ContinuumActionSupport
 {
+    private String infoMessage;
 
     private List groups;
 
@@ -180,4 +181,14 @@
         return groups;
     }
 
+
+    public String getInfoMessage()
+    {
+        return infoMessage;
+    }
+
+    public void setInfoMessage( String infoMessage )
+    {
+        this.infoMessage = infoMessage;
+    }
 }

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=453093&r1=453092&r2=453093
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/resources/xwork.xml Wed Oct  4 19:55:54 2006
@@ -50,7 +50,12 @@
        <!-- The following security-* result names arrive from the plexus-security package -->
       <result name="security-login-success" type="redirect-action">groupSummary</result>
       <result name="security-login-cancel" type="redirect-action">groupSummary</result>
-      <result name="security-login-locked" type="redirect-action">groupSummary</result>
+      <result name="security-login-locked" type="redirect-action">
+        <param name="actionName">groupSummary</param>
+        <param name="namespace">/</param>
+        <param name="infoMessage">Account Locked</param> 
+      </result>
+      
       <result name="security-logout" type="redirect-action">groupSummary</result>
       <result name="requires-authentication" type="redirect-action">
         <param name="actionName">login</param>

Modified: maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/groupSummary.jsp?view=diff&rev=453093&r1=453092&r2=453093
==============================================================================
--- maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/groupSummary.jsp (original)
+++ maven/continuum/branches/rbac-integration/continuum-webapp/src/main/webapp/groupSummary.jsp Wed Oct  4 19:55:54 2006
@@ -11,10 +11,15 @@
   <body>
   <div id="h3">
 
-    <h3>Project Groups</h3>
+    <ww:if test="${infoMessage != null}">
+       <p>${infoMessage}</p>
+    </ww:if>
+    <ww:else>
+       <h3>Project Groups</h3>
+    </ww:else>
 
-    <p/>
 
+    
     <ww:if test="${groups == null }">
       No Project Groups Known.
     </ww:if>