Documentation

diff --git a/NOTICE b/NOTICE
index 5e498037abb6293030c46b5b1b3eb141fb079ec4..f394d86f51dd666e7522e3a185679e6d13ad4292 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -71,6 +71,22 @@ Jetty
 \r
    http://eclipse.org/jetty\r
 \r
+---------------------------------------------------------------------------\r
+Apache Lucene\r
+---------------------------------------------------------------------------\r
+   Apache Lucene, released under the\r
+   Apache Software License, Version 2.0.\r
+\r
+   http://lucene.apache.org\r
+\r
+---------------------------------------------------------------------------\r
+Groovy\r
+---------------------------------------------------------------------------\r
+   Groovy, released under the\r
+   Apache Software License, Version 2.0.\r
+\r
+   http://groovy.codehaus.org\r
+\r
 ---------------------------------------------------------------------------\r
 SLF4J\r
 ---------------------------------------------------------------------------\r
@@ -190,4 +206,12 @@ magnifying glass search icon
    Creative Commons CC-BY License.\r
 \r
    http://gnome.org\r
-   
\ No newline at end of file
+\r
+---------------------------------------------------------------------------\r
+GLYHPICONS\r
+---------------------------------------------------------------------------\r
+   GLPYHICONS, released under the\r
+   Creative Commons CC-BY License.\r
+\r
+   http://glyphicons.com\r
+      
\ No newline at end of file

diff --git a/docs/01_features.mkd b/docs/01_features.mkd
index 7eb9e645eb40875217f2dc9f5e6bbbdaa2486dc3..cb37f5de3ada11a6be30210ab950b27478e21bc0 100644 (file)
--- a/docs/01_features.mkd
+++ b/docs/01_features.mkd
@@ -13,6 +13,7 @@
 - Gitweb inspired web UI\r
 - Groovy pre- and post- push hook scripts, per-repository or globally for all repositories\r
 - Email push notifications *(via sendmail.groovy push script)*\r
+- Lucene indexing of specified repository branches\r
 - Administrators may create, edit, rename, or delete repositories through the web UI or RPC interface\r
 - Administrators may create, edit, rename, or delete users through the web UI or RPC interface\r
 - Administrators may create, edit, rename, or delete teams through the web UI or RPC interface\r

diff --git a/docs/01_setup.mkd b/docs/01_setup.mkd
index 1160d8e999fca2ad64fac37613bdb83aff8cf0cd..9c386d96793806fa68314dba94072f2695c50d65 100644 (file)
--- a/docs/01_setup.mkd
+++ b/docs/01_setup.mkd
@@ -141,15 +141,6 @@ ProxyPreserveHost On
        Allow from all\r
 </Proxy>\r
  \r
-# Turn on Proxy status reporting at /status\r
-# This should be better protected than: Allow from all\r
-ProxyStatus On\r
-<Location /status>\r
-       SetHandler server-status\r
-       Order Deny,Allow\r
-       Allow from all\r
-</Location>\r
-\r
 # The proxy context path must match the Gitblit context path.\r
 # For Gitblit GO, see server.contextPath in gitblit.properties.\r
 \r
@@ -376,6 +367,23 @@ All three sources are checked and merged into a unique list of destination addre
 **NOTE:**  \r
 Care should be taken when devising your notification scheme as it relates to any VIEW restricted repositories you might have.  Setting a global mailing list and activating push notifications for a VIEW restricted repository may send unwanted emails.\r
 \r
+## Lucene Search Integration\r
+\r
+*SINCE 0.9.0*\r
+\r
+Repositories may optionally be indexed using the Lucene search engine.  Lucene indexing is an opt-in feature which means that no repositories are automatically indexed.  Like anything else, this has benefits and drawbacks.\r
+\r
+You may specify which branches should be indexed per-repository in the *Edit Repository* page.  New/empty repositories can not pre-specify indexed branches; you can only specify indexed branches for a repository with commits.  Indexes are built and incrementally updated on a 2 minute cycle so you may have to wait a few minutes before your index is built or before your latest pushes get indexed.\r
+\r
+**NOTE:**  \r
+Repositories that specify indexed branches will redirect to the Lucene search page from the search box in the upper right corner of a repository page.  Repositories that do not specify any indexed branches will use the traditional commit search.\r
+\r
+The Lucene search offers several advantages over the traditional commit search:\r
+\r
+1. multi-term searches\r
+2. term-highlighted and syntax-highlighted fragment matches\r
+3. multi-repository searches\r
+\r
 ## Client Setup and Configuration\r
 ### Https with Self-Signed Certificates\r
 You must tell Git/JGit not to verify the self-signed certificate in order to perform any remote Git operations.\r

diff --git a/docs/04_design.mkd b/docs/04_design.mkd
index 4fbb2a13a012ee81fa79dd0948ce3b124c209e58..a439edf5a995418f4dc27057c422967313f19a61 100644 (file)
--- a/docs/04_design.mkd
+++ b/docs/04_design.mkd
@@ -37,6 +37,7 @@ The following dependencies are automatically downloaded by Gitblit GO (or alread
 - [google-gson](http://code.google.com/google-gson) (Apache 2.0)\r
 - [javamail](http://kenai.com/projects/javamail) (CDDL-1.0, BSD, GPL-2.0, GNU-Classpath)\r
 - [Groovy](http://groovy.codehaus.org) (Apache 2.0)\r
+- [Lucene](http://lucene.apache.org) (Apache 2.0)\r
 \r
 ### Other Build Dependencies\r
 - [Fancybox image viewer](http://fancybox.net) (MIT and GPL dual-licensed)\r

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 9999c9fa92e2dcf944a0813baffca0fd102e70ad..90500d5f72ac5eea7d179f4ae91b5adb7b5cb2e9 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -10,12 +10,15 @@
 \r
 #### changes\r
 \r
-- Block pushes to a repository with a working copy (i.e. non-bare repository) (issue-49)\r
+- Reject pushes to a repository with a working copy (i.e. non-bare repository) (issue-49)\r
 - Changed default web.datetimestampLongFormat from *EEEE, MMMM d, yyyy h:mm a z* to *EEEE, MMMM d, yyyy HH:mm Z* (issue 50)\r
 - Expanded commit age coloring from 2 days to 30 days (issue 57)\r
 \r
 #### additions\r
 \r
+- Added optional Lucene branch indexing (issue 16)  \r
+Repository branches may be optionally indexed by Lucene for improved searching.  To use this feature you have to specify which branches to index within the *Edit Repository* page.  Indexes are automatically built and incrementally updated on a 2 minute cycle. (i.e you will have to wait 2-3 minutes after specifying a branch to be indexed before the index will be built.)<br/><br/>\r
+If a repository has Lucene-indexed branches the *search* form on the repository pages will redirect to the root-level Lucene search page.  If the repository does not specify any indexed branches then the traditional repository commit search is used.\r
 - Allow specifying timezone to use for Gitblit which is independent of both the JVM and the system timezone (issue 54)  \r
     **New:** *web.timezone =*  \r
 - Added a built-in AJP connector for integrating Gitblit GO into an Apache mod_proxy setup (issue 59)  \r

diff --git a/resources/gitblit.css b/resources/gitblit.css
index 0701a7cf5ce5e48bd9c1a71df127606b0b01b238..0b285fb4fdf8ffb1feb039f6040a6c91496be8a2 100644 (file)
--- a/resources/gitblit.css
+++ b/resources/gitblit.css
@@ -341,6 +341,7 @@ div.header {
        border: 1px solid #ddd;\r
        border-bottom: 0;\r
        border-radius: 3px 3px 0 0;\r
+       font-weight: bold;\r
 }\r
 \r
 div.commitHeader {\r

diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java
index 54a6db3f761e243150ce00b9822ea21561aac74a..879c5a49b7634cff6cfc9cfddffce1b13e6a77ab 100644 (file)
--- a/src/com/gitblit/Constants.java
+++ b/src/com/gitblit/Constants.java
@@ -38,7 +38,7 @@ public class Constants {
 \r
        // The build script extracts this exact line so be careful editing it\r
        // and only use A-Z a-z 0-9 .-_ in the string.\r
-       public static final String JGIT_VERSION = "JGit 1.2.0 (201112221803-r)";\r
+       public static final String JGIT_VERSION = "JGit 1.3.0 (201202151440-r)";\r
 \r
        public static final String ADMIN_ROLE = "#admin";\r
 \r