Почетна Преглед Помоћ
Пријавите се
compsci-industry
/
TechEmpower.FrameworkBenchmarks
огледало од https://github.com/TechEmpower/FrameworkBenchmarks.git
2
0
Креирај огранак 0
Датотеке Дискусије 0 Вики
Преглед изворни кода

fix encoding

Nick Kasvosve пре 10 година
родитељ
5b4dc6fc56
комит
f982d45fce
6 измењених фајлова са 5 додато и 9 уклоњено
Један поглед Покажи статистику Diff
  1. 0 5
      frameworks/Java/beyondj/beyondj-service/pom.xml
  2. 2 1
      frameworks/Java/beyondj/beyondj-service/src/main/java/com/techempower/beyondj/action/FortuneActionBean.java
  3. 1 1
      frameworks/Java/beyondj/beyondj-service/src/main/webapp/WEB-INF/templates/fortunes.jsp
  4. 1 0
      frameworks/Java/beyondj/beyondj-service/src/main/webapp/WEB-INF/templates/layout.jsp
  5. 1 1
      frameworks/Java/beyondj/beyondj-service/src/main/webapp/WEB-INF/web.xml
  6. 0 1
      frameworks/Java/beyondj/pom.xml

+ 0 - 5
frameworks/Java/beyondj/beyondj-service/pom.xml
Прегледај датотеку 

@@ -27,11 +27,6 @@
 
             <artifactId>beyondj-stripesrest</artifactId>
 
             <artifactId>beyondj-stripesrest</artifactId>
 
             <version>${beyondj.stripesrest.version}</version>
 
             <version>${beyondj.stripesrest.version}</version>
 
         </dependency>
 
         </dependency>
 
-        <dependency>
 
-            <groupId>com.samaxes.stripes</groupId>
 
-            <artifactId>beyondj-stripesafe</artifactId>
 
-            <version>${beyondj.stripesafe.version}</version>
 
-        </dependency>
 
         <dependency>
 
         <dependency>
 
             <groupId>org.slf4j</groupId>
 
             <groupId>org.slf4j</groupId>
 
             <artifactId>slf4j-log4j12</artifactId>
 
             <artifactId>slf4j-log4j12</artifactId>

+ 2 - 1
frameworks/Java/beyondj/beyondj-service/src/main/java/com/techempower/beyondj/action/FortuneActionBean.java
Прегледај датотеку 

@@ -25,6 +25,7 @@ public class FortuneActionBean extends BaseActionBean {
 
         Collections.sort(fortunes);
 
         Collections.sort(fortunes);
 
         Map<String, String> headers = new HashMap<>();
 
         Map<String, String> headers = new HashMap<>();
 
         headers.put(TRANSFER_ENCODING, Boolean.TRUE.toString());
 
         headers.put(TRANSFER_ENCODING, Boolean.TRUE.toString());
 
+       getContext().getResponse().setCharacterEncoding(UTF_8);
 
         setResponseHeaders(headers);
 
         setResponseHeaders(headers);
 
         return new ForwardResolution(JSP);
 
         return new ForwardResolution(JSP);
 
     }
 
     }
 
@@ -36,9 +37,9 @@ public class FortuneActionBean extends BaseActionBean {
 
     @SpringBean
 
     @SpringBean
 
     private FortuneRepository fortuneRepository;
 
     private FortuneRepository fortuneRepository;
 
 
 
+    public static final String UTF_8 = "UTF-8";
 
     public static final String FORTUNES = "fortunes";
 
     public static final String FORTUNES = "fortunes";
 
     public static final String JSP = "/WEB-INF/templates/fortunes.jsp";
 
     public static final String JSP = "/WEB-INF/templates/fortunes.jsp";
 
     public static final String TRANSFER_ENCODING = "Transfer-Encoding";
 
     public static final String TRANSFER_ENCODING = "Transfer-Encoding";
 
-    public static final String FORTUNE_REPOSITORY = "fortuneRepository";
 
 }
 
 }

+ 1 - 1
frameworks/Java/beyondj/beyondj-service/src/main/webapp/WEB-INF/templates/fortunes.jsp
Прегледај датотеку 

@@ -13,7 +13,7 @@
 
                     <td>id</td>
 
                     <td>id</td>
 
                     <td>${fortune.id}</td>
 
                     <td>${fortune.id}</td>
 
                     <td>message</td>
 
                     <td>message</td>
 
-                    <td>${fortune.message}</td>
 
+                    <td>${fn:escapeXml(fortune.message)}</td>
 
                 </tr>
 
                 </tr>
 
             </c:forEach>
 
             </c:forEach>
 
         </table>
 
         </table>

+ 1 - 0
frameworks/Java/beyondj/beyondj-service/src/main/webapp/WEB-INF/templates/layout.jsp
Прегледај датотеку 

@@ -11,6 +11,7 @@
 
     </script>
 
     </script>
 
 
 
     <head>
 
     <head>
 
+        <%@page pageEncoding="UTF-8"%>
 
         <s:layout-component name="head">
 
         <s:layout-component name="head">
 
         </s:layout-component>
 
         </s:layout-component>
 
     </head>
 
     </head>

+ 1 - 1
frameworks/Java/beyondj/beyondj-service/src/main/webapp/WEB-INF/web.xml
Прегледај датотеку 

@@ -29,7 +29,7 @@
 
         </init-param>
 
         </init-param>
 
         <init-param>
 
         <init-param>
 
             <param-name>Extension.Packages</param-name>
 
             <param-name>Extension.Packages</param-name>
 
-            <param-value>net.sourceforge.stripes.integration.spring,org.stripesrest,com.samaxes.stripes.xss
 
+            <param-value>net.sourceforge.stripes.integration.spring,org.stripesrest
 
             </param-value>
 
             </param-value>
 
         </init-param>
 
         </init-param>

+ 0 - 1
frameworks/Java/beyondj/pom.xml
Прегледај датотеку 

@@ -24,7 +24,6 @@
 
         <commons.io.version>2.4</commons.io.version>
 
         <commons.io.version>2.4</commons.io.version>
 
         <spring.data.commons.version>1.10.0.RELEASE</spring.data.commons.version>
 
         <spring.data.commons.version>1.10.0.RELEASE</spring.data.commons.version>
 
         <hibernate.validator.version>5.1.3.Final</hibernate.validator.version>
 
         <hibernate.validator.version>5.1.3.Final</hibernate.validator.version>
 
-        <beyondj.stripesafe.version>1.0</beyondj.stripesafe.version>
 
         <beyondj.stripesrest.version>1.0</beyondj.stripesrest.version>
 
         <beyondj.stripesrest.version>1.0</beyondj.stripesrest.version>
 
         <stripes.version>1.6.0-BEYONDJ</stripes.version>
 
         <stripes.version>1.6.0-BEYONDJ</stripes.version>
 
         <hibernate.entitymanager.version>4.3.9.Final</hibernate.entitymanager.version>
 
         <hibernate.entitymanager.version>4.3.9.Final</hibernate.entitymanager.version>