From 2a8ea034b63736708839c140e53121026c19b9a8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 19 Sep 2013 09:03:04 -0400
Subject: [PATCH] Fix support for implied SSH urls in web.otherUrls (issue-311)

---
 src/main/java/WEB-INF/web.xml |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml
index bf12166..d4acb04 100644
--- a/src/main/java/WEB-INF/web.xml
+++ b/src/main/java/WEB-INF/web.xml
@@ -154,6 +154,17 @@
 		<url-pattern>/logo.png</url-pattern>
 	</servlet-mapping>
 
+	<!-- Branch Graph Servlet
+		 <url-pattern> MUST match: 
+			* Wicket Filter ignorePaths parameter -->
+	<servlet>
+		<servlet-name>BranchGraphServlet</servlet-name>
+		<servlet-class>com.gitblit.BranchGraphServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>BranchGraphServlet</servlet-name>		
+		<url-pattern>/graph/*</url-pattern>
+	</servlet-mapping>
 
 	<!-- Robots.txt Servlet
 		 <url-pattern> MUST match: 
@@ -256,7 +267,7 @@
     <filter>
         <filter-name>wicketFilter</filter-name>
         <filter-class>
-            org.apache.wicket.protocol.http.WicketFilter
+            com.gitblit.wicket.GitblitWicketFilter
         </filter-class>
         <init-param>
             <param-name>applicationClassName</param-name>
@@ -282,7 +293,7 @@
              	* PagesFilter <url-pattern>
              	* PagesServlet <url-pattern>
              	* com.gitblit.Constants.PAGES_PATH -->
-            <param-value>git/,feed/,zip/,federation/,rpc/,pages/,robots.txt,logo.png,sparkleshare/</param-value>
+            <param-value>git/,feed/,zip/,federation/,rpc/,pages/,robots.txt,logo.png,graph/,sparkleshare/</param-value>
         </init-param>
     </filter>
     <filter-mapping>

--
Gitblit v1.9.1