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 2009/05/15 07:33:39 UTC
svn commit: r775010 - in
/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared:
config/MyfacesConfig.java webapp/webxml/WebXml.java
Author: lu4242
Date: Fri May 15 05:33:38 2009
New Revision: 775010
URL: http://svn.apache.org/viewvc?rev=775010&view=rev
Log:
MYFACES-2234 add org.apache.myfaces.DELEGATE_FACES_SERVLET param, to make possible use other custom servlet instead FacesServlet
Modified:
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java?rev=775010&r1=775009&r2=775010&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java Fri May 15 05:33:38 2009
@@ -88,6 +88,8 @@
private static final String INIT_PARAM_SAVE_FORM_SUBMIT_LINK_IE = "org.apache.myfaces.SAVE_FORM_SUBMIT_LINK_IE";
private static final boolean INIT_PARAM_SAVE_FORM_SUBMIT_LINK_IE_DEFAULT = false;
+
+ private static final String INIT_PARAM_DELEGATE_FACES_SERVLET = "org.apache.myfaces.DELEGATE_FACES_SERVLET";
private boolean _prettyHtml;
private boolean _detectJavascript;
@@ -103,6 +105,7 @@
private boolean _strictXhtmlLinks;
private boolean _renderClearJavascriptOnButton;
private boolean _saveFormSubmitLinkIE;
+ private String _delegateFacesServlet;
private static final boolean TOMAHAWK_AVAILABLE;
@@ -198,6 +201,7 @@
myfacesConfig.setViewStateJavascript(getBooleanInitParameter(extCtx, INIT_PARAM_VIEWSTATE_JAVASCRIPT,
INIT_PARAM_VIEWSTATE_JAVASCRIPT_DEFAULT));
+ myfacesConfig.setDelegateFacesServlet(extCtx.getInitParameter(INIT_PARAM_DELEGATE_FACES_SERVLET));
if (TOMAHAWK_AVAILABLE)
{
@@ -518,4 +522,14 @@
{
return _saveFormSubmitLinkIE;
}
+
+ public String getDelegateFacesServlet()
+ {
+ return _delegateFacesServlet;
+ }
+
+ public void setDelegateFacesServlet(String delegateFacesServlet)
+ {
+ _delegateFacesServlet = delegateFacesServlet;
+ }
}
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java?rev=775010&r1=775009&r2=775010&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXml.java Fri May 15 05:33:38 2009
@@ -45,6 +45,8 @@
private List _facesServletMappings = null;
private List _facesExtensionsFilterMappings = null;
+
+ private String _delegateFacesServlet = null;
void addServlet(String servletName, String servletClass)
{
@@ -123,7 +125,8 @@
}
Class servletClass = org.apache.myfaces.shared.util.ClassUtils.simpleClassForName((String)entry.getValue());
if (FacesServlet.class.isAssignableFrom(servletClass) ||
- DelegatedFacesServlet.class.isAssignableFrom(servletClass))
+ DelegatedFacesServlet.class.isAssignableFrom(servletClass) ||
+ servletClass.getName().equals(_delegateFacesServlet))
{
List urlPatterns = (List)_servletMappings.get(servletName);
if( urlPatterns != null )
@@ -190,6 +193,11 @@
{
this.parsingTime = parsingTime;
}
+
+ private void setDelegateFacesServlet(String delegateFacesServlet)
+ {
+ this._delegateFacesServlet = delegateFacesServlet;
+ }
protected boolean isOld(ExternalContext context)
{
@@ -224,8 +232,10 @@
WebXmlParser parser = new WebXmlParser(context);
WebXml webXml = parser.parse();
context.getApplicationMap().put(WEB_XML_ATTR, webXml);
- long configRefreshPeriod = MyfacesConfig.getCurrentInstance(context).getConfigRefreshPeriod();
+ MyfacesConfig mfconfig = MyfacesConfig.getCurrentInstance(context);
+ long configRefreshPeriod = mfconfig.getConfigRefreshPeriod();
webXml.setParsingTime(System.currentTimeMillis());
+ webXml.setDelegateFacesServlet(mfconfig.getDelegateFacesServlet());
refreshPeriod = (configRefreshPeriod * 1000);
}