From 99c909c69b74098c369f3840e5f7f2d071191e65 Mon Sep 17 00:00:00 2001
From: Ezequiel Bergamaschi <ezequielbergamaschi@gmail.com>
Date: Mon, 18 Aug 2014 21:10:25 -0300
Subject: [PATCH] Revert "fix alias checking for jetty 9.x"

This reverts commit fff27e1bb70d3fed77b5e646728c4c4e13934631.
---
 wise-webapp/jetty.xml      | 10 ----------
 wise-webapp/pom.xml        |  4 +++-
 wise-webapp/webdefault.xml | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 11 deletions(-)
 delete mode 100644 wise-webapp/jetty.xml
 create mode 100644 wise-webapp/webdefault.xml

diff --git a/wise-webapp/jetty.xml b/wise-webapp/jetty.xml
deleted file mode 100644
index e8c4e24f..00000000
--- a/wise-webapp/jetty.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
-    <Call name="addAliasCheck">
-        <Arg>
-            <New class="org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker"/>
-        </Arg>
-    </Call>
-</Configure>
\ No newline at end of file
diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index be8c5d05..a1f82b27 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -555,7 +555,9 @@
                     <stopPort>9999</stopPort>
                     <war>${project.build.directory}/wisemapping.war</war>
                     <reload>automatic</reload>
-                    <contextXml>${project.basedir}/jetty.xml</contextXml>
+                    <webAppConfig>
+                        <overrideDescriptor>${project.basedir}/webdefault.xml</overrideDescriptor>
+                    </webAppConfig>
                     <systemProperties>
                         <systemProperty>
                             <name>org.mortbay.util.FileResource.checkAliases</name>
diff --git a/wise-webapp/webdefault.xml b/wise-webapp/webdefault.xml
new file mode 100644
index 00000000..9cecd06d
--- /dev/null
+++ b/wise-webapp/webdefault.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<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"
+        metadata-complete="false"
+        version="3.1">
+
+
+    <servlet>
+        <servlet-name>default</servlet-name>
+        <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
+        <init-param>
+            <param-name>aliases</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </servlet>
+</web-app>
\ No newline at end of file