Merge pull request #117 from nbaars/master

Logging in sometimes goes to report card and misses category-menu #114
This commit is contained in:
Nanne 2015-10-23 07:02:21 +02:00
commit 7648369dfd

View File

@ -13,7 +13,6 @@ import java.net.URL;
import java.nio.file.FileVisitResult; import java.nio.file.FileVisitResult;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.SimpleFileVisitor; import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.BasicFileAttributes;
import java.util.List; import java.util.List;
@ -56,13 +55,9 @@ public class PluginsLoader {
if (!alreadyLoaded) { if (!alreadyLoaded) {
WebappClassLoader cl = (WebappClassLoader) Thread.currentThread().getContextClassLoader(); WebappClassLoader cl = (WebappClassLoader) Thread.currentThread().getContextClassLoader();
cl.setAntiJARLocking(true); cl.setAntiJARLocking(true);
List<URL> jars = listJars(); List<URL> jars = listJars();
Path webInfLib = pluginTarget.getParent().resolve(cl.getJarPath().replaceFirst("\\/", ""));
for (URL jar : jars) { for (URL jar : jars) {
Path sourceJarFile = Paths.get(jar.toURI()); cl.addRepository(jar.toString());
FileUtils.copyFileToDirectory(sourceJarFile.toFile(), webInfLib.toFile());
} }
alreadyLoaded = true; alreadyLoaded = true;
} }