[Laszlo-checkins] r10910 - openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders

Sun Sep 7 13:01:12 PDT 2008

Author: hqm
Date: 2008-09-07 13:01:11 -0700 (Sun, 07 Sep 2008)
New Revision: 10910

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/Responder.java
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderSOURCE.java
Log:
Change 20080907-hqm-w by hqm at badtzmaru.home on 2008-09-07 15:59:52 EDT
    in /Users/hqm/openlaszlo/trunk
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: need another patch to this

New Features:

Bugs Fixed: LPP-6833

Technical Reviewer: hqm
QA Reviewer: (pending)
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:
    

Tests:



Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/Responder.java
===================================================================

--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/Responder.java	2008-09-07 08:30:07 UTC (rev 10909)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/Responder.java	2008-09-07 20:01:11 UTC (rev 10910)
@@ -3,7 +3,7 @@
  * ****************************************************************************/
 
 /* J_LZ_COPYRIGHT_BEGIN *******************************************************
-* Copyright 2001-2006 Laszlo Systems, Inc.  All Rights Reserved.              *
+* Copyright 2001-2008 Laszlo Systems, Inc.  All Rights Reserved.              *
 * Use is subject to license terms.                                            *
 * J_LZ_COPYRIGHT_END *********************************************************/
 
@@ -740,6 +740,7 @@
         // Add in title and link
         out.println("<html><head><title>" + title + "</title>");
 
+        out.println("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">");
         String ico = LPS.getProperty("shortcut.icon", "http://www.laszlosystems.com/images/laszlo.ico");
         out.println("<link rel=\"SHORTCUT ICON\" href=\"" + ico + 
                     "\"></head>\n");

Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderSOURCE.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderSOURCE.java	2008-09-07 08:30:07 UTC (rev 10909)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/servlets/responders/ResponderSOURCE.java	2008-09-07 20:01:11 UTC (rev 10910)
@@ -53,12 +53,27 @@
                         org.openlaszlo.i18n.LaszloMessages.getMessage(
                                 ResponderSOURCE.class.getName(),"051018-53", new Object[] {fileName})
 );
+
+        res.setContentType ("text/html; charset=utf-8");
         ServletOutputStream  out = res.getOutputStream();
+        try {
+             writeHeader(out, null);
+//            writeText(out, FileUtils.readFileString(new File(fileName)));
+                    FileInputStream fis = new FileInputStream(fileName);
+                    InputStreamReader isr = new InputStreamReader(fis, "UTF-8");
+                    BufferedReader reader = new BufferedReader(isr);
 
-        try {
-            res.setContentType ("text/html; charset=utf-8");
-            writeHeader(out, null);
-            writeText(out, FileUtils.readFileString(new File(fileName)));
+                    String line;
+                    StringBuffer sb = new StringBuffer();
+                    while ((line = reader.readLine()) != null) {
+                        sb.append(line);
+                        sb.append("\n");
+                    }
+                    reader.close();
+            isr.close();
+            fis.close();
+//           writeText(out, FileUtils.readFileString(new File(fileName)));
+            writeText(out, sb.toString());
             writeFooter(out);
         } finally {
             FileUtils.close(out);

