From fff27e1bb70d3fed77b5e646728c4c4e13934631 Mon Sep 17 00:00:00 2001
From: Ezequiel Bergamaschi <ezequielbergamaschi@gmail.com>
Date: Thu, 19 Jun 2014 00:43:10 -0300
Subject: [PATCH] fix alias checking for jetty 9.x

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

diff --git a/wise-webapp/jetty.xml b/wise-webapp/jetty.xml
new file mode 100644
index 00000000..e8c4e24f
--- /dev/null
+++ b/wise-webapp/jetty.xml
@@ -0,0 +1,10 @@
+<?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 d0f7513a..0d730e7f 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -555,9 +555,7 @@
                     <stopPort>9999</stopPort>
                     <war>${project.build.directory}/wisemapping.war</war>
                     <reload>automatic</reload>
-                    <webAppConfig>
-                        <overrideDescriptor>${project.basedir}/webdefault.xml</overrideDescriptor>
-                    </webAppConfig>
+                    <contextXml>${project.basedir}/jetty.xml</contextXml>
                     <systemProperties>
                         <systemProperty>
                             <name>database.base.url</name>
diff --git a/wise-webapp/webdefault.xml b/wise-webapp/webdefault.xml
deleted file mode 100644
index 9cecd06d..00000000
--- a/wise-webapp/webdefault.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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