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

executor refinements; better exception handling, flow handler adapter mvc integration, 1.x usage compatability

Browse Source
This commit is contained in:
Keith Donald
2008-02-26 16:10:16 +00:00
parent 631f0667ea
commit 9804e6a858
48 changed files with 785 additions and 1478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-faces/src/main/java/org/springframework/faces/ui/resource/FlowResourceHelper.java
View File

@@ -10,8 +10,6 @@ import java.util.Set;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import org.springframework.webflow.context.FlowDefinitionRequestInfo;
import org.springframework.webflow.context.RequestPath;
import org.springframework.webflow.execution.RequestContext;
import org.springframework.webflow.execution.RequestContextHolder;
@@ -64,9 +62,7 @@ public class FlowResourceHelper {
writer.writeAttribute(key, attributes.get(key), null);
}
FlowDefinitionRequestInfo requestInfo = new FlowDefinitionRequestInfo("resources", new RequestPath(scriptPath),
null, null);
String src = requestContext.getExternalContext().buildFlowDefinitionUrl(requestInfo);
String src = requestContext.getExternalContext().getContextPath() + "/resources" + scriptPath;
writer.writeAttribute("src", src, null);
@@ -96,9 +92,7 @@ public class FlowResourceHelper {
writer.writeAttribute("type", "text/css", null);
writer.writeAttribute("rel", "stylesheet", null);
FlowDefinitionRequestInfo requestInfo = new FlowDefinitionRequestInfo("resources", new RequestPath(cssPath),
null, null);
String src = requestContext.getExternalContext().buildFlowDefinitionUrl(requestInfo);
String src = requestContext.getExternalContext().getContextPath() + "/resources" + cssPath;
writer.writeAttribute("href", src, null);

4
spring-faces/src/main/java/org/springframework/faces/webflow/JsfView.java
View File

@@ -95,8 +95,8 @@ public class JsfView implements View {
FacesContextFactory facesContextFactory = (FacesContextFactory) FactoryFinder
.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
FacesContext defaultFacesContext = facesContextFactory.getFacesContext(context.getExternalContext()
.getContext(), context.getExternalContext().getRequest(), context.getExternalContext().getResponse(),
facesLifecycle);
.getNativeContext(), context.getExternalContext().getNativeRequest(), context.getExternalContext()
.getNativeResponse(), facesLifecycle);
return new FlowFacesContext(context, defaultFacesContext);
}

4
spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java
View File

@@ -129,8 +129,8 @@ public class JsfViewFactory implements ViewFactory {
FacesContextFactory facesContextFactory = (FacesContextFactory) FactoryFinder
.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
FacesContext defaultFacesContext = facesContextFactory.getFacesContext(context.getExternalContext()
.getContext(), context.getExternalContext().getRequest(), context.getExternalContext().getResponse(),
lifecycle);
.getNativeContext(), context.getExternalContext().getNativeRequest(), context.getExternalContext()
.getNativeResponse(), lifecycle);
return new FlowFacesContext(context, defaultFacesContext);
}