Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 09:25:43 +01:00
Code Issues Packages Projects Releases Activity

pluginprocessor only consider directories that contains plugin.xml

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-08-27 08:52:38 +02:00
parent 230ac848eb
commit 58e5667e82
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
View File

@@ -59,6 +59,7 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.function.Predicate;
import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toList;
@@ -176,7 +177,7 @@ public final class PluginProcessor
List<Path> dirs = List<Path> dirs =
collectPluginDirectories(pluginDirectory) collectPluginDirectories(pluginDirectory)
.stream() .stream()
.filter(dir -> !dir.endsWith("sonia.scm.plugins")) .filter(isPluginDirectory())
.collect(toList()); .collect(toList());
logger.debug("process {} directories: {}", dirs.size(), dirs); logger.debug("process {} directories: {}", dirs.size(), dirs);
@@ -200,6 +201,10 @@ public final class PluginProcessor
return ImmutableSet.copyOf(wrappers); return ImmutableSet.copyOf(wrappers);
} }
private Predicate<Path> isPluginDirectory() {
return dir -> new File(dir.resolve("META-INF/scm/plugin.xml").toString()).exists();
}
/** /**
* Method description * Method description
* *