Split administration commands into a plugin, enhance plugin manager

James Moger

2014-03-30 413e9b486b1a84960d4c8ddac130e87280f64c6a

 src/main/java/com/gitblit/manager/GitblitManager.java

@@ -42,6 +42,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import ro.fortsoft.pf4j.PluginClassLoader;
import ro.fortsoft.pf4j.PluginWrapper;
import ro.fortsoft.pf4j.RuntimeMode;

import com.gitblit.Constants;
import com.gitblit.Constants.AccessPermission;
import com.gitblit.Constants.AccessRestrictionType;
@@ -68,7 +72,8 @@
import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
import com.gitblit.tickets.ITicketService;
import com.gitblit.transport.ssh.SshSession;
import com.gitblit.transport.ssh.IPublicKeyManager;
import com.gitblit.transport.ssh.SshKey;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.HttpUtils;
import com.gitblit.utils.JsonUtils;
@@ -101,11 +106,15 @@

   protected final IRuntimeManager runtimeManager;

   protected final IPluginManager pluginManager;

   protected final INotificationManager notificationManager;

   protected final IUserManager userManager;

   protected final IAuthenticationManager authenticationManager;

   protected final IPublicKeyManager publicKeyManager;

   protected final IRepositoryManager repositoryManager;

@@ -115,18 +124,22 @@

   public GitblitManager(
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager,
         INotificationManager notificationManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
         IPublicKeyManager publicKeyManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager,
         IFederationManager federationManager) {

      this.settings = runtimeManager.getSettings();
      this.runtimeManager = runtimeManager;
      this.pluginManager = pluginManager;
      this.notificationManager = notificationManager;
      this.userManager = userManager;
      this.authenticationManager = authenticationManager;
      this.publicKeyManager = publicKeyManager;
      this.repositoryManager = repositoryManager;
      this.projectManager = projectManager;
      this.federationManager = federationManager;
@@ -524,6 +537,11 @@
      throw new RuntimeException("This class does not have a ticket service!");
   }

   @Override
   public IPublicKeyManager getPublicKeyManager() {
      return publicKeyManager;
   }

   /*
    * ISTOREDSETTINGS
    *
@@ -652,12 +670,12 @@
      }
      return user;
   }
	

   @Override
   public UserModel authenticate(SshSession sshSession) {
      return authenticationManager.authenticate(sshSession);
   public UserModel authenticate(String username, SshKey key) {
      return authenticationManager.authenticate(username, key);
   }
	

   @Override
   public UserModel authenticate(HttpServletRequest httpRequest, boolean requiresCertificate) {
      UserModel user = authenticationManager.authenticate(httpRequest, requiresCertificate);
@@ -1161,4 +1179,64 @@
   public boolean isIdle(Repository repository) {
      return repositoryManager.isIdle(repository);
   }

   @Override
   public <T> List<T> getExtensions(Class<T> clazz) {
      return pluginManager.getExtensions(clazz);
   }

   @Override
   public PluginWrapper whichPlugin(Class<?> clazz) {
      return pluginManager.whichPlugin(clazz);
   }

   @Override
   public boolean deletePlugin(PluginWrapper wrapper) {
      return pluginManager.deletePlugin(wrapper);
   }

   @Override
   public List<PluginWrapper> getPlugins() {
      return pluginManager.getPlugins();
   }

   @Override
   public List<PluginWrapper> getResolvedPlugins() {
      return pluginManager.getResolvedPlugins();
   }

   @Override
   public List<PluginWrapper> getUnresolvedPlugins() {
      return pluginManager.getUnresolvedPlugins();
   }

   @Override
   public List<PluginWrapper> getStartedPlugins() {
      return pluginManager.getStartedPlugins();
   }

   @Override
   public void loadPlugins() {
      pluginManager.loadPlugins();
   }

   @Override
   public void startPlugins() {
      pluginManager.startPlugins();
   }

   @Override
   public void stopPlugins() {
      pluginManager.stopPlugins();
   }

   @Override
   public PluginClassLoader getPluginClassLoader(String pluginId) {
      return pluginManager.getPluginClassLoader(pluginId);
   }

   @Override
   public RuntimeMode getRuntimeMode() {
      return pluginManager.getRuntimeMode();
   }
}