opendev/gerrit
Code Issues Proposed changes

SitePaths: Convert lib_dir to Path

Browse Source 
This bled somewhat into the plugin loading code, but that code is far
from fully migrated.

Change-Id: I4c9902f13e388b1671b7a88ec50c5a9f2c84c0b9
This commit is contained in:
Dave Borowitz
2015-02-23 17:12:50 -08:00
parent 07798ccb36
commit 07b40724b5
20 changed files with 258 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java
View File

@@ -80,7 +80,8 @@ public class ServerPlugin extends Plugin {
PluginContentScanner scanner,
File dataDir,
ClassLoader classLoader) throws InvalidPluginException {
super(name, srcJar, pluginUser, snapshot, Plugin.getApiType(getPluginManifest(scanner)));
super(name, srcJar.toPath(), pluginUser, snapshot,
Plugin.getApiType(getPluginManifest(scanner)));
this.pluginCanonicalWebUrl = pluginCanonicalWebUrl;
this.scanner = scanner;
this.dataDir = dataDir;
@@ -128,7 +129,7 @@ public class ServerPlugin extends Plugin {
}
File getSrcJar() {
return getSrcFile();
return getSrcFile().toFile();
}
private static Manifest getPluginManifest(PluginContentScanner scanner)