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

new plugin structure

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-08-29 10:50:14 +02:00
parent a3be1c775b
commit 3c678dce12
3 changed files with 109 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,14 +86,11 @@ public final class PluginProcessor
/** Field description */
private static final String DIRECTORY_INSTALLED = ".installed";
/** Field description */
private static final String DIRECTORY_LINK = ".link";
/** Field description */
private static final String DIRECTORY_METAINF = "META-INF";
/** Field description */
private static final String DIRECTORY_WEBINF = "WEB-INF";
private static final String DIRECTORY_WEBAPP = "webapp";
/** Field description */
private static final String EXTENSION_PLUGIN = ".smp";
@@ -350,32 +347,29 @@ public final class PluginProcessor
{
List<URL> urls = new ArrayList<>();
Path metaDir = smp.getPath().resolve(DIRECTORY_METAINF);
Path directory = smp.getPath();
Path metaDir = directory.resolve(DIRECTORY_METAINF);
if (!Files.exists(metaDir))
{
throw new FileNotFoundException("could not find META-INF directory");
}
Path webinfDir = smp.getPath().resolve(DIRECTORY_WEBINF);
Path classesDir = directory.resolve(DIRECTORY_CLASSES);
if (Files.exists(webinfDir))
if (Files.exists(classesDir))
{
Path classesDir = webinfDir.resolve(DIRECTORY_CLASSES);
urls.add(classesDir.toUri().toURL());
}
if (Files.exists(classesDir))
Path libDir = directory.resolve(DIRECTORY_DEPENDENCIES);
if (Files.exists(libDir))
{
for (Path f : Files.newDirectoryStream(libDir, GLOB_JAR))
{
urls.add(classesDir.toUri().toURL());
}
Path libDir = webinfDir.resolve(DIRECTORY_DEPENDENCIES);
if (Files.exists(libDir))
{
for (Path f : Files.newDirectoryStream(libDir, GLOB_JAR))
{
urls.add(f.toUri().toURL());
}
urls.add(f.toUri().toURL());
}
}
@@ -500,8 +494,9 @@ public final class PluginProcessor
Plugin plugin = createPlugin(cl, descriptor);
wrapper = new PluginWrapper(plugin, cl,
new PathWebResourceLoader(directory), directory);
WebResourceLoader resourceLoader = createWebResourceLoader(directory);
wrapper = new PluginWrapper(plugin, cl, resourceLoader, directory);
}
else
{
@@ -535,6 +530,33 @@ public final class PluginProcessor
return plugins;
}
/**
* Method description
*
*
* @param directory
*
* @return
*/
private WebResourceLoader createWebResourceLoader(Path directory)
{
WebResourceLoader resourceLoader;
Path webapp = directory.resolve(DIRECTORY_WEBAPP);
if (Files.exists(webapp))
{
logger.debug("create WebResourceLoader for path {}", webapp);
resourceLoader = new PathWebResourceLoader(webapp);
}
else
{
logger.debug("create empty WebResourceLoader");
resourceLoader = new EmptyWebResourceLoader();
}
return resourceLoader;
}
/**
* Method description
*