From f60e43c36779ac5be641a15066498f63faaf3b6c Mon Sep 17 00:00:00 2001 From: Jeremy Grelle Date: Thu, 6 Mar 2008 22:11:28 +0000 Subject: [PATCH] Cleanup. --- .../ui/BaseDojoParentComponentRenderer.java | 3 --- .../faces/ui/DojoRenderer.java | 3 --- .../faces/ui/resource/ResourceServlet.java | 5 +---- .../faces/webflow/JsfViewFactoryCreator.java | 6 ++++++ .../webflow/JsfFinalResponseActionTests.java | 4 ++-- .../faces/webflow/JsfViewFactoryTests.java | 20 +++++++++---------- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoParentComponentRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoParentComponentRenderer.java index 66f66a1a..8dc1da1b 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoParentComponentRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoParentComponentRenderer.java @@ -13,8 +13,6 @@ public abstract class BaseDojoParentComponentRenderer extends BaseSpringFacesPar private String dojoJsResourceUri = "/dojo/dojo.js"; - private String dojoCssResourceUri = "/dojo/resources/dojo.css"; - private String dijitThemePath = "/dijit/themes/"; private String dijitTheme = "tundra"; @@ -26,7 +24,6 @@ public abstract class BaseDojoParentComponentRenderer extends BaseSpringFacesPar public void encodeBegin(FacesContext context, UIComponent component) throws IOException { super.encodeBegin(context, component); - resourceHelper.renderStyleLink(context, dojoCssResourceUri); resourceHelper.renderStyleLink(context, dijitThemePath + dijitTheme + "/" + dijitTheme + ".css"); Map dojoAttributes = new HashMap(); diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java index 45719ed3..7ed704b4 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java @@ -28,8 +28,6 @@ public class DojoRenderer extends SpringFacesRenderer { private String dojoJsResourceUri = "/dojo/dojo.js"; - private String dojoCssResourceUri = "/dojo/resources/dojo.css"; - private String dijitThemePath = "/dijit/themes/"; private String dijitTheme = "tundra"; @@ -42,7 +40,6 @@ public class DojoRenderer extends SpringFacesRenderer { super.encodeBegin(context, component); - resourceHelper.renderStyleLink(context, dojoCssResourceUri); resourceHelper.renderStyleLink(context, dijitThemePath + dijitTheme + "/" + dijitTheme + ".css"); Map dojoAttributes = new HashMap(); diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/resource/ResourceServlet.java b/spring-faces/src/main/java/org/springframework/faces/ui/resource/ResourceServlet.java index 96dca59f..094bf5d7 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/resource/ResourceServlet.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/resource/ResourceServlet.java @@ -117,10 +117,7 @@ public class ResourceServlet extends HttpServlet { } private URL getRequestResourceURL(String localResourcePath) throws MalformedURLException { - if (localResourcePath.contains("/resources")){ - localResourcePath = localResourcePath.replaceAll("/resources", ""); - } - + String jarResourcePath = "META-INF" + localResourcePath; URL resource; diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactoryCreator.java b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactoryCreator.java index 814a6580..c6e923bf 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactoryCreator.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactoryCreator.java @@ -32,6 +32,8 @@ import org.springframework.webflow.execution.ViewFactory; */ public class JsfViewFactoryCreator implements ViewFactoryCreator { + private static final String FACELETS_EXTENSION = ".xhtml"; + private Lifecycle lifecycle; public Action createFinalResponseAction(Expression viewName, ResourceLoader resourceLoader) { @@ -56,4 +58,8 @@ public class JsfViewFactoryCreator implements ViewFactoryCreator { return lifecycle; } + public String createViewIdByConvention(String viewStateId) { + return viewStateId + FACELETS_EXTENSION; + } + } diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/JsfFinalResponseActionTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/JsfFinalResponseActionTests.java index 3597fabb..494057c1 100644 --- a/spring-faces/src/test/java/org/springframework/faces/webflow/JsfFinalResponseActionTests.java +++ b/spring-faces/src/test/java/org/springframework/faces/webflow/JsfFinalResponseActionTests.java @@ -71,8 +71,8 @@ public class JsfFinalResponseActionTests extends TestCase { jsfMock.facesContext().setViewRoot(null); jsfMock.facesContext().getApplication().setViewHandler(viewHandler); lifecycle = new TestLifecycle(jsfMock.lifecycle()); - factory = new JsfViewFactory(parser.parseExpression("#{'" + VIEW_ID + "'}", new ParserContextImpl().eval( - RequestContext.class).expect(String.class)), null, lifecycle); + factory = new JsfViewFactory(parser.parseExpression("#{'" + VIEW_ID + "'}", new ParserContextImpl().template() + .eval(RequestContext.class).expect(String.class)), null, lifecycle); finalResponseAction = new JsfFinalResponseAction(factory); RequestContextHolder.setRequestContext(context); MockExternalContext ext = new MockExternalContext(); diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/JsfViewFactoryTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/JsfViewFactoryTests.java index cbd1b6f9..8da33eb9 100644 --- a/spring-faces/src/test/java/org/springframework/faces/webflow/JsfViewFactoryTests.java +++ b/spring-faces/src/test/java/org/springframework/faces/webflow/JsfViewFactoryTests.java @@ -82,8 +82,8 @@ public class JsfViewFactoryTests extends TestCase { public final void testGetView_Create() { lifecycle = new NoEventLifecycle(jsfMock.lifecycle()); - factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().eval(RequestContext.class) - .expect(String.class)), null, lifecycle); + factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().template().eval( + RequestContext.class).expect(String.class)), null, lifecycle); UIViewRoot newRoot = new UIViewRoot(); newRoot.setViewId(VIEW_ID); @@ -106,8 +106,8 @@ public class JsfViewFactoryTests extends TestCase { public final void testGetView_Restore_NoEvent() { lifecycle = new NoEventLifecycle(jsfMock.lifecycle()); - factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().eval(RequestContext.class) - .expect(String.class)), null, lifecycle); + factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().template().eval( + RequestContext.class).expect(String.class)), null, lifecycle); UIViewRoot existingRoot = new UIViewRoot(); existingRoot.setViewId(VIEW_ID); @@ -131,8 +131,8 @@ public class JsfViewFactoryTests extends TestCase { public final void testGetView_Restore_Ajax_NoEvent() { lifecycle = new NoEventLifecycle(jsfMock.lifecycle()); - factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().eval(RequestContext.class) - .expect(String.class)), null, lifecycle); + factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().template().eval( + RequestContext.class).expect(String.class)), null, lifecycle); UIViewRoot existingRoot = new UIViewRoot(); existingRoot.setViewId(VIEW_ID); @@ -160,8 +160,8 @@ public class JsfViewFactoryTests extends TestCase { public final void testGetView_Restore_EventSignaled() { lifecycle = new EventSignalingLifecycle(jsfMock.lifecycle()); - factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().eval(RequestContext.class) - .expect(String.class)), null, lifecycle); + factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().template().eval( + RequestContext.class).expect(String.class)), null, lifecycle); UIViewRoot existingRoot = new UIViewRoot(); existingRoot.setViewId(VIEW_ID); @@ -185,8 +185,8 @@ public class JsfViewFactoryTests extends TestCase { public final void testGetView_ExternalViewRoot() { lifecycle = new NoEventLifecycle(jsfMock.lifecycle()); - factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().eval(RequestContext.class) - .expect(String.class)), null, lifecycle); + factory = new JsfViewFactory(parser.parseExpression(VIEW_ID, new ParserContextImpl().template().eval( + RequestContext.class).expect(String.class)), null, lifecycle); UIViewRoot newRoot = new UIViewRoot(); newRoot.setViewId(VIEW_ID);