You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by th...@apache.org on 2012/05/11 13:08:28 UTC
svn commit: r1337110 - in /cocoon/cocoon3/trunk:
cocoon-shiro-sample/src/main/resources/COB-INF/login.xml
cocoon-shiro/src/main/java/org/apache/cocoon/shiro/rest/AbstractShiroLogin.java
Author: thorsten
Date: Fri May 11 11:08:28 2012
New Revision: 1337110
URL: http://svn.apache.org/viewvc?rev=1337110&view=rev
Log:
Renaming paramter to point to the expected boolean character
Modified:
cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/COB-INF/login.xml
cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/shiro/rest/AbstractShiroLogin.java
Modified: cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/COB-INF/login.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/COB-INF/login.xml?rev=1337110&r1=1337109&r2=1337110&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/COB-INF/login.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-shiro-sample/src/main/resources/COB-INF/login.xml Fri May 11 11:08:28 2012
@@ -32,8 +32,8 @@
<input type="password" size="20" name="password"></input><br/>
<input type="submit" name="login" value="Login"></input>
</form>
- $if(error)$
- <strong>error: $error$ There has been an error in the login.</strong>
+ $if(isError)$
+ <strong>error: $isError$ There has been an error in the login.</strong>
$endif$
</div>
</body>
Modified: cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/shiro/rest/AbstractShiroLogin.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/shiro/rest/AbstractShiroLogin.java?rev=1337110&r1=1337109&r2=1337110&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/shiro/rest/AbstractShiroLogin.java (original)
+++ cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/shiro/rest/AbstractShiroLogin.java Fri May 11 11:08:28 2012
@@ -122,7 +122,7 @@ public abstract class AbstractShiroLogin
if (errorData == null) {
errorData = new HashMap<String, Object>();
}
- errorData.put("error", true);
+ errorData.put("isError", true);
errorData.put("to", getTo());
errorData.put("loginAttemptExceeded", attemptsExceeded);
return getErrorResponse(errorData);
@@ -195,7 +195,7 @@ public abstract class AbstractShiroLogin
}
Map<String, Object> data = new HashMap<String, Object>();
data.put("to", getTo());
- data.put("error", false);
+ data.put("isError", false);
data.put("loginAttemptExceeded",
subject.getSession().getAttribute(LOGIN_ATTEMPTS_EXCEEDED));
return getLoginPage(data);