Eliminated Lucene settings

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 18eafca9fd0ecd86c55232afd01901ab7c629742..2ac6598febdbe84c601f9cda790cf95a33aed111 100644 (file)
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -91,31 +91,6 @@ groovy.preReceiveScripts =
 # SINCE 0.8.0\r
 groovy.postReceiveScripts =\r
 \r
-# If true, a Lucene index will be generated and maintained for each repository.\r
-# Lucene search replaces brute-force Git repository traversal. Initial indexing\r
-# or reindexing of a repository can be memory intensive so be advised that you\r
-# may need to adjust your JVM heap setting accordingly (e.g. -Xmx1024M)\r
-#\r
-# SINCE 0.9.0\r
-# RESTART REQUIRED\r
-lucene.enable  = false\r
-\r
-# This value specifies the idle period for the Lucene executor to wait between\r
-# repository ref checks.  If refs have been changed since the last check, the\r
-# executor will incrementally index the changes.\r
-#\r
-# Gitblit will check all repositories for branch updates 1 minute after startup.\r
-# Indexes will automatically be built for any repository that is missing its index\r
-# or if an index version change is detected.\r
-#\r
-#   The shortest frequency allowed is every 2 minutes\r
-#   Decimal frequency values are cast to integers\r
-#   Frequency values may be specified in mins, hours, or days\r
-#\r
-# SINCE 0.9.0\r
-# RESTART REQUIRED\r
-lucene.frequency = 2 mins\r
-\r
 #\r
 # Authentication Settings\r
 #\r

diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index b2e53d67eb85962a815ca046f03250b17d8f93ab..7b557d79cbaee47a1a62a22e5085d9520c778944 100644 (file)
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -87,7 +87,6 @@ import com.gitblit.utils.JsonUtils;
 import com.gitblit.utils.MetricUtils;\r
 import com.gitblit.utils.ObjectCache;\r
 import com.gitblit.utils.StringUtils;\r
-import com.gitblit.utils.TimeUtils;\r
 \r
 /**\r
  * GitBlit is the servlet context listener singleton that acts as the core for\r
@@ -957,12 +956,6 @@ public class GitBlit implements ServletContextListener {
                        // create repository\r
                        logger.info("create repository " + repository.name);\r
                        r = JGitUtils.createRepository(repositoriesFolder, repository.name);\r
-                       \r
-                       // automatically index master branch if Lucene integration is enabled\r
-                       if (luceneExecutor.isReady()) {\r
-                               repository.indexedBranches = new ArrayList<String>();\r
-                               repository.indexedBranches.add("refs/heads/master");\r
-                       }\r
                } else {\r
                        // rename repository\r
                        if (!repositoryName.equalsIgnoreCase(repository.name)) {\r
@@ -1845,18 +1838,8 @@ public class GitBlit implements ServletContextListener {
                        logger.warn("Mail server is not properly configured.  Mail services disabled.");\r
                }\r
                luceneExecutor = new LuceneExecutor(settings, repositoriesFolder);\r
-               if (luceneExecutor.isReady()) {\r
-                       String idle = settings.getString(Keys.lucene.frequency, "2 mins");\r
-                       int mins = TimeUtils.convertFrequencyToMinutes(idle);\r
-                       if (mins <= 2) {\r
-                               mins = 2;\r
-                               idle = mins + " mins";\r
-                       }\r
-                       logger.info("Lucene executor is scheduled to process ref changes every " + idle);\r
-                       scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, mins, TimeUnit.MINUTES);\r
-               } else {\r
-                       logger.warn("Lucene integration is disabled.");\r
-               }\r
+               logger.info("Lucene executor is scheduled to process indexed branches every 2 minutes.");\r
+               scheduledExecutor.scheduleAtFixedRate(luceneExecutor, 1, 2, TimeUnit.MINUTES);\r
                if (startFederation) {\r
                        configureFederation();\r
                }               \r

diff --git a/src/com/gitblit/LuceneExecutor.java b/src/com/gitblit/LuceneExecutor.java
index e859947d97eff185877bd538795aef92a80172ca..db604a0a90f706ddffcdb222bbae3fd27a4a96af 100644 (file)
--- a/src/com/gitblit/LuceneExecutor.java
+++ b/src/com/gitblit/LuceneExecutor.java
@@ -148,26 +148,12 @@ public class LuceneExecutor implements Runnable {
        }\r
 \r
        /**\r
-        * Indicates if the Lucene executor can index repositories.\r
-        * \r
-        * @return true if the Lucene executor is ready to index repositories\r
-        */\r
-       public boolean isReady() {\r
-               return storedSettings.getBoolean(Keys.lucene.enable, false);\r
-       }\r
-\r
-       /**\r
-        * Run is executed by the gitblit executor service at whatever frequency\r
-        * is specified in the settings.  Because this is called by an executor\r
-        * service, calls will queue - i.e. there can never be concurrent execution\r
-        * of repository index updates.\r
+        * Run is executed by the Gitblit executor service.  Because this is called \r
+        * by an executor service, calls will queue - i.e. there can never be\r
+        * concurrent execution of repository index updates.\r
         */\r
        @Override\r
        public void run() {\r
-               if (!isReady()) {\r
-                       return;\r
-               }\r
-\r
                for (String repositoryName: GitBlit.self().getRepositoryList()) {\r
                        RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);\r
                        if (model.hasCommits && !ArrayUtils.isEmpty(model.indexedBranches)) {\r

diff --git a/src/com/gitblit/wicket/pages/RootPage.java b/src/com/gitblit/wicket/pages/RootPage.java
index f110cb317cd6b5f3be7466fba24dc2a3667cee01..bf811f945902a024d899cfcac0c7740c8eb77822 100644 (file)
--- a/src/com/gitblit/wicket/pages/RootPage.java
+++ b/src/com/gitblit/wicket/pages/RootPage.java
@@ -101,9 +101,7 @@ public abstract class RootPage extends BasePage {
                pages.add(new PageRegistration("gb.repositories", RepositoriesPage.class,\r
                                getRootPageParameters()));\r
                pages.add(new PageRegistration("gb.activity", ActivityPage.class, getRootPageParameters()));\r
-               if (GitBlit.getBoolean(Keys.lucene.enable, false)) {\r
-                       pages.add(new PageRegistration("gb.search", LuceneSearchPage.class));\r
-               }\r
+               pages.add(new PageRegistration("gb.search", LuceneSearchPage.class));\r
                if (showAdmin) {\r
                        pages.add(new PageRegistration("gb.users", UsersPage.class));\r
                }\r