You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jm...@apache.org on 2006/10/05 04:55:55 UTC
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
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>