From 2956abc8325ad685c58a186b3d6107a24ad8eb8a Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Wed, 30 Jul 2008 21:37:01 +0000 Subject: [PATCH] added support for jspx --- build-spring-webflow/resources/changelog.txt | 2 +- build-spring-webflow/resources/readme.txt | 7 ++++--- .../webflow/mvc/builder/FlowResourceFlowViewResolver.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build-spring-webflow/resources/changelog.txt b/build-spring-webflow/resources/changelog.txt index ddabc6f2..6ab000c2 100644 --- a/build-spring-webflow/resources/changelog.txt +++ b/build-spring-webflow/resources/changelog.txt @@ -2,7 +2,7 @@ SPRING WEB FLOW CHANGELOG ========================= http://www.springframework.org/webflow -Changes in version 2.0.3 (15.07.2008) +Changes in version 2.0.3 (31.07.2008) ------------------------------------- Changes in version 2.0.2 (06.06.2008) diff --git a/build-spring-webflow/resources/readme.txt b/build-spring-webflow/resources/readme.txt index e37bff3f..5c4acd8f 100644 --- a/build-spring-webflow/resources/readme.txt +++ b/build-spring-webflow/resources/readme.txt @@ -75,12 +75,13 @@ This distribution contains documentation and sample applications demonstrating t A great way to get started is to review and run the sample applications, supplementing with reference manual material as you go. To build deployable .war files for all samples, simply access the projects/build-spring-webflow directory and run ant. All projects are directly importable into Eclipse as "Dynamic Web Projects". -See projects/spring-webflow-samples/readme.txt for more information. +See http://www.springframework.org/webflow-samples for more information. -5. OBTAINING RELEASE JARS USING MAVEN OR IVY --------------------------------------------- +5. OBTAINING RELEASE JARS FROM THE SPRINGSOURCE BUNDLE REPOSITORY +----------------------------------------------------------------- Each jar in the Web Flow distribution is available in the SpringSource release repository. These jars may be accessed using Maven or Ivy dependency managers. +Browse the contents of the repository by accessing http://www.springsource.com/repository. To access jars using Maven, add the following repositories to your Maven pom: diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/builder/FlowResourceFlowViewResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/builder/FlowResourceFlowViewResolver.java index 93ed9407..da0f9923 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/builder/FlowResourceFlowViewResolver.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/builder/FlowResourceFlowViewResolver.java @@ -80,7 +80,7 @@ public class FlowResourceFlowViewResolver implements FlowViewResolver { // internal helpers private View getViewInternal(String viewPath, RequestContext context, ApplicationContext flowContext) { - if (viewPath.endsWith(".jsp")) { + if (viewPath.endsWith(".jsp") || viewPath.endsWith(".jspx")) { if (JSTL_PRESENT) { JstlView view = new JstlView(viewPath); view.setApplicationContext(flowContext); @@ -92,7 +92,7 @@ public class FlowResourceFlowViewResolver implements FlowViewResolver { } } else { throw new IllegalArgumentException("Unsupported view type " + viewPath - + " only types supported by this FlowViewResolver implementation are [.jsp]"); + + " only types supported by this FlowViewResolver implementation are [.jsp] and [.jspx]"); } } } \ No newline at end of file