summaryrefslogtreecommitdiffstats
path: root/src/main/java/WEB-INF/web.xml
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-04-23 15:41:14 -0400
committerJames Moger <james.moger@gitblit.com>2014-05-04 10:43:35 -0400
commitca31f51855b39a179bdad9bb912da6aeadad866d (patch)
tree3b07b555dd4a9307a3d60af5b94004180d0cbaa5 /src/main/java/WEB-INF/web.xml
parentb41754563a8318ae8840574261c503bbf4e7e413 (diff)
downloadgitblit-ca31f51855b39a179bdad9bb912da6aeadad866d.tar.gz
gitblit-ca31f51855b39a179bdad9bb912da6aeadad866d.zip
Split pages servlet into a raw branch servlet and a gh-pages servlet
Diffstat (limited to 'src/main/java/WEB-INF/web.xml')
-rw-r--r--src/main/java/WEB-INF/web.xml36
1 files changed, 34 insertions, 2 deletions
diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml
index 77456d47..d60992dd 100644
--- a/src/main/java/WEB-INF/web.xml
+++ b/src/main/java/WEB-INF/web.xml
@@ -134,6 +134,21 @@
</servlet-mapping>
+ <!-- Branch Servlet
+ <url-pattern> MUST match:
+ * BranchFilter
+ * com.gitblit.Constants.BRANCH_PATH
+ * Wicket Filter ignorePaths parameter -->
+ <servlet>
+ <servlet-name>BranchServlet</servlet-name>
+ <servlet-class>com.gitblit.servlet.BranchServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>BranchServlet</servlet-name>
+ <url-pattern>/branch/*</url-pattern>
+ </servlet-mapping>
+
+
<!-- Pages Servlet
<url-pattern> MUST match:
* PagesFilter
@@ -263,7 +278,22 @@
</filter-mapping>
- <!-- Pges Restriction Filter
+ <!-- Branch Restriction Filter
+ <url-pattern> MUST match:
+ * BranchServlet
+ * com.gitblit.Constants.BRANCH_PATH
+ * Wicket Filter ignorePaths parameter -->
+ <filter>
+ <filter-name>BranchFilter</filter-name>
+ <filter-class>com.gitblit.servlet.BranchFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>BranchFilter</filter-name>
+ <url-pattern>/branch/*</url-pattern>
+ </filter-mapping>
+
+
+ <!-- Pages Restriction Filter
<url-pattern> MUST match:
* PagesServlet
* com.gitblit.Constants.PAGES_PATH
@@ -310,10 +340,12 @@
* FederationServlet <url-pattern>
* RpcFilter <url-pattern>
* RpcServlet <url-pattern>
+ * BranchFilter <url-pattern>
+ * BranchServlet <url-pattern>
* PagesFilter <url-pattern>
* PagesServlet <url-pattern>
* com.gitblit.Constants.PAGES_PATH -->
- <param-value>r/,git/,pt,feed/,zip/,federation/,rpc/,pages/,robots.txt,logo.png,graph/,sparkleshare/</param-value>
+ <param-value>r/,git/,pt,feed/,zip/,federation/,rpc/,branch/,pages/,robots.txt,logo.png,graph/,sparkleshare/</param-value>
</init-param>
</filter>
<filter-mapping>