From: James Moger <james.moger@gitblit.com>
Date: Fri, 13 Dec 2013 13:12:47 +0000 (-0500)
Subject: Use multiple mappings for the git servlet instead of multiple instances
X-Git-Tag: v1.4.0~143
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0fe9792a9f194e68288c377810c33973d117923f;p=gitblit.git

Use multiple mappings for the git servlet instead of multiple instances

Change-Id: I47adeaac142ca7ea5199a5c4c2164ffd9cc68551
---

diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml
index 8840805c..8f51c21b 100644
--- a/src/main/java/WEB-INF/web.xml
+++ b/src/main/java/WEB-INF/web.xml
@@ -56,12 +56,8 @@
 		<servlet-name>GitServlet</servlet-name>		
 		<url-pattern>/git/*</url-pattern>
 	</servlet-mapping>
-	<servlet>
-		<servlet-name>GitServlet2</servlet-name>
-		<servlet-class>com.gitblit.servlet.GitServlet</servlet-class>
-	</servlet>
 	<servlet-mapping>
-		<servlet-name>GitServlet2</servlet-name>		
+		<servlet-name>GitServlet</servlet-name>		
 		<url-pattern>/r/*</url-pattern>
 	</servlet-mapping>
 
@@ -203,12 +199,8 @@
 		<filter-name>GitFilter</filter-name>
 		<url-pattern>/git/*</url-pattern>
 	</filter-mapping>
-	<filter>
-		<filter-name>GitFilter2</filter-name>
-		<filter-class>com.gitblit.servlet.GitFilter</filter-class>
-	</filter>
 	<filter-mapping>
-		<filter-name>GitFilter2</filter-name>
+		<filter-name>GitFilter</filter-name>
 		<url-pattern>/r/*</url-pattern>
 	</filter-mapping>