svn commit: r482201 - in /tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl: DojoAjaxResponseBuilder.java JSONResponseBuilder.java

[jkuhnert]

Author: jkuhnert
Date: Mon Dec  4 06:52:20 2006
New Revision: 482201

URL: http://svn.apache.org/viewvc?view=rev&rev=482201
Log:
Reverting changes made to ResponseBuilder for now as they seem to be 
incorrectly encoding certain 
characters despite the correct content type being set on the output stream.

Modified:
    
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DojoAjaxResponseBuilder.java
    
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.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=482201&r1=482200&r2=482201
==============================================================================
--- 
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  4 06:52:20 2006
@@ -180,10 +180,10 @@
             _contentType.setParameter(ENCODING_KEY, encoding);
         }
         
-        _output = new ByteArrayOutputStream();
+        // _output = new ByteArrayOutputStream();
         
-        // PrintWriter printWriter = _response.getPrintWriter(_contentType);
-        PrintWriter printWriter = new PrintWriter(_output, true);
+        PrintWriter printWriter = _response.getPrintWriter(_contentType);
+        // PrintWriter printWriter = new PrintWriter(_output, true);
         
         _writer = _markupWriterSource.newMarkupWriter(printWriter, 
_contentType);
         
@@ -205,7 +205,7 @@
         
         _writer.close();
         
-        writeResponse();
+        // writeResponse();
     }
     
     /**

Modified: 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java?view=diff&rev=482201&r1=482200&r2=482201
==============================================================================
--- 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
 (original)
+++ 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
 Mon Dec  4 06:52:20 2006
@@ -134,10 +134,10 @@
             _contentType.setParameter(ENCODING_KEY, encoding);
         }
         
-        _output = new ByteArrayOutputStream();
+        // _output = new ByteArrayOutputStream();
         
-        // PrintWriter printWriter = _webResponse.getPrintWriter(_contentType);
-        PrintWriter printWriter = new PrintWriter(_output, true);
+        PrintWriter printWriter = _response.getPrintWriter(_contentType);
+        // PrintWriter printWriter = new PrintWriter(_output, true);
         
         _writer = _markupWriterSource.newJSONWriter(printWriter, _contentType);
         
@@ -155,7 +155,7 @@
         
         _writer.close();
         
-        writeResponse();
+        // writeResponse();
     }
     
     /**