From 9e7b14b651cf3812718d33665529de919c05795d Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 15 May 2014 08:10:20 -0400 Subject: [PATCH] Redesign the EmptyRepositoryPage --- src/main/java/WEB-INF/web.xml | 68 ++++++++++++++++++++++++++++++--- 1 files changed, 61 insertions(+), 7 deletions(-) diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml index c082b94..3a6c449 100644 --- 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> <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 +134,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 +176,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 +214,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: @@ -202,6 +235,10 @@ <filter-mapping> <filter-name>GitFilter</filter-name> <url-pattern>/git/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>GitFilter</filter-name> + <url-pattern>/r/*</url-pattern> </filter-mapping> @@ -250,7 +287,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 @@ -297,10 +349,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