From dd2dc35d6bc2776718cc70ecbd47b225d818ab17 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 13:46:49 -0400
Subject: [PATCH] Do not drop missing owners from owners palette
---
src/main/java/WEB-INF/web.xml | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml
index d60992d..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>
@@ -134,18 +130,18 @@
</servlet-mapping>
- <!-- Branch Servlet
+ <!-- Raw Servlet
<url-pattern> MUST match:
- * BranchFilter
- * com.gitblit.Constants.BRANCH_PATH
+ * RawFilter
+ * com.gitblit.Constants.RAW_PATH
* Wicket Filter ignorePaths parameter -->
<servlet>
- <servlet-name>BranchServlet</servlet-name>
- <servlet-class>com.gitblit.servlet.BranchServlet</servlet-class>
+ <servlet-name>RawServlet</servlet-name>
+ <servlet-class>com.gitblit.servlet.RawServlet</servlet-class>
</servlet>
<servlet-mapping>
- <servlet-name>BranchServlet</servlet-name>
- <url-pattern>/branch/*</url-pattern>
+ <servlet-name>RawServlet</servlet-name>
+ <url-pattern>/raw/*</url-pattern>
</servlet-mapping>
@@ -214,6 +210,15 @@
<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:
* GitServlet
@@ -280,16 +285,16 @@
<!-- Branch Restriction Filter
<url-pattern> MUST match:
- * BranchServlet
+ * RawServlet
* com.gitblit.Constants.BRANCH_PATH
* Wicket Filter ignorePaths parameter -->
<filter>
- <filter-name>BranchFilter</filter-name>
- <filter-class>com.gitblit.servlet.BranchFilter</filter-class>
+ <filter-name>RawFilter</filter-name>
+ <filter-class>com.gitblit.servlet.RawFilter</filter-class>
</filter>
<filter-mapping>
- <filter-name>BranchFilter</filter-name>
- <url-pattern>/branch/*</url-pattern>
+ <filter-name>RawFilter</filter-name>
+ <url-pattern>/raw/*</url-pattern>
</filter-mapping>
@@ -340,12 +345,12 @@
* FederationServlet <url-pattern>
* RpcFilter <url-pattern>
* RpcServlet <url-pattern>
- * BranchFilter <url-pattern>
- * BranchServlet <url-pattern>
+ * RawFilter <url-pattern>
+ * RawServlet <url-pattern>
* PagesFilter <url-pattern>
* PagesServlet <url-pattern>
* com.gitblit.Constants.PAGES_PATH -->
- <param-value>r/,git/,pt,feed/,zip/,federation/,rpc/,branch/,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>
@@ -353,4 +358,4 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
-</web-app>
+</web-app>
\ No newline at end of file
--
Gitblit v1.9.1