From 901eff682f7b213f9f275a9679a505677fdd763f Mon Sep 17 00:00:00 2001
From: Nanne Baars <nbaars@xebia.com>
Date: Sat, 19 Sep 2015 08:07:54 +0200
Subject: [PATCH] Properties are appended when loading plugins (#29)

---
 .../main/java/org/owasp/webgoat/plugins/PluginsLoader.java | 7 +++++++
 1 file changed, 7 insertions(+)

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 bc1f1cf7b..07dbd5272 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
@@ -2,6 +2,7 @@ package org.owasp.webgoat.plugins;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
+import org.apache.commons.io.FileUtils;
 import org.owasp.webgoat.classloader.PluginClassLoader;
 import org.owasp.webgoat.util.LabelProvider;
 import org.slf4j.Logger;
@@ -62,6 +63,7 @@ public class PluginsLoader implements Runnable {
 
         try {
             PluginFileUtils.createDirsIfNotExists(pluginTarget);
+            cleanupExtractedPluginsDirectory();
             List<URL> jars = listJars();
             cl.addURL(jars);
             plugins = processPlugins(jars, reload);
@@ -71,6 +73,11 @@ public class PluginsLoader implements Runnable {
         return plugins;
     }
 
+    private void cleanupExtractedPluginsDirectory() {
+        Path i18nDirectory = pluginTarget.resolve("plugin/i18n/");
+        FileUtils.deleteQuietly(i18nDirectory.toFile());
+    }
+
     private List<URL> listJars() throws IOException {
         final List<URL> jars = Lists.newArrayList();
         Files.walkFileTree(pluginSource, new SimpleFileVisitor<Path>() {