You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/11/23 01:22:04 UTC
svn commit: r478405 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/renderkit/
theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standar...
Author: bommel
Date: Wed Nov 22 16:22:03 2006
New Revision: 478405
URL: http://svn.apache.org/viewvc?view=rev&rev=478405
Log:
getExternalContext().encodeActionURL should called for actionUrl
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Window.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Window.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Window.java?view=diff&rev=478405&r1=478404&r2=478405
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Window.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Window.java Wed Nov 22 16:22:03 2006
@@ -61,6 +61,7 @@
Application application = facesContext.getApplication();
ViewHandler viewHandler = application.getViewHandler();
String actionUrl = viewHandler.getActionURL(facesContext, viewId);
+ actionUrl = facesContext.getExternalContext().encodeActionURL(actionUrl);
if (LOG.isDebugEnabled()) {
LOG.debug("actionUrl = '" + actionUrl + "'");
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java?view=diff&rev=478405&r1=478404&r2=478405
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java Wed Nov 22 16:22:03 2006
@@ -100,6 +100,7 @@
result = facesContext.getExternalContext().encodeActionURL(url);
} else {
result = viewHandler.getActionURL(facesContext, url);
+ result = facesContext.getExternalContext().encodeActionURL(result);
}
return result;
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?view=diff&rev=478405&r1=478404&r2=478405
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Wed Nov 22 16:22:03 2006
@@ -152,7 +152,7 @@
ViewHandler viewHandler = application.getViewHandler();
String viewId = facesContext.getViewRoot().getViewId();
String formAction = viewHandler.getActionURL(facesContext, viewId);
-
+ formAction = facesContext.getExternalContext().encodeActionURL(formAction);
String charset = (String) page.getAttributes().get(ATTR_CHARSET);
ResponseUtils.ensureContentTypeHeader(facesContext, charset);