You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/12/11 22:56:04 UTC
svn commit: r485894 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java
test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
Author: jkuhnert
Date: Mon Dec 11 13:56:03 2006
New Revision: 485894
URL: http://svn.apache.org/viewvc?view=rev&rev=485894
Log:
Resolves TAPESTRY-1090.
DojoAjaxResponseBuilder had a hard coded value of UTF-8 in the generated response type. Using the infrastructure
output-encoding allows overriding of this value. (even if the results are somewhat questionable)
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java?view=diff&rev=485894&r1=485893&r2=485894
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java Mon Dec 11 13:56:03 2006
@@ -614,7 +614,7 @@
*/
void beginResponse()
{
- _writer.printRaw("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+ _writer.printRaw("<?xml version=\"1.0\" encoding=\"" + _cycle.getInfrastructure().getOutputEncoding() + "\"?>");
_writer.printRaw("<!DOCTYPE html "
+ "PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" "
+ "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\" [\n"
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java?view=diff&rev=485894&r1=485893&r2=485894
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java Mon Dec 11 13:56:03 2006
@@ -37,6 +37,7 @@
import org.apache.tapestry.markup.MarkupWriterImpl;
import org.apache.tapestry.markup.MarkupWriterSource;
import org.apache.tapestry.markup.UTFMarkupFilter;
+import org.apache.tapestry.services.Infrastructure;
import org.apache.tapestry.services.RequestLocaleManager;
import org.apache.tapestry.services.ResponseBuilder;
import org.apache.tapestry.services.ServiceConstants;
@@ -296,6 +297,7 @@
MarkupFilter filter = new UTFMarkupFilter();
PrintWriter writer = newPrintWriter();
IRequestCycle cycle = newMock(IRequestCycle.class);
+ Infrastructure inf = newMock(Infrastructure.class);
replay();
@@ -307,6 +309,10 @@
String preload = "preloadedvarname";
verify();
+
+ expect(cycle.getInfrastructure()).andReturn(inf);
+ expect(inf.getOutputEncoding()).andReturn("UTF-8");
+
replay();
builder.beginResponse();
@@ -342,6 +348,7 @@
MarkupFilter filter = new UTFMarkupFilter();
PrintWriter writer = newPrintWriter();
IRequestCycle cycle = newMock(IRequestCycle.class);
+ Infrastructure inf = newMock(Infrastructure.class);
replay();
@@ -352,6 +359,10 @@
String script2 = "http://noname/js/package2.js";
verify();
+
+ expect(cycle.getInfrastructure()).andReturn(inf);
+ expect(inf.getOutputEncoding()).andReturn("UTF-8");
+
replay();
builder.beginResponse();
@@ -377,6 +388,7 @@
IRequestCycle cycle = newMock(IRequestCycle.class);
MarkupFilter filter = new UTFMarkupFilter();
PrintWriter writer = newPrintWriter();
+ Infrastructure inf = newMock(Infrastructure.class);
replay();
@@ -386,6 +398,10 @@
String script = "doThisInInit();";
verify();
+
+ expect(cycle.getInfrastructure()).andReturn(inf);
+ expect(inf.getOutputEncoding()).andReturn("UTF-8");
+
replay();
builder.beginResponse();