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 2010/11/30 20:49:12 UTC
svn commit: r1040735 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces:
renderkit/ErrorPageWriter.java spi/WebConfigProviderFactory.java
spi/impl/DefaultWebConfigProviderFactory.java
webapp/AbstractFacesInitializer.java
Author: lu4242
Date: Tue Nov 30 19:49:12 2010
New Revision: 1040735
URL: http://svn.apache.org/viewvc?rev=1040735&view=rev
Log:
MYFACES-2944 change WebXml name to WebConfig
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java?rev=1040735&r1=1040734&r2=1040735&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java Tue Nov 30 19:49:12 2010
@@ -361,8 +361,8 @@ public final class ErrorPageWriter
// if so, do not generate an error page
//WebXml webXml = WebXml.getWebXml(facesContext.getExternalContext());
//if (webXml.isErrorPagePresent())
- WebConfigProvider webConfigProvider = WebConfigProviderFactory.getWebXmlProviderFactory(
- facesContext.getExternalContext()).getWebXmlProvider(facesContext.getExternalContext());
+ WebConfigProvider webConfigProvider = WebConfigProviderFactory.getWebConfigProviderFactory(
+ facesContext.getExternalContext()).getWebConfigProvider(facesContext.getExternalContext());
if(webConfigProvider.isErrorPagePresent(facesContext.getExternalContext()))
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProviderFactory.java?rev=1040735&r1=1040734&r2=1040735&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/WebConfigProviderFactory.java Tue Nov 30 19:49:12 2010
@@ -42,7 +42,7 @@ public abstract class WebConfigProviderF
private static final String FACTORY_KEY = WebConfigProviderFactory.class.getName();
- public static WebConfigProviderFactory getWebXmlProviderFactory(ExternalContext ctx)
+ public static WebConfigProviderFactory getWebConfigProviderFactory(ExternalContext ctx)
{
WebConfigProviderFactory factory = (WebConfigProviderFactory) ctx.getApplicationMap().get(FACTORY_KEY);
if (factory != null)
@@ -81,17 +81,17 @@ public abstract class WebConfigProviderF
if (factory != null)
{
// cache instance on ApplicationMap
- setWebXmlProviderFactory(ctx, factory);
+ setWebConfigProviderFactory(ctx, factory);
}
return factory;
}
- public static void setWebXmlProviderFactory(ExternalContext ctx, WebConfigProviderFactory factory)
+ public static void setWebConfigProviderFactory(ExternalContext ctx, WebConfigProviderFactory factory)
{
ctx.getApplicationMap().put(FACTORY_KEY, factory);
}
- public abstract WebConfigProvider getWebXmlProvider(ExternalContext externalContext);
+ public abstract WebConfigProvider getWebConfigProvider(ExternalContext externalContext);
}
\ No newline at end of file
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java?rev=1040735&r1=1040734&r2=1040735&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultWebConfigProviderFactory.java Tue Nov 30 19:49:12 2010
@@ -53,7 +53,7 @@ public class DefaultWebConfigProviderFac
}
@Override
- public WebConfigProvider getWebXmlProvider(ExternalContext externalContext)
+ public WebConfigProvider getWebConfigProvider(ExternalContext externalContext)
{
WebConfigProvider returnValue = null;
final ExternalContext extContext = externalContext;
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java?rev=1040735&r1=1040734&r2=1040735&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java Tue Nov 30 19:49:12 2010
@@ -105,8 +105,8 @@ public abstract class AbstractFacesIniti
if (!WebConfigParamUtils.getBooleanInitParameter(externalContext, INITIALIZE_ALWAYS_STANDALONE, false))
{
- WebConfigProvider webConfigProvider = WebConfigProviderFactory.getWebXmlProviderFactory(
- facesContext.getExternalContext()).getWebXmlProvider(facesContext.getExternalContext());
+ WebConfigProvider webConfigProvider = WebConfigProviderFactory.getWebConfigProviderFactory(
+ facesContext.getExternalContext()).getWebConfigProvider(facesContext.getExternalContext());
if (webConfigProvider.getFacesServletMappings(facesContext.getExternalContext()).isEmpty()) {
// check if the FacesServlet has been added dynamically
@@ -258,8 +258,8 @@ public abstract class AbstractFacesIniti
if (!WebConfigParamUtils.getBooleanInitParameter(facesContext.getExternalContext(), INITIALIZE_ALWAYS_STANDALONE, false))
{
//We need to check if the current application was initialized by myfaces
- WebConfigProvider webConfigProvider = WebConfigProviderFactory.getWebXmlProviderFactory(
- facesContext.getExternalContext()).getWebXmlProvider(facesContext.getExternalContext());
+ WebConfigProvider webConfigProvider = WebConfigProviderFactory.getWebConfigProviderFactory(
+ facesContext.getExternalContext()).getWebConfigProvider(facesContext.getExternalContext());
if (webConfigProvider.getFacesServletMappings(facesContext.getExternalContext()).isEmpty()) {
// check if the FacesServlet has been added dynamically