From 73f1adb2e84b8b9cd4045bcdd7d9afa72d3875b5 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 27 Nov 2012 17:13:03 -0500 Subject: [PATCH] Added short commit id column to log and history tables (issue 168) --- src/WEB-INF/web.xml | 68 ++++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 3 deletions(-) diff --git a/src/WEB-INF/web.xml b/src/WEB-INF/web.xml index 0a6cea9..85b24d5 100644 --- a/src/WEB-INF/web.xml +++ b/src/WEB-INF/web.xml @@ -82,7 +82,35 @@ <servlet-name>RpcServlet</servlet-name> <url-pattern>/rpc/*</url-pattern> </servlet-mapping> + + + <!-- Pages Servlet + <url-pattern> MUST match: + * PagesFilter + * com.gitblit.Constants.PAGES_PATH + * Wicket Filter ignorePaths parameter --> + <servlet> + <servlet-name>PagesServlet</servlet-name> + <servlet-class>com.gitblit.PagesServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>PagesServlet</servlet-name> + <url-pattern>/pages/*</url-pattern> + </servlet-mapping> + + <!-- Robots.txt Servlet + <url-pattern> MUST match: + * Wicket Filter ignorePaths parameter --> + <servlet> + <servlet-name>RobotsTxtServlet</servlet-name> + <servlet-class>com.gitblit.RobotsTxtServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>RobotsTxtServlet</servlet-name> + <url-pattern>/robots.txt</url-pattern> + </servlet-mapping> + <!-- Git Access Restriction Filter <url-pattern> MUST match: @@ -127,8 +155,38 @@ <filter-name>ZipFilter</filter-name> <url-pattern>/zip/*</url-pattern> </filter-mapping> + - + <!-- Rpc Restriction Filter + <url-pattern> MUST match: + * RpcServlet + * com.gitblit.Constants.RPC_PATH + * Wicket Filter ignorePaths parameter --> + <filter> + <filter-name>RpcFilter</filter-name> + <filter-class>com.gitblit.RpcFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>RpcFilter</filter-name> + <url-pattern>/rpc/*</url-pattern> + </filter-mapping> + + + <!-- Pges Restriction Filter + <url-pattern> MUST match: + * PagesServlet + * com.gitblit.Constants.PAGES_PATH + * Wicket Filter ignorePaths parameter --> + <filter> + <filter-name>PagesFilter</filter-name> + <filter-class>com.gitblit.PagesFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>PagesFilter</filter-name> + <url-pattern>/pages/*</url-pattern> + </filter-mapping> + + <!-- Wicket Filter --> <filter> <filter-name>wicketFilter</filter-name> @@ -152,8 +210,12 @@ * ZipServlet <url-pattern> * com.gitblit.Constants.ZIP_PATH * FederationServlet <url-pattern> - * RpcServlet <url-pattern> --> - <param-value>git/,feed/,zip/,federation/,rpc/</param-value> + * RpcFilter <url-pattern> + * RpcServlet <url-pattern> + * PagesFilter <url-pattern> + * PagesServlet <url-pattern> + * com.gitblit.Constants.PAGES_PATH --> + <param-value>git/,feed/,zip/,federation/,rpc/,pages/,robots.txt</param-value> </init-param> </filter> <filter-mapping> -- Gitblit v1.9.1