Externalized the Lucene ignore extensions

James Moger

2012-03-21 f1d2ada42c5e3640656d805155e1bcadb95fd126

 src/com/gitblit/wicket/pages/RepositoryPage.java

@@ -41,13 +41,16 @@
import com.gitblit.Constants;

import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.PagesServlet;

import com.gitblit.SyndicationServlet;

import com.gitblit.models.RepositoryModel;

import com.gitblit.utils.ArrayUtils;

import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.utils.TicgitUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.PageRegistration;

import com.gitblit.wicket.PageRegistration.OtherPageLink;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.LinkPanel;

import com.gitblit.wicket.panels.NavigationPanel;

@@ -123,6 +126,12 @@
      if (model.useDocs) {

         pages.put("docs", new PageRegistration("gb.docs", DocsPage.class, params));

      }

      if (JGitUtils.getPagesBranch(r) != null) {

         OtherPageLink pagesLink = new OtherPageLink("gb.pages", PagesServlet.asLink(

               getRequest().getRelativePathPrefixToContextRoot(), repositoryName, null));

         pages.put("pages", pagesLink);

      }



      // Conditionally add edit link

      final boolean showAdmin;

      if (GitBlit.getBoolean(Keys.web.authenticateAdminPages, true)) {

@@ -142,9 +151,18 @@


   @Override

   protected void setupPage(String repositoryName, String pageName) {

      add(new LinkPanel("repositoryName", null, repositoryName, SummaryPage.class,

            WicketUtils.newRepositoryParameter(repositoryName)));

      add(new LinkPanel("repositoryName", null, StringUtils.stripDotGit(repositoryName),

            SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryName)));

      add(new Label("pageName", pageName));

      if (getRepositoryModel().isBare) {

         add(new Label("workingCopy").setVisible(false));

      } else {

         Fragment fragment = new Fragment("workingCopy", "workingCopyFragment", this);

         Label lbl = new Label("workingCopy", getString("gb.workingCopy"));

         WicketUtils.setHtmlTooltip(lbl,  getString("gb.workingCopyWarning"));

         fragment.add(lbl);

         add(fragment);

      }



      super.setupPage(repositoryName, pageName);

   }

@@ -224,20 +242,20 @@
            }

         }

         Fragment partial = new Fragment(wicketId, "partialPersonIdent", this);

         LinkPanel link = new LinkPanel("personName", "list", value, SearchPage.class,

         LinkPanel link = new LinkPanel("personName", "list", value, GitSearchPage.class,

               WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType));

         setPersonSearchTooltip(link, value, searchType);

         partial.add(link);

         return partial;

      } else {

         Fragment fullPerson = new Fragment(wicketId, "fullPersonIdent", this);

         LinkPanel nameLink = new LinkPanel("personName", "list", name, SearchPage.class,

         LinkPanel nameLink = new LinkPanel("personName", "list", name, GitSearchPage.class,

               WicketUtils.newSearchParameter(repositoryName, objectId, name, searchType));

         setPersonSearchTooltip(nameLink, name, searchType);

         fullPerson.add(nameLink);



         LinkPanel addressLink = new LinkPanel("personAddress", "list", "<" + address + ">",

               SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId,

               GitSearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId,

                     address, searchType));

         setPersonSearchTooltip(addressLink, address, searchType);

         fullPerson.add(addressLink);

@@ -245,7 +263,8 @@
      }

   }



   protected void setPersonSearchTooltip(Component component, String value, Constants.SearchType searchType) {

   protected void setPersonSearchTooltip(Component component, String value,

         Constants.SearchType searchType) {

      if (searchType.equals(Constants.SearchType.AUTHOR)) {

         WicketUtils.setHtmlTooltip(component, getString("gb.searchForAuthor") + " " + value);

      } else if (searchType.equals(Constants.SearchType.COMMITTER)) {

@@ -302,13 +321,14 @@


      private final IModel<String> searchBoxModel = new Model<String>("");



      private final IModel<Constants.SearchType> searchTypeModel = new Model<Constants.SearchType>(Constants.SearchType.COMMIT);

      private final IModel<Constants.SearchType> searchTypeModel = new Model<Constants.SearchType>(

            Constants.SearchType.COMMIT);



      public SearchForm(String id, String repositoryName) {

         super(id);

         this.repositoryName = repositoryName;

         DropDownChoice<Constants.SearchType> searchType = new DropDownChoice<Constants.SearchType>("searchType",

               Arrays.asList(Constants.SearchType.values()));

         DropDownChoice<Constants.SearchType> searchType = new DropDownChoice<Constants.SearchType>(

               "searchType", Arrays.asList(Constants.SearchType.values()));

         searchType.setModel(searchTypeModel);

         add(searchType.setVisible(GitBlit.getBoolean(Keys.web.showSearchTypeSelection, false)));

         TextField<String> searchBox = new TextField<String>("searchBox", searchBoxModel);

@@ -338,7 +358,13 @@
               break;

            }

         }

         setResponsePage(SearchPage.class,

         Class<? extends BasePage> searchPageClass = GitSearchPage.class;

         RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);

         if (!ArrayUtils.isEmpty(model.indexedBranches)) {

            // this repository is Lucene-indexed

            searchPageClass = LuceneSearchPage.class;

         }

         setResponsePage(searchPageClass,

               WicketUtils.newSearchParameter(repositoryName, null, searchString, searchType));

      }

   }