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

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

@ -24,9 +24,11 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag {
private Tag parent; private Tag parent;
protected PageContext pageContext;
protected String id; protected String id;
protected PageContext pageContext; private String var;
/** /**
* Invokes the base class {@link AbstractAuthorizeTag#authorize()} method to * Invokes the base class {@link AbstractAuthorizeTag#authorize()} method to
@ -40,7 +42,13 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag {
setIfAllGranted(ExpressionEvaluationUtils.evaluateString("ifAllGranted", getIfAllGranted(), pageContext)); setIfAllGranted(ExpressionEvaluationUtils.evaluateString("ifAllGranted", getIfAllGranted(), pageContext));
setIfAnyGranted(ExpressionEvaluationUtils.evaluateString("ifAnyGranted", getIfAnyGranted(), 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) { } catch (IOException e) {
throw new JspException(e); throw new JspException(e);
@ -74,6 +82,14 @@ public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag {
this.parent = parent; this.parent = parent;
} }
public String getVar() {
return var;
}
public void setVar(String var) {
this.var = var;
}
public void release() { public void release() {
parent = null; parent = null;
id = null; id = null;