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/12/14 06:20:09 UTC
svn commit: r1421674 - in /myfaces/core/branches/2.1.x-client-window: ./
api/src/main/java/javax/faces/component/
impl/src/main/java/org/apache/myfaces/application/viewstate/
impl/src/main/resources/META-INF/
impl/src/test/java/org/apache/myfaces/appli...
Author: lu4242
Date: Fri Dec 14 05:20:07 2012
New Revision: 1421674
URL: http://svn.apache.org/viewvc?rev=1421674&view=rev
Log:
merge revisions 1421641-1421655 from trunk
Modified:
myfaces/core/branches/2.1.x-client-window/ (props changed)
myfaces/core/branches/2.1.x-client-window/api/src/main/java/javax/faces/component/UIViewRoot.java
myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheImpl.java (props changed)
myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheImpl.java (props changed)
myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionIdGenerator.java (props changed)
myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheFactoryImpl.java (props changed)
myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheUtils.java (props changed)
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/impl/src/test/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheTest.java (props changed)
myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheTest.java (props changed)
myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java
myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java
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)
myfaces/core/branches/2.1.x-client-window/shared/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java
Propchange: myfaces/core/branches/2.1.x-client-window/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk:r1421641-1421655
Modified: myfaces/core/branches/2.1.x-client-window/api/src/main/java/javax/faces/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/api/src/main/java/javax/faces/component/UIViewRoot.java?rev=1421674&r1=1421673&r2=1421674&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/api/src/main/java/javax/faces/component/UIViewRoot.java (original)
+++ myfaces/core/branches/2.1.x-client-window/api/src/main/java/javax/faces/component/UIViewRoot.java Fri Dec 14 05:20:07 2012
@@ -358,7 +358,7 @@ public class UIViewRoot extends UICompon
Long uniqueIdCounter = (Long) getStateHelper().get(PropertyKeys.uniqueIdCounter);
uniqueIdCounter = (uniqueIdCounter == null) ? 0 : uniqueIdCounter;
getStateHelper().put(PropertyKeys.uniqueIdCounter, (uniqueIdCounter+1L));
- return bld.append(UNIQUE_ID_PREFIX).append(uniqueIdCounter).toString();
+ return bld.append(UNIQUE_ID_PREFIX).append("__v_").append(uniqueIdCounter).toString();
}
}
// Optionally, a unique seed value can be supplied by component creators which
Propchange: myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheImpl.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheImpl.java:r1421641-1421655
Propchange: myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheImpl.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheImpl.java:r1421641-1421655
Propchange: myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionIdGenerator.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/SessionIdGenerator.java:r1421641-1421655
Propchange: myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheFactoryImpl.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheFactoryImpl.java:r1421641-1421655
Propchange: myfaces/core/branches/2.1.x-client-window/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheUtils.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheUtils.java:r1421641-1421655
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:r1421641-1421655
Propchange: myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheTest.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ClientSideStateCacheTest.java:r1421641-1421655
Propchange: myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheTest.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/viewstate/ServerSideStateCacheTest.java:r1421641-1421655
Modified: myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java?rev=1421674&r1=1421673&r2=1421674&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java (original)
+++ myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlSecretRendererTest.java Fri Dec 14 05:20:07 2012
@@ -81,7 +81,7 @@ public class HtmlSecretRendererTest exte
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertEquals("<input type=\"password\" name=\"j_id0\"/>", output);
+ assertEquals("<input type=\"password\" name=\"j_id__v_0\"/>", output);
}
public void testHtmlPropertyPassTru() throws Exception
Modified: myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java?rev=1421674&r1=1421673&r2=1421674&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java (original)
+++ myfaces/core/branches/2.1.x-client-window/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextareaRendererTest.java Fri Dec 14 05:20:07 2012
@@ -80,7 +80,7 @@ public class HtmlTextareaRendererTest ex
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertEquals("<textarea name=\"j_id0\"></textarea>", output);
+ assertEquals("<textarea name=\"j_id__v_0\"></textarea>", output);
}
public void testRenderColsRows() throws Exception
@@ -91,7 +91,7 @@ public class HtmlTextareaRendererTest ex
facesContext.renderResponse();
String output = writer.getWriter().toString();
- assertEquals("<textarea name=\"j_id0\" cols=\"5\" rows=\"10\"></textarea>", output);
+ assertEquals("<textarea name=\"j_id__v_0\" cols=\"5\" rows=\"10\"></textarea>", output);
}
public void testHtmlPropertyPassTru() throws Exception
Propchange: myfaces/core/branches/2.1.x-client-window/parent/pom.xml
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/parent/pom.xml:r1421641-1421655
Propchange: myfaces/core/branches/2.1.x-client-window/parent/src/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/parent/src:r1421641-1421655
Propchange: myfaces/core/branches/2.1.x-client-window/shared/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared:r1421641-1421655
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/pom.xml
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/pom.xml:r1421641-1421655
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src:r1421641-1421655
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:r1421641-1421655
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:r1421641-1421655
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:r1421641-1421655
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:r1421641-1421655
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:r1421641-1421655
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:r1421641-1421655
Modified: myfaces/core/branches/2.1.x-client-window/shared/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/shared/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java?rev=1421674&r1=1421673&r2=1421674&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/shared/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java (original)
+++ myfaces/core/branches/2.1.x-client-window/shared/src/test/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtilsTest.java Fri Dec 14 05:20:07 2012
@@ -48,7 +48,7 @@ public class HtmlRendererUtilsTest exten
ClientBehaviorEvents.CLICK, params, ClientBehaviorEvents.ACTION, params, behaviors, null,
null));
- Assert.assertEquals("return jsf.util.chain(document.getElementById('j_id0'), event,'huhn', 'suppe');",
+ Assert.assertEquals("return jsf.util.chain(document.getElementById('j_id__v_0'), event,'huhn', 'suppe');",
HtmlRendererUtils.buildBehaviorChain(facesContext,
component, ClientBehaviorEvents.CLICK, params, ClientBehaviorEvents.ACTION, params, behaviors, "huhn",
"suppe"));
@@ -70,7 +70,7 @@ public class HtmlRendererUtilsTest exten
behaviors.put(ClientBehaviorEvents.CLICK, Arrays.asList(submittingBehavior));
- Assert.assertEquals("jsf.util.chain(document.getElementById('j_id0'), event,'huhn', 'script()', 'suppe'); return false;",
+ Assert.assertEquals("jsf.util.chain(document.getElementById('j_id__v_0'), event,'huhn', 'script()', 'suppe'); return false;",
HtmlRendererUtils.buildBehaviorChain(facesContext,
component,
ClientBehaviorEvents.CLICK, params, ClientBehaviorEvents.ACTION, params, behaviors, "huhn",