what is this commit for? there is no JIRA in it and it has nothing to do with the release rollback.
----- Original Message ----- > From: "[email protected]" <[email protected]> > To: [email protected] > Cc: > Sent: Friday, November 16, 2012 4:37 AM > Subject: svn commit: r1410190 - in /myfaces/core/branches/2.2.x: ./ > api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/ > impl/src/main/java/org/apache/myfaces/application/ > impl/src/main/java/org/apache/myfaces/application/viewstate/ > impl/src/main/jav... > > Author: lu4242 > Date: Fri Nov 16 03:37:03 2012 > New Revision: 1410190 > > URL: http://svn.apache.org/viewvc?rev=1410190&view=rev > Log: > merge revisions 1410177-1410189 from 2.1.x-client-window branch and trunk > > Added: > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/viewstate/ > - copied from r1410189, > myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/ > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheImpl.java > - copied unchanged from r1410189, > myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheImpl.java > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheImpl.java > - copied unchanged from r1410189, > myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheImpl.java > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionIdGenerator.java > - copied unchanged from r1410189, > myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionIdGenerator.java > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheFactoryImpl.java > - copied unchanged from r1410189, > myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheFactoryImpl.java > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheUtils.java > - copied unchanged from r1410189, > myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheUtils.java > > myfaces/core/branches/2.2.x/impl/src/test/java/org/apache/myfaces/application/viewstate/ > - copied from r1410189, > myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/application/viewstate/ > > myfaces/core/branches/2.2.x/impl/src/test/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheTest.java > - copied unchanged from r1410189, > myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheTest.java > > myfaces/core/branches/2.2.x/impl/src/test/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheTest.java > - copied unchanged from r1410189, > myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheTest.java > Removed: > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/renderkit/ClientSideStateCacheImpl.java > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/renderkit/ServerSideStateCacheImpl.java > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/renderkit/SessionIdGenerator.java > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/renderkit/StateCacheFactoryImpl.java > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/renderkit/StateCacheUtils.java > myfaces/core/branches/2.2.x/impl/src/main/old/ > > myfaces/core/branches/2.2.x/impl/src/test/java/org/apache/myfaces/renderkit/ClientSideStateCacheTest.java > > myfaces/core/branches/2.2.x/impl/src/test/java/org/apache/myfaces/renderkit/ServerSideStateCacheTest.java > Modified: > myfaces/core/branches/2.2.x/ (props changed) > > myfaces/core/branches/2.2.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/StateManagerImpl.java > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java > > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java > > myfaces/core/branches/2.2.x/impl/src/main/resources/META-INF/faces-config20.vm > > (props changed) > myfaces/core/branches/2.2.x/parent/pom.xml (props changed) > myfaces/core/branches/2.2.x/parent/src/ (props changed) > myfaces/core/branches/2.2.x/shared/ (props changed) > myfaces/core/branches/2.2.x/shared-public/pom.xml (props changed) > myfaces/core/branches/2.2.x/shared-public/src/ (props changed) > > myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java > > (props changed) > > myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java > > (props changed) > > myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfaces/shared/util/DebugUtils.java > > (props changed) > > myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfaces/shared/util/RendererUtils.java > > (props changed) > > myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfaces/shared/util/TagUtils.java > > (props changed) > > myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfaces/shared/util/renderkit/ > > (props changed) > > Propchange: myfaces/core/branches/2.2.x/ > ------------------------------------------------------------------------------ > Merged > /myfaces/core/trunk:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171 > Merged /myfaces/core/branches/2.1.x-client-window:r1410177-1410189 > > Modified: > myfaces/core/branches/2.2.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js > URL: > http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js?rev=1410190&r1=1410189&r2=1410190&view=diff > ============================================================================== > --- > myfaces/core/branches/2.2.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js > > (original) > +++ > myfaces/core/branches/2.2.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Dom.js > > Fri Nov 16 03:37:03 2012 > @@ -122,7 +122,12 @@ _MF_SINGLTN(_PFX_UTIL + "_Dom", Object, > finalScripts = [], > execScrpt = function(item) { > var tagName = item.tagName; > - if (tagName && _Lang.equalsIgnoreCase(tagName, > "script")) { > + var itemType = item.type || ""; > + if(tagName && _Lang.equalsIgnoreCase(tagName, > "script") && > + (itemType === "" || > _Lang.equalsIgnoreCase(itemType,"text/javascript") || > + > _Lang.equalsIgnoreCase(itemType,"javascript") || > + > _Lang.equalsIgnoreCase(itemType,"text/ecmascript") || > + > _Lang.equalsIgnoreCase(itemType,"ecmascript"))) { > var src = item.getAttribute('src'); > if ('undefined' != typeof src > && null != src > > Modified: > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/StateManagerImpl.java > URL: > http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/StateManagerImpl.java?rev=1410190&r1=1410189&r2=1410190&view=diff > ============================================================================== > --- > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/StateManagerImpl.java > > (original) > +++ > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/StateManagerImpl.java > > Fri Nov 16 03:37:03 2012 > @@ -37,7 +37,7 @@ import javax.faces.render.ResponseStateM > import javax.faces.view.StateManagementStrategy; > import javax.faces.view.ViewDeclarationLanguage; > > -import org.apache.myfaces.renderkit.StateCacheUtils; > +import org.apache.myfaces.application.viewstate.StateCacheUtils; > > public class StateManagerImpl extends StateManager > { > > Modified: > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java > URL: > http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java?rev=1410190&r1=1410189&r2=1410190&view=diff > ============================================================================== > --- > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java > > (original) > +++ > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/application/ViewHandlerImpl.java > > Fri Nov 16 03:37:03 2012 > @@ -45,7 +45,7 @@ import javax.faces.view.ViewDeclarationL > import javax.faces.view.ViewMetadata; > import javax.servlet.http.HttpServletResponse; > > -import org.apache.myfaces.renderkit.StateCacheUtils; > +import org.apache.myfaces.application.viewstate.StateCacheUtils; > import org.apache.myfaces.shared.application.DefaultViewHandlerSupport; > import org.apache.myfaces.shared.application.InvalidViewIdException; > import org.apache.myfaces.shared.application.ViewHandlerSupport; > > Modified: > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java > URL: > http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java?rev=1410190&r1=1410189&r2=1410190&view=diff > ============================================================================== > --- > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java > > (original) > +++ > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java > > Fri Nov 16 03:37:03 2012 > @@ -33,9 +33,9 @@ import javax.faces.render.ResponseStateM > > import org.apache.myfaces.application.StateCache; > import org.apache.myfaces.application.StateCacheFactory; > +import org.apache.myfaces.application.viewstate.StateCacheFactoryImpl; > import > org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam; > import org.apache.myfaces.renderkit.MyfacesResponseStateManager; > -import org.apache.myfaces.renderkit.StateCacheFactoryImpl; > import org.apache.myfaces.shared.config.MyfacesConfig; > import org.apache.myfaces.shared.renderkit.html.HTML; > import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils; > > Modified: > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java > URL: > http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java?rev=1410190&r1=1410189&r2=1410190&view=diff > ============================================================================== > --- > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java > > (original) > +++ > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java > > Fri Nov 16 03:37:03 2012 > @@ -21,7 +21,6 @@ package org.apache.myfaces.view; > import java.util.logging.Level; > import java.util.logging.Logger; > > -import javax.faces.FacesException; > import javax.faces.context.FacesContext; > import javax.faces.view.ViewDeclarationLanguage; > import javax.faces.view.ViewDeclarationLanguageFactory; > @@ -90,7 +89,13 @@ public class ViewDeclarationLanguageFact > } > } > > - throw new FacesException("Cannot find a valid PDL for view id > " + viewId); > + // throw new FacesException("Cannot find a valid PDL for view id > " + viewId); > + // It does not have sense to throw an exception in this point. > Instead > + // just return null, to indicate that no VDL can handle the viewId. > + // For example, in > org.apache.myfaces.shared.application.DefaultViewHandlerSupport > + // first getViewDeclarationLanguage(String viewId) is called and if > returns null > + // try the default strategy (look for a file in web folder). > + return null; > } > > /** > > Modified: > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java > URL: > http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java?rev=1410190&r1=1410189&r2=1410190&view=diff > ============================================================================== > --- > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java > > (original) > +++ > myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java > > Fri Nov 16 03:37:03 2012 > @@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRes > import javax.servlet.jsp.jstl.core.Config; > > import org.apache.myfaces.application.jsp.ServletViewResponseWrapper; > -import org.apache.myfaces.renderkit.StateCacheUtils; > +import org.apache.myfaces.application.viewstate.StateCacheUtils; > import org.apache.myfaces.shared.view.JspViewDeclarationLanguageBase; > import org.apache.myfaces.view.facelets.tag.composite.CompositeLibrary; > import org.apache.myfaces.view.facelets.tag.jsf.core.CoreLibrary; > > Propchange: > myfaces/core/branches/2.2.x/impl/src/main/resources/META-INF/faces-config20.vm > ------------------------------------------------------------------------------ > Merged > /myfaces/core/trunk/impl/src/main/resources/META-INF/faces-config20.vm:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171 > Merged > /myfaces/core/branches/2.1.x-client-window/impl/src/main/resources/META-INF/faces-config20.vm:r1410177-1410189 > > Propchange: myfaces/core/branches/2.2.x/parent/pom.xml > ------------------------------------------------------------------------------ > Merged > /myfaces/core/branches/2.1.x-client-window/parent/pom.xml:r1410177-1410189 > Merged > /myfaces/core/trunk/parent/pom.xml:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171 > > Propchange: myfaces/core/branches/2.2.x/parent/src/ > ------------------------------------------------------------------------------ > Merged > /myfaces/core/branches/2.1.x-client-window/parent/src:r1410177-1410189 > Merged > /myfaces/core/trunk/parent/src:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171 > > Propchange: myfaces/core/branches/2.2.x/shared/ > ------------------------------------------------------------------------------ > Merged /myfaces/core/branches/2.1.x-client-window/shared:r1410177-1410189 > Merged > /myfaces/core/trunk/shared:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171 > > Propchange: myfaces/core/branches/2.2.x/shared-public/pom.xml > ------------------------------------------------------------------------------ > Merged > /myfaces/core/branches/2.1.x-client-window/shared-public/pom.xml:r1410177-1410189 > Merged > /myfaces/core/trunk/shared-public/pom.xml:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171 > > Propchange: myfaces/core/branches/2.2.x/shared-public/src/ > ------------------------------------------------------------------------------ > Merged > /myfaces/core/branches/2.1.x-client-window/shared-public/src:r1410177-1410189 > Merged > /myfaces/core/trunk/shared-public/src:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171 > > Propchange: > myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java > ------------------------------------------------------------------------------ > Merged > /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171 > Merged > /myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java:r1410177-1410189 > > Propchange: > myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java > ------------------------------------------------------------------------------ > Merged > /myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java:r1410177-1410189 > Merged > /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171 > > Propchange: > myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfaces/shared/util/DebugUtils.java > ------------------------------------------------------------------------------ > Merged > /myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/DebugUtils.java:r1410177-1410189 > Merged > /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/DebugUtils.java:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171 > > Propchange: > myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfaces/shared/util/RendererUtils.java > ------------------------------------------------------------------------------ > Merged > /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/RendererUtils.java:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171 > Merged > /myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/RendererUtils.java:r1410177-1410189 > > Propchange: > myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfaces/shared/util/TagUtils.java > ------------------------------------------------------------------------------ > Merged > /myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/TagUtils.java:r1410177-1410189 > Merged > /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/TagUtils.java:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171 > > Propchange: > myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfaces/shared/util/renderkit/ > ------------------------------------------------------------------------------ > Merged > /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/renderkit:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171 > Merged > /myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/renderkit:r1410177-1410189 >
