opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.8'

Browse Source 
* stable-2.8:
  Inject right plugin name @PluginName in init step
This commit is contained in:
Shawn Pearce
2013-10-18 16:16:41 -07:00
parent 0a28dd5aa1 30d0981942
commit 055c2a9870
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java
View File

@@ -14,9 +14,11 @@
package com.google.gerrit.pgm.init;
import com.google.common.base.Objects;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.pgm.util.ConsoleUI;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.plugins.PluginLoader;
import com.google.inject.AbstractModule;
import com.google.inject.Inject;
import com.google.inject.Injector;
@@ -24,6 +26,7 @@ import com.google.inject.Singleton;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
@@ -90,10 +93,10 @@ public class InitPluginStepsLoader {
}
}
private Injector getPluginInjector(File jarFile) {
String jarFileName = jarFile.getName();
private Injector getPluginInjector(File jarFile) throws IOException {
final String pluginName =
jarFileName.substring(0, jarFileName.lastIndexOf('.'));
Objects.firstNonNull(PluginLoader.getGerritPluginName(jarFile),
PluginLoader.nameOf(jarFile));
return initInjector.createChildInjector(new AbstractModule() {
@Override
protected void configure() {

4
gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
View File

@@ -460,7 +460,7 @@ public class PluginLoader implements LifecycleListener {
}
}
private static String nameOf(File jar) {
public static String nameOf(File jar) {
return nameOf(jar.getName());
}
@@ -653,7 +653,7 @@ public class PluginLoader implements LifecycleListener {
});
}
private static String getGerritPluginName(File srcFile) throws IOException {
public static String getGerritPluginName(File srcFile) throws IOException {
JarFile jarFile = new JarFile(srcFile);
try {
return jarFile.getManifest().getMainAttributes()