[jboss-cvs] jboss-seam/ui/src/main/java/org/jboss/seam/ui/resource ...
Gavin King
gavin.king at jboss.com
Thu Jun 21 04:30:42 EDT 2007
User: gavin
Date: 07/06/21 04:30:42
Modified: ui/src/main/java/org/jboss/seam/ui/resource
StyleResource.java WebResource.java
Log:
fix bug loading resources
Revision Changes Path
1.5 +2 -2 jboss-seam/ui/src/main/java/org/jboss/seam/ui/resource/StyleResource.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: StyleResource.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/resource/StyleResource.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- StyleResource.java 21 Jun 2007 04:08:03 -0000 1.4
+++ StyleResource.java 21 Jun 2007 08:30:42 -0000 1.5
@@ -21,8 +21,8 @@
import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.ContextualHttpServletRequest;
import org.jboss.seam.core.Expressions;
-import org.jboss.seam.core.ResourceLoader;
import org.jboss.seam.servlet.AbstractResource;
+import org.jboss.seam.util.Resources;
/**
* Serve up stylesheets which are have been run through the EL Interpolator.
@@ -68,7 +68,7 @@
throws IOException
{
String pathInfo = request.getPathInfo().substring(getResourcePath().length());
- InputStream in = ResourceLoader.instance().getResourceAsStream(pathInfo);
+ InputStream in = Resources.getResourceAsStream( pathInfo, getServletContext() );
if (in != null)
{
1.4 +2 -2 jboss-seam/ui/src/main/java/org/jboss/seam/ui/resource/WebResource.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WebResource.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/resource/WebResource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- WebResource.java 21 Jun 2007 04:08:03 -0000 1.3
+++ WebResource.java 21 Jun 2007 08:30:42 -0000 1.4
@@ -14,8 +14,8 @@
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Startup;
import org.jboss.seam.annotations.intercept.BypassInterceptors;
-import org.jboss.seam.core.ResourceLoader;
import org.jboss.seam.servlet.AbstractResource;
+import org.jboss.seam.util.Resources;
@Startup
@Scope(APPLICATION)
@@ -40,7 +40,7 @@
{
String pathInfo = request.getPathInfo().substring(getResourcePath().length());
- InputStream in = ResourceLoader.instance().getResourceAsStream("/org/jboss/seam/ui/resource" + pathInfo);
+ InputStream in = Resources.getResourceAsStream( "/org/jboss/seam/ui/resource" + pathInfo, getServletContext() );
if (in != null)
{
More information about the jboss-cvs-commits
mailing list