From fd58ac1e99eb7d4f68bec72cb9d6301e6a52857d Mon Sep 17 00:00:00 2001
From: jackyq2015 <jackyq2015@gmail.com>
Date: Sun, 6 Aug 2017 22:05:17 -0500
Subject: [PATCH] fix some xml issues

---
 broker/appengine/WEB-INF/jdoconfig.xml |  2 +-
 broker/core/tests/conf/tests.xml       |  6 ++---
 main/tests/server/conf/tests.xml       |  6 ++---
 main/webapp/WEB-INF/web.xml            | 32 ++++++++++++++------------
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/broker/appengine/WEB-INF/jdoconfig.xml b/broker/appengine/WEB-INF/jdoconfig.xml
index fcb4f0b61..f4d0e1834 100644
--- a/broker/appengine/WEB-INF/jdoconfig.xml
+++ b/broker/appengine/WEB-INF/jdoconfig.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <jdoconfig xmlns="http://java.sun.com/xml/ns/jdo/jdoconfig"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdoconfig http://java.sun.com/xml/ns/jdo/jdoconfig_3_0.xsd">
 
     <persistence-manager-factory name="transactional">
         <property name="javax.jdo.PersistenceManagerFactoryClass"
diff --git a/broker/core/tests/conf/tests.xml b/broker/core/tests/conf/tests.xml
index 879e0b8d2..22b71232f 100644
--- a/broker/core/tests/conf/tests.xml
+++ b/broker/core/tests/conf/tests.xml
@@ -2,13 +2,13 @@
  
 <suite name="OpenRefine Broker Unit Tests">
   <test name="tests">
-    <packages>
-      <package name="com.google.refine.broker.tests.*"/>
-    </packages>
     <groups>
       <run>
         <exclude name="broken" />
       </run>
     </groups>
+    <packages>
+      <package name="com.google.refine.broker.tests.*"/>
+    </packages>
   </test>
 </suite>
diff --git a/main/tests/server/conf/tests.xml b/main/tests/server/conf/tests.xml
index 45ce758b5..eb951662b 100644
--- a/main/tests/server/conf/tests.xml
+++ b/main/tests/server/conf/tests.xml
@@ -2,13 +2,13 @@
  
 <suite name="Refine Unit Tests">
   <test name="tests">
-    <packages>
-      <package name="com.google.refine.tests.*"/>
-    </packages>
     <groups>
       <run>
         <exclude name="broken" />
       </run>
     </groups>
+    <packages>
+      <package name="com.google.refine.tests.*"/>
+    </packages>
   </test>
 </suite>
diff --git a/main/webapp/WEB-INF/web.xml b/main/webapp/WEB-INF/web.xml
index 8c3ed5e48..409fd4a4e 100644
--- a/main/webapp/WEB-INF/web.xml
+++ b/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-    "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
 
 <web-app>
     <display-name>OpenRefine</display-name>
@@ -19,7 +19,20 @@
         <param-name>org.mortbay.jetty.servlet.SessionPath</param-name>
         <param-value>/</param-value>
     </context-param>
-
+	
+	<filter>
+      <filter-name>GzipFilter</filter-name>
+      <filter-class>org.mortbay.servlet.GzipFilter</filter-class>
+      <init-param>
+        <param-name>mimeTypes</param-name>
+        <param-value>text/html,text/plain,text/xml,application/xhtml+xml,text/css,text/javascript,application/javascript,application/json,image/svg+xml</param-value>
+      </init-param>
+    </filter>
+    <filter-mapping>
+      <filter-name>GzipFilter</filter-name>
+      <url-pattern>/*</url-pattern>
+    </filter-mapping>
+    
     <servlet>
         <servlet-name>refine</servlet-name>
         <servlet-class>com.google.refine.RefineServlet</servlet-class>
@@ -44,16 +57,5 @@
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
         
-    <filter>
-      <filter-name>GzipFilter</filter-name>
-      <filter-class>org.mortbay.servlet.GzipFilter</filter-class>
-      <init-param>
-        <param-name>mimeTypes</param-name>
-        <param-value>text/html,text/plain,text/xml,application/xhtml+xml,text/css,text/javascript,application/javascript,application/json,image/svg+xml</param-value>
-      </init-param>
-    </filter>
-    <filter-mapping>
-      <filter-name>GzipFilter</filter-name>
-      <url-pattern>/*</url-pattern>
-    </filter-mapping>
+
 </web-app>