From 2179fb76bbbd2021c350a7c28d6901389ed50b2b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 26 Sep 2011 17:48:53 -0400
Subject: [PATCH] Fixed broken urls for WAR builds.
---
src/WEB-INF/web.xml | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/WEB-INF/web.xml b/src/WEB-INF/web.xml
index d5d3288..c5adadd 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
@@ -92,6 +84,19 @@
<filter-name>SyndicationFilter</filter-name>
<url-pattern>/feed/*</url-pattern>
</filter-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>
<!-- Wicket Filter -->
@@ -114,8 +119,9 @@
* GitServlet <url-pattern>
* com.gitblit.Constants.GIT_PATH
* ZipServlet <url-pattern>
- * com.gitblit.Constants.ZIP_PATH -->
- <param-value>git/,feed/,zip/</param-value>
+ * com.gitblit.Constants.ZIP_PATH
+ * FederationServlet <url-pattern> -->
+ <param-value>git/,feed/,zip/,federation/</param-value>
</init-param>
</filter>
<filter-mapping>
--
Gitblit v1.9.1