Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

 src/main/java/com/gitblit/ReindexTickets.java

@@ -33,6 +33,8 @@
import com.gitblit.tickets.ITicketService;
import com.gitblit.tickets.RedisTicketService;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.XssFilter;
import com.gitblit.utils.XssFilter.AllowXssFilter;

/**
 * A command-line tool to reindex all tickets in all repositories when the
@@ -126,8 +128,9 @@
      settings.overrideSetting(Keys.git.enableMirroring, false);
      settings.overrideSetting(Keys.web.activityCacheDays, 0);

      IRuntimeManager runtimeManager = new RuntimeManager(settings, baseFolder).start();
      IRepositoryManager repositoryManager = new RepositoryManager(runtimeManager, null).start();
      XssFilter xssFilter = new AllowXssFilter();
      IRuntimeManager runtimeManager = new RuntimeManager(settings, xssFilter, baseFolder).start();
      IRepositoryManager repositoryManager = new RepositoryManager(runtimeManager, null, null).start();

      String serviceName = settings.getString(Keys.tickets.service, BranchTicketService.class.getSimpleName());
      if (StringUtils.isEmpty(serviceName)) {
@@ -139,13 +142,13 @@
         Class<?> serviceClass = Class.forName(serviceName);
         if (RedisTicketService.class.isAssignableFrom(serviceClass)) {
            // Redis ticket service
            ticketService = new RedisTicketService(runtimeManager, null, null, repositoryManager).start();
            ticketService = new RedisTicketService(runtimeManager, null, null, null, repositoryManager).start();
         } else if (BranchTicketService.class.isAssignableFrom(serviceClass)) {
            // Branch ticket service
            ticketService = new BranchTicketService(runtimeManager, null, null, repositoryManager).start();
            ticketService = new BranchTicketService(runtimeManager, null, null, null, repositoryManager).start();
         } else if (FileTicketService.class.isAssignableFrom(serviceClass)) {
            // File ticket service
            ticketService = new FileTicketService(runtimeManager, null, null, repositoryManager).start();
            ticketService = new FileTicketService(runtimeManager, null, null, null, repositoryManager).start();
         } else {
            System.err.println("Unknown ticket service " + serviceName);
            System.exit(1);