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

improve scann for extensions

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-07-24 13:09:29 +02:00
parent 221c836d0e
commit c32e421394
4 changed files with 427 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginLoader.java
View File

@@ -39,9 +39,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.SCMContext;
import sonia.scm.plugin.ext.DefaultExtensionScanner;
import sonia.scm.plugin.ext.ExtensionObject;
import sonia.scm.plugin.ext.ExtensionProcessor;
import sonia.scm.plugin.ext.JARExtensionScanner;
import sonia.scm.util.IOUtil;
//~--- JDK imports ------------------------------------------------------------
@@ -115,7 +115,7 @@ public class DefaultPluginLoader implements PluginLoader
{
Set<ExtensionObject> extensions = new HashSet<ExtensionObject>();
ClassLoader classLoader = getClassLoader();
JARExtensionScanner scanner = new JARExtensionScanner();
DefaultExtensionScanner scanner = new DefaultExtensionScanner();
for (Plugin plugin : installedPlugins)
{
@@ -131,8 +131,27 @@ public class DefaultPluginLoader implements PluginLoader
}
packageSet.add(SCMContext.DEFAULT_PACKAGE);
input = new FileInputStream(plugin.getPath());
scanner.processExtensions(classLoader, extensions, input, packageSet);
File pluginFile = new File(plugin.getPath());
if (pluginFile.exists())
{
if (pluginFile.isDirectory())
{
scanner.processExtensions(classLoader, extensions, pluginFile,
packageSet);
}
else
{
input = new FileInputStream(plugin.getPath());
scanner.processExtensions(classLoader, extensions, input,
packageSet);
}
}
else
{
logger.error("could not find plugin file {}", plugin.getPath());
}
}
catch (IOException ex)
{
@@ -230,7 +249,9 @@ public class DefaultPluginLoader implements PluginLoader
{
if (path.startsWith("file:"))
{
path = path.substring("file:".length());
path = path.substring("file:".length(),
path.length()
- "/META-INF/scm/plugin.xml".length());
}
else
{