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 2011/08/14 20:17:23 UTC
svn commit: r1157594 - in /myfaces/core/branches/2.0.x:
impl/src/main/java/org/apache/myfaces/lifecycle/
impl/src/main/java/org/apache/myfaces/view/facelets/
shared/src/main/java/org/apache/myfaces/shared/application/
Author: lu4242
Date: Sun Aug 14 18:17:22 2011
New Revision: 1157594
URL: http://svn.apache.org/viewvc?rev=1157594&view=rev
Log:
MYFACES-3280 facelets.VIEWMAPPINGS should be renamed as facelets.VIEW_MAPPINGS
Modified:
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageStrategy.java
myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java?rev=1157594&r1=1157593&r2=1157594&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java Sun Aug 14 18:17:22 2011
@@ -271,9 +271,9 @@ public class DefaultRestoreViewSupport i
protected String[] getFaceletsViewMappings(FacesContext context)
{
String faceletsViewMappings= context.getExternalContext().getInitParameter(ViewHandler.FACELETS_VIEW_MAPPINGS_PARAM_NAME);
- if(faceletsViewMappings == null) //consider alias facelets.VIEWMAPPINGS
+ if(faceletsViewMappings == null) //consider alias facelets.VIEW_MAPPINGS
{
- faceletsViewMappings= context.getExternalContext().getInitParameter("facelets.VIEWMAPPINGS");
+ faceletsViewMappings= context.getExternalContext().getInitParameter("facelets.VIEW_MAPPINGS");
}
return faceletsViewMappings == null ? null : faceletsViewMappings.split(";");
Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageStrategy.java?rev=1157594&r1=1157593&r2=1157594&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageStrategy.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageStrategy.java Sun Aug 14 18:17:22 2011
@@ -93,6 +93,10 @@ public class FaceletViewDeclarationLangu
assert context != null;
String mappings = context.getInitParameter(ViewHandler.FACELETS_VIEW_MAPPINGS_PARAM_NAME);
+ if(mappings == null) //consider alias facelets.VIEW_MAPPINGS
+ {
+ mappings = context.getInitParameter("facelets.VIEW_MAPPINGS");
+ }
if (mappings == null)
{
return null;
Modified: myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java?rev=1157594&r1=1157593&r2=1157594&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java (original)
+++ myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java Sun Aug 14 18:17:22 2011
@@ -285,9 +285,9 @@ public class DefaultViewHandlerSupport i
protected String[] getFaceletsViewMappings(FacesContext context)
{
String faceletsViewMappings= context.getExternalContext().getInitParameter(ViewHandler.FACELETS_VIEW_MAPPINGS_PARAM_NAME);
- if(faceletsViewMappings == null) //consider alias facelets.VIEWMAPPINGS
+ if(faceletsViewMappings == null) //consider alias facelets.VIEW_MAPPINGS
{
- faceletsViewMappings= context.getExternalContext().getInitParameter("facelets.VIEWMAPPINGS");
+ faceletsViewMappings= context.getExternalContext().getInitParameter("facelets.VIEW_MAPPINGS");
}
return faceletsViewMappings == null ? null : faceletsViewMappings.split(";");