Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWC-1552 Update .tld in integration test to match change in taglib.

This commit is contained in:
Rossen Stoyanchev 2010-10-26 14:00:45 +01:00
parent 70600a0277
commit bd84a2bfa1
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
itest/web/src/main/webapp/WEB-INF/security.tld
View File

@ -13,7 +13,7 @@
<tag>
<name>authorize</name>
<tag-class>org.springframework.security.taglibs.authz.AuthorizeTag</tag-class>
<tag-class>org.springframework.security.taglibs.authz.JspAuthorizeTag</tag-class>
<description>
A tag which outputs the body of the tag if the configured access expression
evaluates to true for the currently authenticated principal.

22
taglibs/src/main/java/org/springframework/security/taglibs/authz/JspAuthorizeTag.java
View File

@ -24,10 +24,12 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag {
private Tag parent;
protected String id;
protected PageContext pageContext;
protected String id;
private String var;
/**
* Invokes the base class {@link AbstractAuthorizeTag#authorize()} method to
* decide if the body of the tag should be skipped or not.
@ -40,7 +42,13 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag {
setIfAllGranted(ExpressionEvaluationUtils.evaluateString("ifAllGranted", getIfAllGranted(), pageContext));
setIfAnyGranted(ExpressionEvaluationUtils.evaluateString("ifAnyGranted", getIfAnyGranted(), pageContext));
return super.authorize() ? Tag.EVAL_BODY_INCLUDE : Tag.SKIP_BODY;
int result = super.authorize() ? Tag.EVAL_BODY_INCLUDE : Tag.SKIP_BODY;
if (var != null) {
pageContext.setAttribute(var, Boolean.valueOf(result == EVAL_BODY_INCLUDE), PageContext.PAGE_SCOPE);
}
return result;
} catch (IOException e) {
throw new JspException(e);
@ -73,6 +81,14 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag {
public void setParent(Tag parent) {
this.parent = parent;
}
public String getVar() {
return var;
}
public void setVar(String var) {
this.var = var;
}
public void release() {
parent = null;