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 8840805cc2237c51d78d45e32ab2471b4b27e0f7..8f51c21b69426def233eddb3ef4c56f130801206 100644 (file)
--- 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>         \r
                <url-pattern>/git/*</url-pattern>\r
        </servlet-mapping>\r
-       <servlet>\r
-               <servlet-name>GitServlet2</servlet-name>\r
-               <servlet-class>com.gitblit.servlet.GitServlet</servlet-class>\r
-       </servlet>\r
        <servlet-mapping>\r
-               <servlet-name>GitServlet2</servlet-name>                \r
+               <servlet-name>GitServlet</servlet-name>         \r
                <url-pattern>/r/*</url-pattern>\r
        </servlet-mapping>\r
 \r
@@ -203,12 +199,8 @@
                <filter-name>GitFilter</filter-name>\r
                <url-pattern>/git/*</url-pattern>\r
        </filter-mapping>\r
-       <filter>\r
-               <filter-name>GitFilter2</filter-name>\r
-               <filter-class>com.gitblit.servlet.GitFilter</filter-class>\r
-       </filter>\r
        <filter-mapping>\r
-               <filter-name>GitFilter2</filter-name>\r
+               <filter-name>GitFilter</filter-name>\r
                <url-pattern>/r/*</url-pattern>\r
        </filter-mapping>\r
        \r