From d1afb290744667dcc5f0cd9b8c91e71164e2460c Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sun, 15 Aug 2010 22:57:37 +0000 Subject: [PATCH] Servlet/PortletContextResource inherit isReadable, contentLength and lastModified from AbstractFileResolvingResource --- .../web/portlet/context/PortletContextResource.java | 7 +++---- .../web/context/support/ServletContextResource.java | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java index ef6dde6d37..365dad1d38 100644 --- a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java +++ b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,10 +22,9 @@ import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; - import javax.portlet.PortletContext; -import org.springframework.core.io.AbstractResource; +import org.springframework.core.io.AbstractFileResolvingResource; import org.springframework.core.io.ContextResource; import org.springframework.core.io.Resource; import org.springframework.util.Assert; @@ -47,7 +46,7 @@ import org.springframework.web.portlet.util.PortletUtils; * @see javax.portlet.PortletContext#getResourceAsStream * @see javax.portlet.PortletContext#getRealPath */ -public class PortletContextResource extends AbstractResource implements ContextResource { +public class PortletContextResource extends AbstractFileResolvingResource implements ContextResource { private final PortletContext portletContext; diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResource.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResource.java index fb16a0fc57..284f9bf52f 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResource.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/ServletContextResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,10 +22,9 @@ import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; - import javax.servlet.ServletContext; -import org.springframework.core.io.AbstractResource; +import org.springframework.core.io.AbstractFileResolvingResource; import org.springframework.core.io.ContextResource; import org.springframework.core.io.Resource; import org.springframework.util.Assert; @@ -47,7 +46,7 @@ import org.springframework.web.util.WebUtils; * @see javax.servlet.ServletContext#getResource * @see javax.servlet.ServletContext#getRealPath */ -public class ServletContextResource extends AbstractResource implements ContextResource { +public class ServletContextResource extends AbstractFileResolvingResource implements ContextResource { private final ServletContext servletContext;