You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/06/21 06:13:26 UTC
svn commit: r670135 - in
/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces:
renderkit/html/util/AddResourceFactory.java
webapp/filter/ExtensionsFilter.java
webapp/filter/ServeResourcePhaseListener.java
Author: lu4242
Date: Fri Jun 20 21:13:25 2008
New Revision: 670135
URL: http://svn.apache.org/viewvc?rev=670135&view=rev
Log:
TOMAHAWK-1275 MyFaces extensions filter creates a session
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/AddResourceFactory.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/ExtensionsFilter.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/ServeResourcePhaseListener.java
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/AddResourceFactory.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/AddResourceFactory.java?rev=670135&r1=670134&r2=670135&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/AddResourceFactory.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/util/AddResourceFactory.java Fri Jun 20 21:13:25 2008
@@ -280,6 +280,9 @@
return addResource;
}
+ /**
+ * @deprecated use getInstance(HttpServletRequest request, ServletContext servletContext) instead
+ */
public static AddResource getInstance(HttpServletRequest request)
{
ServletContext servletContext = request
@@ -294,6 +297,19 @@
//
return addResource;
}
+
+ public static AddResource getInstance(HttpServletRequest request, ServletContext servletContext)
+ {
+ Map requestMap = new RequestMapWrapper(request);
+ AddResource addResource = getInstance(servletContext, requestMap, request
+ .getContextPath(), MyfacesConfig
+ .getAddResourceClassFromServletContext(servletContext));
+ //
+ // this will be called by the ExtensionsFilter itself, so no need to
+ // check the environment
+ //
+ return addResource;
+ }
/**
* check if the extensionsFilter has been correctly setup.
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/ExtensionsFilter.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/ExtensionsFilter.java?rev=670135&r1=670134&r2=670135&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/ExtensionsFilter.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/ExtensionsFilter.java Fri Jun 20 21:13:25 2008
@@ -206,7 +206,7 @@
try
{
- addResource = AddResourceFactory.getInstance(httpRequest);
+ addResource = AddResourceFactory.getInstance(httpRequest,_servletContext);
if( addResource.isResourceUri(_servletContext, httpRequest ) ){
addResource.serveResource(_servletContext, httpRequest, httpResponse);
return;
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/ServeResourcePhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/ServeResourcePhaseListener.java?rev=670135&r1=670134&r2=670135&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/ServeResourcePhaseListener.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/ServeResourcePhaseListener.java Fri Jun 20 21:13:25 2008
@@ -84,7 +84,7 @@
try
{
- addResource= AddResourceFactory.getInstance(request);
+ addResource= AddResourceFactory.getInstance(request,(ServletContext) fc.getExternalContext().getContext());
if( addResource.isResourceUri(context, request ) ){
addResource.serveResource(context, request, response);
event.getFacesContext().responseComplete();