From 5bcb9448de01e33c23d6cebfdc03164469d5bc3d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 27 Jun 2014 23:11:57 -0400
Subject: [PATCH] Merge branch 'ticket/117' into develop
---
src/main/java/WEB-INF/web.xml | 76 +++++++++++++++++++++++++++++--------
1 files changed, 59 insertions(+), 17 deletions(-)
diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml
index 8840805..13f612e 100644
--- a/src/main/java/WEB-INF/web.xml
+++ b/src/main/java/WEB-INF/web.xml
@@ -30,12 +30,8 @@
</env-entry>
<!-- Gitblit Displayname -->
- <display-name>
- Gitblit - @gb.version@
- </display-name>
+ <display-name>Gitblit - @gb.version@</display-name>
- <!-- PARAMS -->
-
<!-- Gitblit Context Listener --><!-- STRIP
<listener>
@@ -56,12 +52,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>
@@ -138,6 +130,21 @@
</servlet-mapping>
+ <!-- Raw Servlet
+ <url-pattern> MUST match:
+ * RawFilter
+ * com.gitblit.Constants.RAW_PATH
+ * Wicket Filter ignorePaths parameter -->
+ <servlet>
+ <servlet-name>RawServlet</servlet-name>
+ <servlet-class>com.gitblit.servlet.RawServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>RawServlet</servlet-name>
+ <url-pattern>/raw/*</url-pattern>
+ </servlet-mapping>
+
+
<!-- Pages Servlet
<url-pattern> MUST match:
* PagesFilter
@@ -165,6 +172,20 @@
<url-pattern>/logo.png</url-pattern>
</servlet-mapping>
+
+ <!-- PT Servlet
+ <url-pattern> MUST match:
+ * Wicket Filter ignorePaths parameter -->
+ <servlet>
+ <servlet-name>PtServlet</servlet-name>
+ <servlet-class>com.gitblit.servlet.PtServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>PtServlet</servlet-name>
+ <url-pattern>/pt</url-pattern>
+ </servlet-mapping>
+
+
<!-- Branch Graph Servlet
<url-pattern> MUST match:
* Wicket Filter ignorePaths parameter -->
@@ -189,6 +210,14 @@
<url-pattern>/robots.txt</url-pattern>
</servlet-mapping>
+ <filter>
+ <filter-name>ProxyFilter</filter-name>
+ <filter-class>com.gitblit.servlet.ProxyFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>ProxyFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<!-- Git Access Restriction Filter
<url-pattern> MUST match:
@@ -203,12 +232,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>
@@ -258,7 +283,22 @@
</filter-mapping>
- <!-- Pges Restriction Filter
+ <!-- Branch Restriction Filter
+ <url-pattern> MUST match:
+ * RawServlet
+ * com.gitblit.Constants.BRANCH_PATH
+ * Wicket Filter ignorePaths parameter -->
+ <filter>
+ <filter-name>RawFilter</filter-name>
+ <filter-class>com.gitblit.servlet.RawFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>RawFilter</filter-name>
+ <url-pattern>/raw/*</url-pattern>
+ </filter-mapping>
+
+
+ <!-- Pages Restriction Filter
<url-pattern> MUST match:
* PagesServlet
* com.gitblit.Constants.PAGES_PATH
@@ -305,10 +345,12 @@
* FederationServlet <url-pattern>
* RpcFilter <url-pattern>
* RpcServlet <url-pattern>
+ * RawFilter <url-pattern>
+ * RawServlet <url-pattern>
* PagesFilter <url-pattern>
* PagesServlet <url-pattern>
* com.gitblit.Constants.PAGES_PATH -->
- <param-value>r/,git/,feed/,zip/,federation/,rpc/,pages/,robots.txt,logo.png,graph/,sparkleshare/</param-value>
+ <param-value>r/,git/,pt,feed/,zip/,federation/,rpc/,raw/,pages/,robots.txt,logo.png,graph/,sparkleshare/</param-value>
</init-param>
</filter>
<filter-mapping>
--
Gitblit v1.9.1