Return-Path: X-Original-To: apmail-myfaces-dev-archive@www.apache.org Delivered-To: apmail-myfaces-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6BF41D35E for ; Fri, 16 Nov 2012 15:02:08 +0000 (UTC) Received: (qmail 77647 invoked by uid 500); 16 Nov 2012 15:02:08 -0000 Delivered-To: apmail-myfaces-dev-archive@myfaces.apache.org Received: (qmail 77398 invoked by uid 500); 16 Nov 2012 15:02:07 -0000 Mailing-List: contact dev-help@myfaces.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "MyFaces Development" Delivered-To: mailing list dev@myfaces.apache.org Received: (qmail 77383 invoked by uid 99); 16 Nov 2012 15:02:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Nov 2012 15:02:07 +0000 X-ASF-Spam-Status: No, hits=-0.5 required=5.0 tests=FREEMAIL_ENVFROM_END_DIGIT,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of lu4242@gmail.com designates 209.85.160.53 as permitted sender) Received: from [209.85.160.53] (HELO mail-pb0-f53.google.com) (209.85.160.53) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Nov 2012 15:02:02 +0000 Received: by mail-pb0-f53.google.com with SMTP id jt11so1953278pbb.12 for ; Fri, 16 Nov 2012 07:01:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; bh=Fifosn1FYOsX4yMLFZKkaKHqg6LXxa1l4JQP4NLNW+4=; b=ER28m4GZgQ+gq5jJux585qpNzo8InwtNwGhFxSUKeyONDeXlPp9v2uowmkF7xgFKtS 2ALxQXEPuJKj01dWpLt9m2m6k0KyNJIwOv+7DdMptWx+mYrGlf1H0+7/7rCqxRDae5L7 pSPpu6cNOTBMFpg5ovpLCuCq2NCw0G+GEoAsCx/65XPjEpBBOBqZcI2KVvB1K3RIFWPK O1ZFXDktfDOigNoDPMoNEzD3ucdgncNsWcCfeCk74Gqajg4TQFw++Nf51HBw3fZWKUcM WE180AvKOtRIc8zCSIFfxnDVbc/aOffFpFOmSaIiC2oYpOMjiX+FRQuIOdhHBP9mSqsC foCQ== MIME-Version: 1.0 Received: by 10.66.73.135 with SMTP id l7mr13574271pav.55.1353078101702; Fri, 16 Nov 2012 07:01:41 -0800 (PST) Received: by 10.66.119.201 with HTTP; Fri, 16 Nov 2012 07:01:41 -0800 (PST) In-Reply-To: <1353051766.53578.YahooMailNeo@web28906.mail.ir2.yahoo.com> References: <20121116033706.5483323888EA@eris.apache.org> <1353051766.53578.YahooMailNeo@web28906.mail.ir2.yahoo.com> Date: Fri, 16 Nov 2012 10:01:41 -0500 Message-ID: Subject: Re: 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... From: Leonardo Uribe To: MyFaces Development , Mark Struberg Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org 2012/11/16 Mark Struberg : > what is this commit for? there is no JIRA in it and it has nothing to do = with the release rollback. > This is a merge of the changes done in 2.1.x and 2.1.x-client-window branch, to keep all branches in sync. It is ok. > > > ----- Original Message ----- >> From: "lu4242@apache.org" >> To: commits@myfaces.apache.org >> 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/j= ava/org/apache/myfaces/application/ impl/src/main/java/org/apache/myfaces/a= pplication/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=3D1410190&view=3Drev >> Log: >> merge revisions 1410177-1410189 from 2.1.x-client-window branch and trun= k >> >> Added: >> >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/applic= ation/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/applic= ation/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/applic= ation/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/applic= ation/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/applic= ation/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/applic= ation/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/applic= ation/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/applic= ation/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/applic= ation/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/render= kit/ClientSideStateCacheImpl.java >> >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/render= kit/ServerSideStateCacheImpl.java >> >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/render= kit/SessionIdGenerator.java >> >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/render= kit/StateCacheFactoryImpl.java >> >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/render= kit/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/render= kit/ClientSideStateCacheTest.java >> >> myfaces/core/branches/2.2.x/impl/src/test/java/org/apache/myfaces/render= kit/ServerSideStateCacheTest.java >> Modified: >> myfaces/core/branches/2.2.x/ (props changed) >> >> myfaces/core/branches/2.2.x/api/src/main/javascript/META-INF/resources/m= yfaces/_impl/_util/_Dom.js >> >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/applic= ation/StateManagerImpl.java >> >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/applic= ation/ViewHandlerImpl.java >> >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/render= kit/html/HtmlResponseStateManager.java >> >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/V= iewDeclarationLanguageFactoryImpl.java >> >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/j= sp/JspViewDeclarationLanguage.java >> >> myfaces/core/branches/2.2.x/impl/src/main/resources/META-INF/faces-confi= g20.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/myfac= es/shared/util/AttachedDeltaWrapper.java >> (props changed) >> >> myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfac= es/shared/util/ComponentUtils.java >> (props changed) >> >> myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfac= es/shared/util/DebugUtils.java >> (props changed) >> >> myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfac= es/shared/util/RendererUtils.java >> (props changed) >> >> myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfac= es/shared/util/TagUtils.java >> (props changed) >> >> myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfac= es/shared/util/renderkit/ >> (props changed) >> >> Propchange: myfaces/core/branches/2.2.x/ >> ------------------------------------------------------------------------= ------ >> Merged >> /myfaces/core/trunk:r1406527,1406532,1408903,1409426,1409468,1409476,141= 0155,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/m= yfaces/_impl/_util/_Dom.js >> URL: >> http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/api/src/main/ja= vascript/META-INF/resources/myfaces/_impl/_util/_Dom.js?rev=3D1410190&r1=3D= 1410189&r2=3D1410190&view=3Ddiff >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- >> myfaces/core/branches/2.2.x/api/src/main/javascript/META-INF/resources/m= yfaces/_impl/_util/_Dom.js >> (original) >> +++ >> myfaces/core/branches/2.2.x/api/src/main/javascript/META-INF/resources/m= yfaces/_impl/_util/_Dom.js >> Fri Nov 16 03:37:03 2012 >> @@ -122,7 +122,12 @@ _MF_SINGLTN(_PFX_UTIL + "_Dom", Object, >> finalScripts =3D [], >> execScrpt =3D function(item) { >> var tagName =3D item.tagName; >> - if (tagName && _Lang.equalsIgnoreCase(tagName, >> "script")) { >> + var itemType =3D item.type || ""; >> + if(tagName && _Lang.equalsIgnoreCase(tagName, >> "script") && >> + (itemType =3D=3D=3D "" || >> _Lang.equalsIgnoreCase(itemType,"text/javascript") || >> + >> _Lang.equalsIgnoreCase(itemType,"javascript") || >> + >> _Lang.equalsIgnoreCase(itemType,"text/ecmascript") || >> + >> _Lang.equalsIgnoreCase(itemType,"ecmascript"))) { >> var src =3D item.getAttribute('src'); >> if ('undefined' !=3D typeof src >> && null !=3D src >> >> Modified: >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/applic= ation/StateManagerImpl.java >> URL: >> http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/src/main/j= ava/org/apache/myfaces/application/StateManagerImpl.java?rev=3D1410190&r1= =3D1410189&r2=3D1410190&view=3Ddiff >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/applic= ation/StateManagerImpl.java >> (original) >> +++ >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/applic= ation/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/applic= ation/ViewHandlerImpl.java >> URL: >> http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/src/main/j= ava/org/apache/myfaces/application/ViewHandlerImpl.java?rev=3D1410190&r1=3D= 1410189&r2=3D1410190&view=3Ddiff >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/applic= ation/ViewHandlerImpl.java >> (original) >> +++ >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/applic= ation/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/render= kit/html/HtmlResponseStateManager.java >> URL: >> http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/src/main/j= ava/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java?rev=3D1= 410190&r1=3D1410189&r2=3D1410190&view=3Ddiff >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/render= kit/html/HtmlResponseStateManager.java >> (original) >> +++ >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/render= kit/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.JSFWebCon= figParam; >> 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/V= iewDeclarationLanguageFactoryImpl.java >> URL: >> http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/src/main/j= ava/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java?rev=3D1= 410190&r1=3D1410189&r2=3D1410190&view=3Ddiff >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/V= iewDeclarationLanguageFactoryImpl.java >> (original) >> +++ >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/V= iewDeclarationLanguageFactoryImpl.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 i= d >> " + 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 vie= wId. >> + // For example, in >> org.apache.myfaces.shared.application.DefaultViewHandlerSupport >> + // first getViewDeclarationLanguage(String viewId) is called an= d 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/j= sp/JspViewDeclarationLanguage.java >> URL: >> http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/src/main/j= ava/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java?rev=3D14101= 90&r1=3D1410189&r2=3D1410190&view=3Ddiff >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/j= sp/JspViewDeclarationLanguage.java >> (original) >> +++ >> myfaces/core/branches/2.2.x/impl/src/main/java/org/apache/myfaces/view/j= sp/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-confi= g20.vm >> ------------------------------------------------------------------------= ------ >> Merged >> /myfaces/core/trunk/impl/src/main/resources/META-INF/faces-config20.vm:r= 1406527,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-14101= 89 >> Merged >> /myfaces/core/trunk/parent/pom.xml:r1406527,1406532,1408903,1409426,1409= 468,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-1410= 189 >> Merged >> /myfaces/core/trunk/shared:r1406527,1406532,1408903,1409426,1409468,1409= 476,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:r141017= 7-1410189 >> Merged >> /myfaces/core/trunk/shared-public/pom.xml:r1406527,1406532,1408903,14094= 26,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-14= 10189 >> Merged >> /myfaces/core/trunk/shared-public/src:r1406527,1406532,1408903,1409426,1= 409468,1409476,1410155,1410171 >> >> Propchange: >> myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfac= es/shared/util/AttachedDeltaWrapper.java >> ------------------------------------------------------------------------= ------ >> Merged >> /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/share= d/util/AttachedDeltaWrapper.java:r1406527,1406532,1408903,1409426,1409468,1= 409476,1410155,1410171 >> Merged >> /myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/o= rg/apache/myfaces/shared/util/AttachedDeltaWrapper.java:r1410177-1410189 >> >> Propchange: >> myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfac= es/shared/util/ComponentUtils.java >> ------------------------------------------------------------------------= ------ >> Merged >> /myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/o= rg/apache/myfaces/shared/util/ComponentUtils.java:r1410177-1410189 >> Merged >> /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/share= d/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/myfac= es/shared/util/DebugUtils.java >> ------------------------------------------------------------------------= ------ >> Merged >> /myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/o= rg/apache/myfaces/shared/util/DebugUtils.java:r1410177-1410189 >> Merged >> /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/share= d/util/DebugUtils.java:r1406527,1406532,1408903,1409426,1409468,1409476,141= 0155,1410171 >> >> Propchange: >> myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfac= es/shared/util/RendererUtils.java >> ------------------------------------------------------------------------= ------ >> Merged >> /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/share= d/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/o= rg/apache/myfaces/shared/util/RendererUtils.java:r1410177-1410189 >> >> Propchange: >> myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfac= es/shared/util/TagUtils.java >> ------------------------------------------------------------------------= ------ >> Merged >> /myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/o= rg/apache/myfaces/shared/util/TagUtils.java:r1410177-1410189 >> Merged >> /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/share= d/util/TagUtils.java:r1406527,1406532,1408903,1409426,1409468,1409476,14101= 55,1410171 >> >> Propchange: >> myfaces/core/branches/2.2.x/shared-public/src/main/java/org/apache/myfac= es/shared/util/renderkit/ >> ------------------------------------------------------------------------= ------ >> Merged >> /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/share= d/util/renderkit:r1406527,1406532,1408903,1409426,1409468,1409476,1410155,1= 410171 >> Merged >> /myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/o= rg/apache/myfaces/shared/util/renderkit:r1410177-1410189 >>