From cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Jan 2012 17:34:05 -0500
Subject: [PATCH] Fixed bug in receive hook for repositories in subfolders
---
src/WEB-INF/web.xml | 82 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 14 deletions(-)
diff --git a/src/WEB-INF/web.xml b/src/WEB-INF/web.xml
index d5d3288..afe4552 100644
--- a/src/WEB-INF/web.xml
+++ b/src/WEB-INF/web.xml
@@ -15,23 +15,15 @@
<url-pattern> MUST match:
* GitFilter
* com.gitblit.Constants.GIT_PATH
- * Wicket Filter ignorePaths parameter --><!-- STRIP
+ * Wicket Filter ignorePaths parameter -->
<servlet>
<servlet-name>GitServlet</servlet-name>
- <servlet-class>org.jgit.http.transport.GitServlet</servlet-class>
- <init-param>
- <param-name>base-path</param-name>
- <param-value>c:/git</param-value>
- </init-param>
- <init-param>
- <param-name>export-all</param-name>
- <param-value>1</param-value>
- </init-param>
+ <servlet-class>com.gitblit.GitServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>GitServlet</servlet-name>
<url-pattern>/git/*</url-pattern>
- </servlet-mapping>STRIP -->
+ </servlet-mapping>
<!-- Syndication Servlet
@@ -63,7 +55,35 @@
<url-pattern>/zip/*</url-pattern>
</servlet-mapping>
-
+
+ <!-- Federation Servlet
+ <url-pattern> MUST match:
+ * com.gitblit.Constants.FEDERATION_PATH
+ * Wicket Filter ignorePaths parameter -->
+ <servlet>
+ <servlet-name>FederationServlet</servlet-name>
+ <servlet-class>com.gitblit.FederationServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>FederationServlet</servlet-name>
+ <url-pattern>/federation/*</url-pattern>
+ </servlet-mapping>
+
+
+ <!-- Rpc Servlet
+ <url-pattern> MUST match:
+ * com.gitblit.Constants.RPC_PATH
+ * Wicket Filter ignorePaths parameter -->
+ <servlet>
+ <servlet-name>RpcServlet</servlet-name>
+ <servlet-class>com.gitblit.RpcServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>RpcServlet</servlet-name>
+ <url-pattern>/rpc/*</url-pattern>
+ </servlet-mapping>
+
+
<!-- Git Access Restriction Filter
<url-pattern> MUST match:
* GitServlet
@@ -92,6 +112,36 @@
<filter-name>SyndicationFilter</filter-name>
<url-pattern>/feed/*</url-pattern>
</filter-mapping>
+
+
+ <!-- Download Zip Restriction Filter
+ <url-pattern> MUST match:
+ * DownloadZipServlet
+ * com.gitblit.Constants.ZIP_PATH
+ * Wicket Filter ignorePaths parameter -->
+ <filter>
+ <filter-name>ZipFilter</filter-name>
+ <filter-class>com.gitblit.DownloadZipFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>ZipFilter</filter-name>
+ <url-pattern>/zip/*</url-pattern>
+ </filter-mapping>
+
+
+ <!-- Rpc Restriction Filter
+ <url-pattern> MUST match:
+ * RpcServlet
+ * com.gitblit.Constants.RPC_PATH
+ * Wicket Filter ignorePaths parameter -->
+ <filter>
+ <filter-name>RpcFilter</filter-name>
+ <filter-class>com.gitblit.RpcFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>RpcFilter</filter-name>
+ <url-pattern>/rpc/*</url-pattern>
+ </filter-mapping>
<!-- Wicket Filter -->
@@ -113,9 +163,13 @@
* GitFilter <url-pattern>
* GitServlet <url-pattern>
* com.gitblit.Constants.GIT_PATH
+ * Zipfilter <url-pattern>
* ZipServlet <url-pattern>
- * com.gitblit.Constants.ZIP_PATH -->
- <param-value>git/,feed/,zip/</param-value>
+ * com.gitblit.Constants.ZIP_PATH
+ * FederationServlet <url-pattern>
+ * RpcFilter <url-pattern>
+ * RpcServlet <url-pattern> -->
+ <param-value>git/,feed/,zip/,federation/,rpc/</param-value>
</init-param>
</filter>
<filter-mapping>
--
Gitblit v1.9.1