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 2013/05/29 05:47:15 UTC
svn commit: r1487221 - in /myfaces/shared/trunk_4.1.x/core: ./
src/main/java/org/apache/myfaces/shared/application/
src/main/java/org/apache/myfaces/shared/renderkit/html/
src/main/java/org/apache/myfaces/shared/renderkit/html/util/
Author: lu4242
Date: Wed May 29 03:47:14 2013
New Revision: 1487221
URL: http://svn.apache.org/r1487221
Log:
synch shared
Modified:
myfaces/shared/trunk_4.1.x/core/pom.xml
myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java
myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java
Modified: myfaces/shared/trunk_4.1.x/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.1.x/core/pom.xml?rev=1487221&r1=1487220&r2=1487221&view=diff
==============================================================================
--- myfaces/shared/trunk_4.1.x/core/pom.xml (original)
+++ myfaces/shared/trunk_4.1.x/core/pom.xml Wed May 29 03:47:14 2013
@@ -143,7 +143,7 @@
<profile>
<id>synch-myfaces-impl-shared</id>
<properties>
- <myfaces.impl.shared.version>2.1.11-SNAPSHOT</myfaces.impl.shared.version>
+ <myfaces.impl.shared.version>2.1.12-SNAPSHOT</myfaces.impl.shared.version>
</properties>
<activation>
<property>
Modified: myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java?rev=1487221&r1=1487220&r2=1487221&view=diff
==============================================================================
--- myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java (original)
+++ myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java Wed May 29 03:47:14 2013
@@ -198,7 +198,12 @@ public class DefaultViewHandlerSupport i
String contextPath = externalContext.getRequestContextPath();
//StringBuilder builder = new StringBuilder(contextPath);
StringBuilder builder = SharedStringBuilder.get(context, VIEW_HANDLER_SUPPORT_SB);
- builder.append(contextPath);
+ // If the context path is root, it is not necessary to append it, otherwise
+ // and extra '/' will be set.
+ if (contextPath != null && !(contextPath.length() == 1 && contextPath.charAt(0) == '/') )
+ {
+ builder.append(contextPath);
+ }
if (mapping != null)
{
if (mapping.isExtensionMapping())
Modified: myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java?rev=1487221&r1=1487220&r2=1487221&view=diff
==============================================================================
--- myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java (original)
+++ myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java Wed May 29 03:47:14 2013
@@ -53,6 +53,13 @@ public final class HtmlJavaScriptUtils
public static void renderFormSubmitScript(FacesContext facesContext)
throws IOException
{
+ if (facesContext.getPartialViewContext() != null &&
+ (facesContext.getPartialViewContext().isPartialRequest() ||
+ facesContext.getPartialViewContext().isAjaxRequest() )
+ )
+ {
+ return;
+ }
Map map = facesContext.getExternalContext().getRequestMap();
Boolean firstScript = (Boolean) map.get(FIRST_SUBMIT_SCRIPT_ON_PAGE);
Modified: myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java?rev=1487221&r1=1487220&r2=1487221&view=diff
==============================================================================
--- myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java (original)
+++ myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java Wed May 29 03:47:14 2013
@@ -1015,7 +1015,7 @@ public class HtmlResponseWriterImpl
closeStartTagIfNecessary();
// empty string commonly used to force the start tag to be closed.
// in such case, do not call down the writer chain
- if (str.length() > 0)
+ if (str != null && str.length() > 0)
{
// Don't bother encoding anything if chosen character encoding is UTF-8
if (_isUTF8)
Modified: myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java?rev=1487221&r1=1487220&r2=1487221&view=diff
==============================================================================
--- myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java (original)
+++ myfaces/shared/trunk_4.1.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java Wed May 29 03:47:14 2013
@@ -612,8 +612,8 @@ public abstract class HTMLEncoder
{
char c1 = string.charAt(i+1);
char c2 = string.charAt(i+2);
- if ((( c1 >= '0' && c1 <='9') || (c1 >='A' && c1 <='Z')) &&
- (( c2 >= '0' && c2 <='9') || (c2 >='A' && c2 <='Z')))
+ if ((( c1 >= '0' && c1 <='9') || (c1 >='A' && c1 <='Z') || (c1 >='a' && c1 <='z')) &&
+ (( c2 >= '0' && c2 <='9') || (c2 >='A' && c2 <='Z') || (c2 >='a' && c2 <='z')))
{
// do not percent encode, because it could be already encoded
// and we don't want encode it twice
@@ -771,8 +771,8 @@ public abstract class HTMLEncoder
{
char c1 = string.charAt(i+1);
char c2 = string.charAt(i+2);
- if ((( c1 >= '0' && c1 <='9') || (c1 >='A' && c1 <='Z')) &&
- (( c2 >= '0' && c2 <='9') || (c2 >='A' && c2 <='Z')))
+ if ((( c1 >= '0' && c1 <='9') || (c1 >='A' && c1 <='Z') || (c1 >='a' && c1 <='z')) &&
+ (( c2 >= '0' && c2 <='9') || (c2 >='A' && c2 <='Z') || (c2 >='a' && c2 <='z')))
{
// do not percent encode, because it could be already encoded
}
@@ -1010,8 +1010,8 @@ public abstract class HTMLEncoder
{
char c1 = string.charAt(i+1);
char c2 = string.charAt(i+2);
- if ((( c1 >= '0' && c1 <='9') || (c1 >='A' && c1 <='Z')) &&
- (( c2 >= '0' && c2 <='9') || (c2 >='A' && c2 <='Z')))
+ if ((( c1 >= '0' && c1 <='9') || (c1 >='A' && c1 <='Z') || (c1 >='a' && c1 <='z')) &&
+ (( c2 >= '0' && c2 <='9') || (c2 >='A' && c2 <='Z') || (c2 >='a' && c2 <='z')))
{
// do not percent encode, because it could be already encoded
// and we don't want encode it twice
@@ -1221,8 +1221,8 @@ public abstract class HTMLEncoder
{
char c1 = string.charAt(i+1);
char c2 = string.charAt(i+2);
- if ((( c1 >= '0' && c1 <='9') || (c1 >='A' && c1 <='Z')) &&
- (( c2 >= '0' && c2 <='9') || (c2 >='A' && c2 <='Z')))
+ if ((( c1 >= '0' && c1 <='9') || (c1 >='A' && c1 <='Z') || (c1 >='a' && c1 <='z')) &&
+ (( c2 >= '0' && c2 <='9') || (c2 >='A' && c2 <='Z') || (c2 >='a' && c2 <='z')))
{
// do not percent encode, because it could be already encoded
}