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 2012/08/03 16:42:51 UTC
svn commit: r1368989 - in /myfaces/core/branches/2.1.x-client-window: ./
impl/src/main/java/org/apache/myfaces/view/facelets/el/
impl/src/main/resources/META-INF/ parent/ parent/src/ shared-public/
shared-public/src/ shared-public/src/main/java/org/apa...
Author: lu4242
Date: Fri Aug 3 14:42:50 2012
New Revision: 1368989
URL: http://svn.apache.org/viewvc?rev=1368989&view=rev
Log:
merge revisions 1368943-1368953
Modified:
myfaces/core/branches/2.1.x-client-window/ (props changed)
myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java
myfaces/core/branches/2.1.x-client-window/impl/src/main/resources/META-INF/faces-config20.vm (props changed)
myfaces/core/branches/2.1.x-client-window/parent/pom.xml (props changed)
myfaces/core/branches/2.1.x-client-window/parent/src/ (props changed)
myfaces/core/branches/2.1.x-client-window/shared/ (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/pom.xml (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/ (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/DebugUtils.java (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/RendererUtils.java (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/TagUtils.java (props changed)
myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/renderkit/ (props changed)
Propchange: myfaces/core/branches/2.1.x-client-window/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk:r1368943-1368953
Modified: myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java?rev=1368989&r1=1368988&r2=1368989&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java (original)
+++ myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java Fri Aug 3 14:42:50 2012
@@ -417,7 +417,6 @@ public final class CompositeComponentELU
{
UIComponent cc = ccLevel > 0 ? getCompositeComponentBasedOnLocation(facesContext, location, ccLevel)
: getCompositeComponentBasedOnLocation(facesContext, location);
- //facesContext.getAttributes().put(CURRENT_COMPOSITE_COMPONENT_KEY, cc);
List<UIComponent> list = (List<UIComponent>) facesContext.getAttributes().get(CURRENT_COMPOSITE_COMPONENT_KEY);
if (list == null)
{
@@ -433,7 +432,6 @@ public final class CompositeComponentELU
*/
public static void removeCompositeComponentForResolver(FacesContext facesContext)
{
- facesContext.getAttributes().remove(CURRENT_COMPOSITE_COMPONENT_KEY);
List<UIComponent> list = (List<UIComponent>) facesContext.getAttributes().get(CURRENT_COMPOSITE_COMPONENT_KEY);
if (list != null)
{
Propchange: myfaces/core/branches/2.1.x-client-window/impl/src/main/resources/META-INF/faces-config20.vm
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/impl/src/main/resources/META-INF/faces-config20.vm:r1368943-1368953
Propchange: myfaces/core/branches/2.1.x-client-window/parent/pom.xml
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/parent/pom.xml:r1368943-1368953
Propchange: myfaces/core/branches/2.1.x-client-window/parent/src/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/parent/src:r1368943-1368953
Propchange: myfaces/core/branches/2.1.x-client-window/shared/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared:r1368943-1368953
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/pom.xml
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/pom.xml:r1368943-1368953
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src:r1368943-1368953
Propchange: myfaces/core/branches/2.1.x-client-window/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:r1368943-1368953
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java:r1368943-1368953
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/DebugUtils.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/DebugUtils.java:r1368943-1368953
Propchange: myfaces/core/branches/2.1.x-client-window/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:r1368943-1368953
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/TagUtils.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/TagUtils.java:r1368943-1368953
Propchange: myfaces/core/branches/2.1.x-client-window/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:r1368943-1368953