From 2d39ab90d2a57dee67a7cfde480290b05b03dc66 Mon Sep 17 00:00:00 2001
From: Nanne Baars <nbaars@xebia.com>
Date: Sat, 9 Jul 2016 19:38:08 +0200
Subject: [PATCH] Doesn't run with tomcat8 #161  - antiJarLocking is no longer
 supported in Tomcat 8. Because we have will move towards Spring Boot we will
 have a much better way to reload plugins so investigating the difference
 between Tomcat 7 and 8 is not the way to go.

---
 .../src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java  | 1 -
 webgoat-container/src/main/webapp/META-INF/context.xml          | 2 +-
 webgoat-container/src/main/webapp/WEB-INF/context.xml           | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
index 1d9731bb0..478af0926 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
@@ -55,7 +55,6 @@ public class PluginsLoader {
         try {
             if (!alreadyLoaded) {
                 WebappClassLoader cl = (WebappClassLoader) Thread.currentThread().getContextClassLoader();
-                cl.setAntiJARLocking(true);
                 List<URL> jars = listJars();
                 for (URL jar : jars) {
                     cl.addRepository(jar.toString());
diff --git a/webgoat-container/src/main/webapp/META-INF/context.xml b/webgoat-container/src/main/webapp/META-INF/context.xml
index adc5cb807..cc7cda29f 100644
--- a/webgoat-container/src/main/webapp/META-INF/context.xml
+++ b/webgoat-container/src/main/webapp/META-INF/context.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context antiJARLocking="true" path="/WebGoat">
+<Context path="/WebGoat">
 
 </Context>
diff --git a/webgoat-container/src/main/webapp/WEB-INF/context.xml b/webgoat-container/src/main/webapp/WEB-INF/context.xml
index 658058885..67643336a 100644
--- a/webgoat-container/src/main/webapp/WEB-INF/context.xml
+++ b/webgoat-container/src/main/webapp/WEB-INF/context.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context antiJARLocking="true" path="/WebGoat"/>
+<Context path="/WebGoat"/>