From bc6016b32cd9d4555266f38d9755d6f3d7cb4b02 Mon Sep 17 00:00:00 2001
From: FangfangZhao <zhaofang123@gmail.com>
Date: Tue, 15 Jan 2019 12:03:00 +0800
Subject: [PATCH] web.xml trim-directive

---
 pom.xml                         |  2 +-
 src/main/webapp/WEB-INF/web.xml | 29 +++++++++++++++++++----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 73a9ca241..467373342 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
 		<dependency>
 			<groupId>com.github.devezhao</groupId>
 			<artifactId>persist4j</artifactId>
-			<version>2c71f4bea4</version>
+			<version>master-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 76f1e4a87..e98bd1832 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-	version="3.1">
-	
-	<display-name>Rebuild</display-name>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+                      http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
+                      
+	<display-name>REBUILD</display-name>
+	<description>Building your system freely</description>
 	
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:application-ctx.xml</param-value>
 	</context-param>
+	
 	<listener>
 		<listener-class>com.rebuild.server.ServerListener</listener-class>
 	</listener>
+	<listener>
+		<listener-class>com.rebuild.web.OnlineSessionStore</listener-class>
+	</listener>
 	
 	<filter>
 		<filter-name>encodingFilter</filter-name>
@@ -102,11 +107,15 @@
 		<location>/error40x.jsp</location>
 	</error-page>
 	
-	<listener>
-		<listener-class>com.rebuild.web.OnlineSessionStore</listener-class>
-	</listener>
-	
 	<session-config>
 		<session-timeout>120</session-timeout>
 	</session-config>
+	
+	<jsp-config>
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<trim-directive-whitespaces>true</trim-directive-whitespaces>
+		</jsp-property-group>
+	</jsp-config>
+	
 </web-app>
\ No newline at end of file