Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Getting booking-faces back in working order. The build is going to break because of one of Keith's tests that I'm going to let him fix.

Browse Source
This commit is contained in:
Jeremy Grelle
2008-03-06 00:16:36 +00:00
parent ae5abe1f41
commit c0fb6c0b98
23 changed files with 487 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-faces/src/main/java/org/springframework/faces/expression/CompositeFlowVariableResolver.java
View File

@@ -3,10 +3,12 @@ package org.springframework.faces.expression;
import javax.el.CompositeELResolver;
import javax.faces.el.VariableResolver;
import org.springframework.util.ClassUtils;
import org.springframework.webflow.expression.el.ImplicitFlowVariableELResolver;
import org.springframework.webflow.expression.el.RequestContextELResolver;
import org.springframework.webflow.expression.el.ScopeSearchingELResolver;
import org.springframework.webflow.expression.el.SpringBeanWebFlowELResolver;
import org.springframework.webflow.expression.el.SpringSecurityELResolver;
/**
* Assembles {@link RequestContextELResolver} and {@link ScopeSearchingELResolver} into a composite that may be used
@@ -20,6 +22,9 @@ public class CompositeFlowVariableResolver extends ELDelegatingVariableResolver
static {
composite.add(new RequestContextELResolver());
if (ClassUtils.isPresent("org.springframework.security.context.SecurityContextHolder")) {
composite.add(new SpringSecurityELResolver());
}
composite.add(new SpringBeanWebFlowELResolver());
composite.add(new ImplicitFlowVariableELResolver());
composite.add(new ScopeSearchingELResolver());

12
spring-faces/src/main/java/org/springframework/faces/ui/AjaxViewRoot.java
View File

@@ -20,6 +20,7 @@ import javax.faces.event.PhaseId;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.webflow.execution.View;
/**
* Customizes the behavior of an existing UIViewRoot with Ajax-aware processing.
@@ -42,7 +43,7 @@ public class AjaxViewRoot extends DelegatingViewRoot {
private String[] renderIds;
private static final String RENDER_IDS_EXPRESSION = "#{renderIds}";
private static final String RENDER_IDS_EXPRESSION = "#{" + View.RENDER_FRAGMENTS_ATTRIBUTE + "}";
private final ValueBinding renderIdsExpr;
@@ -267,12 +268,11 @@ public class AjaxViewRoot extends DelegatingViewRoot {
if (renderIds == null) {
FacesContext context = FacesContext.getCurrentInstance();
String renderIdsValue = (String) renderIdsExpr.getValue(context);
if (StringUtils.hasText(renderIdsValue)) {
renderIds = StringUtils.delimitedListToStringArray(renderIdsValue, ",", " ");
renderIds = removeNestedChildren(context, getRenderIds());
} else {
renderIds = (String[]) renderIdsExpr.getValue(context);
if (renderIds == null || renderIds.length == 0) {
renderIds = getProcessIds();
} else {
renderIds = removeNestedChildren(context, renderIds);
}
}
return renderIds;