Preliminary update to JGit 1.2.0. This will be refined.

diff --git a/.classpath b/.classpath
index e6b336c659ca42e09ec610d9f942a01a79ad7eda..d503ab260c7b2e082fdce21e049e0a53da43c48e 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -66,16 +66,6 @@
                        <attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/googlecharts-1.4.17-javadoc.jar!/"/>\r
                </attributes>\r
        </classpathentry>\r
-       <classpathentry kind="lib" path="ext/org.eclipse.jgit-1.1.0.201109151100-r.jar" sourcepath="ext/org.eclipse.jgit-1.1.0.201109151100-r-sources.jar">\r
-               <attributes>\r
-                       <attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/org.eclipse.jgit-1.1.0.201109151100-r-javadoc.jar!/"/>\r
-               </attributes>\r
-       </classpathentry>\r
-       <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-1.1.0.201109151100-r.jar" sourcepath="ext/org.eclipse.jgit.http.server-1.1.0.201109151100-r-sources.jar">\r
-               <attributes>\r
-                       <attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/org.eclipse.jgit-1.1.0.201109151100-r-javadoc.jar!/"/>\r
-               </attributes>\r
-       </classpathentry>\r
        <classpathentry kind="lib" path="ext/javax.servlet-3.0.1.jar" sourcepath="ext/javax.servlet-3.0.1-sources.jar"/>\r
        <classpathentry kind="lib" path="ext/markdownpapers-core-1.2.5.jar" sourcepath="ext/markdownpapers-core-1.2.5-sources.jar">\r
                <attributes>\r
@@ -102,5 +92,15 @@
                        <attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/groovy-all-1.8.4-javadoc.jar!/"/>\r
                </attributes>\r
        </classpathentry>\r
+       <classpathentry kind="lib" path="ext/org.eclipse.jgit-1.2.0.201112221803-r.jar" sourcepath="ext/org.eclipse.jgit-1.1.0.201109151100-r-sources.jar">\r
+               <attributes>\r
+                       <attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/org.eclipse.jgit-1.2.0.201112221803-r-javadoc.jar!/"/>\r
+               </attributes>\r
+       </classpathentry>\r
+       <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-1.2.0.201112221803-r.jar" sourcepath="ext/org.eclipse.jgit.http.server-1.2.0.201112221803-r-sources.jar">\r
+               <attributes>\r
+                       <attribute name="javadoc_location" value="jar:platform:/resource/gitblit/ext/org.eclipse.jgit.http.server-1.2.0.201112221803-r-javadoc.jar!/"/>\r
+               </attributes>\r
+       </classpathentry>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 0ce8621e081cae5d3a9a2189db01667a401997ec..ae2821daaef755c1fa24bc6313b7cea35e0a42ef 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -34,6 +34,7 @@ The original `users.properties` file and it's corresponding implementation are *
    **New:** *web.allowFlashCopyToClipboard = true*\r
 - improved: empty repositories now link to a new *empty repository* page which gives some direction to the user for the next step in using Gitblit.  This page displays the primary push/clone url of the repository and gives sample syntax for the git command-line client. (issue 31)\r
 - improved: unit testing framework has been migrated to JUnit4 syntax and the test suite has been redesigned to run all unit tests, including rpc, federation, and git push/clone tests\r
+- updated: JGit 1.2.0\r
 \r
 ### Older Releases\r
 \r

diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java
index c2d5eb262afebc9a45112ecdb6f0c97e08c5eba7..8171d66756ecb4d5f2e37ac68df2655356756b7f 100644 (file)
--- a/src/com/gitblit/Constants.java
+++ b/src/com/gitblit/Constants.java
@@ -37,7 +37,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.1.0 (201109151100-r)";\r
+       public static final String JGIT_VERSION = "JGit 1.2.0 (201112221803-r)";\r
 \r
        public static final String ADMIN_ROLE = "#admin";\r
 \r

diff --git a/src/com/gitblit/GitServlet.java b/src/com/gitblit/GitServlet.java
index 23fb32a650309e43cb46dfaa452513b939f5d3fc..36e1c3ed5e52838a645c9801bbae58d50639d6bf 100644 (file)
--- a/src/com/gitblit/GitServlet.java
+++ b/src/com/gitblit/GitServlet.java
@@ -26,10 +26,12 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;\r
 import java.text.MessageFormat;\r
 import java.util.Collection;\r
+import java.util.Enumeration;\r
 import java.util.LinkedHashSet;\r
 import java.util.Set;\r
 \r
 import javax.servlet.ServletConfig;\r
+import javax.servlet.ServletContext;\r
 import javax.servlet.ServletException;\r
 import javax.servlet.http.HttpServletRequest;\r
 \r
@@ -71,22 +73,9 @@ public class GitServlet extends org.eclipse.jgit.http.server.GitServlet {
 \r
        private File groovyDir;\r
 \r
-       /**\r
-        * Configure the servlet from Gitblit's configuration.\r
-        */\r
-       @Override\r
-       public String getInitParameter(String name) {\r
-               if (name.equals("base-path")) {\r
-                       return GitBlit.getRepositoriesFolder().getAbsolutePath();\r
-               } else if (name.equals("export-all")) {\r
-                       return "1";\r
-               }\r
-               return super.getInitParameter(name);\r
-       }\r
-\r
        @Override\r
        public void init(ServletConfig config) throws ServletException {\r
-               groovyDir = GitBlit.getGroovyScriptsFolder();           \r
+               groovyDir = GitBlit.getGroovyScriptsFolder();\r
                try {\r
                        gse = new GroovyScriptEngine(groovyDir.getAbsolutePath());\r
                } catch (IOException e) {\r
@@ -106,7 +95,48 @@ public class GitServlet extends org.eclipse.jgit.http.server.GitServlet {
                                return rp;\r
                        }\r
                });\r
-               super.init(config);\r
+               super.init(new GitblitServletConfig(config));\r
+       }\r
+\r
+       /**\r
+        * Transitional wrapper class to configure the JGit 1.2 GitFilter.\r
+        * This GitServlet will probably be replaced by a GitFilter so that Gitblit\r
+        * can serve Git repositories on the root URL and not a /git sub-url.\r
+        * \r
+        * @author James Moger\r
+        * \r
+        */\r
+       private class GitblitServletConfig implements ServletConfig {\r
+               final ServletConfig config;\r
+\r
+               GitblitServletConfig(ServletConfig config) {\r
+                       this.config = config;\r
+               }\r
+\r
+               @Override\r
+               public String getServletName() {\r
+                       return config.getServletName();\r
+               }\r
+\r
+               @Override\r
+               public ServletContext getServletContext() {\r
+                       return config.getServletContext();\r
+               }\r
+\r
+               @Override\r
+               public String getInitParameter(String name) {\r
+                       if (name.equals("base-path")) {\r
+                               return GitBlit.getRepositoriesFolder().getAbsolutePath();\r
+                       } else if (name.equals("export-all")) {\r
+                               return "1";\r
+                       }\r
+                       return config.getInitParameter(name);\r
+               }\r
+\r
+               @Override\r
+               public Enumeration<String> getInitParameterNames() {\r
+                       return config.getInitParameterNames();\r
+               }\r
        }\r
 \r
        /**\r

diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index 8ca52c325f578d907ffce9bffa6261f7079af4e6..1f8554c00a952a20275dd00e015a50a87ae115e8 100644 (file)
--- a/src/com/gitblit/build/Build.java
+++ b/src/com/gitblit/build/Build.java
@@ -457,16 +457,16 @@ public class Build {
                                "3b7c5f3938f202311bdca0bf7ed46bc0118af081");\r
 \r
                public static final MavenObject JGIT = new MavenObject("JGit", "org/eclipse/jgit",\r
-                               "org.eclipse.jgit", "1.1.0.201109151100-r", 1318000, 1354000, 3300000,\r
-                               "bacc988346c839f79513d7bc7f5c88b22ea6e7a5",\r
-                               "90abf988d98ce0d4b162f94f63fc99c435eba6b4",\r
-                               "a46540a2857a0fdbf43debf3383295a897946c79");\r
+                               "org.eclipse.jgit", "1.2.0.201112221803-r", 1318000, 1354000, 3300000,\r
+                               "f3bbea50b64c2c8e20176f412d2f063bd132878f",\r
+                               "f6c616413540e226a6b72bc573a40410412e234f",\r
+                               "a77e5ee65ba284d12ae444ac42e12948a9314c20");\r
 \r
                public static final MavenObject JGIT_HTTP = new MavenObject("JGit", "org/eclipse/jgit",\r
-                               "org.eclipse.jgit.http.server", "1.1.0.201109151100-r", 68000, 62000, 110000,\r
-                               "3070161a89756aac2dfc2e26d89faf31fe894ab4",\r
-                               "9cecb8e4351e616688cafbcca906f542d9b1f525",\r
-                               "20aaab759acd8eb6cb6acbb1b2934a689fb3774d");\r
+                               "org.eclipse.jgit.http.server", "1.2.0.201112221803-r", 68000, 62000, 110000,\r
+                               "0d0004423b71bf7c29cd4ad85010c293c4fab95f",\r
+                               "89be774b6db17bbc47b4757ae9e5178750064880",\r
+                               "4cde29a085200ccf46ac677aeb1abb39352a3a6a");\r
 \r
                public static final MavenObject JSCH = new MavenObject("JSch", "com/jcraft", "jsch",\r
                                "0.1.44-1", 214000, 211000, 413000, "2e9ae08de5a71bd0e0d3ba2558598181bfa71d4e",\r