From 5be43be6a2788f97ae741d2c7be2cb63f1bd0ede Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 28 Jan 2014 11:14:21 -0500
Subject: [PATCH] Fix broken import from pull request #136
---
src/main/java/WEB-INF/web.xml | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/src/main/java/WEB-INF/web.xml b/src/main/java/WEB-INF/web.xml
index 6e24326..8f51c21 100644
--- a/src/main/java/WEB-INF/web.xml
+++ b/src/main/java/WEB-INF/web.xml
@@ -36,9 +36,10 @@
<!-- PARAMS -->
- <!-- Gitblit Context Listener --><!-- STRIP
+
+<!-- Gitblit Context Listener --><!-- STRIP
<listener>
- <listener-class>com.gitblit.GitBlit</listener-class>
+ <listener-class>com.gitblit.servlet.GitblitContext</listener-class>
</listener>STRIP -->
@@ -49,11 +50,15 @@
* Wicket Filter ignorePaths parameter -->
<servlet>
<servlet-name>GitServlet</servlet-name>
- <servlet-class>com.gitblit.git.GitServlet</servlet-class>
+ <servlet-class>com.gitblit.servlet.GitServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>GitServlet</servlet-name>
<url-pattern>/git/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>GitServlet</servlet-name>
+ <url-pattern>/r/*</url-pattern>
</servlet-mapping>
@@ -63,7 +68,7 @@
* Wicket Filter ignorePaths parameter -->
<servlet>
<servlet-name>SparkleShareInviteServlet</servlet-name>
- <servlet-class>com.gitblit.SparkleShareInviteServlet</servlet-class>
+ <servlet-class>com.gitblit.servlet.SparkleShareInviteServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>SparkleShareInviteServlet</servlet-name>
@@ -78,7 +83,7 @@
* Wicket Filter ignorePaths parameter -->
<servlet>
<servlet-name>SyndicationServlet</servlet-name>
- <servlet-class>com.gitblit.SyndicationServlet</servlet-class>
+ <servlet-class>com.gitblit.servlet.SyndicationServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>SyndicationServlet</servlet-name>
@@ -93,7 +98,7 @@
* Wicket Filter ignorePaths parameter -->
<servlet>
<servlet-name>ZipServlet</servlet-name>
- <servlet-class>com.gitblit.DownloadZipServlet</servlet-class>
+ <servlet-class>com.gitblit.servlet.DownloadZipServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ZipServlet</servlet-name>
@@ -107,7 +112,7 @@
* Wicket Filter ignorePaths parameter -->
<servlet>
<servlet-name>FederationServlet</servlet-name>
- <servlet-class>com.gitblit.FederationServlet</servlet-class>
+ <servlet-class>com.gitblit.servlet.FederationServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>FederationServlet</servlet-name>
@@ -121,7 +126,7 @@
* Wicket Filter ignorePaths parameter -->
<servlet>
<servlet-name>RpcServlet</servlet-name>
- <servlet-class>com.gitblit.RpcServlet</servlet-class>
+ <servlet-class>com.gitblit.servlet.RpcServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>RpcServlet</servlet-name>
@@ -136,7 +141,7 @@
* Wicket Filter ignorePaths parameter -->
<servlet>
<servlet-name>PagesServlet</servlet-name>
- <servlet-class>com.gitblit.PagesServlet</servlet-class>
+ <servlet-class>com.gitblit.servlet.PagesServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>PagesServlet</servlet-name>
@@ -149,7 +154,7 @@
* Wicket Filter ignorePaths parameter -->
<servlet>
<servlet-name>LogoServlet</servlet-name>
- <servlet-class>com.gitblit.LogoServlet</servlet-class>
+ <servlet-class>com.gitblit.servlet.LogoServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>LogoServlet</servlet-name>
@@ -161,7 +166,7 @@
* Wicket Filter ignorePaths parameter -->
<servlet>
<servlet-name>BranchGraphServlet</servlet-name>
- <servlet-class>com.gitblit.BranchGraphServlet</servlet-class>
+ <servlet-class>com.gitblit.servlet.BranchGraphServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>BranchGraphServlet</servlet-name>
@@ -173,7 +178,7 @@
* Wicket Filter ignorePaths parameter -->
<servlet>
<servlet-name>RobotsTxtServlet</servlet-name>
- <servlet-class>com.gitblit.RobotsTxtServlet</servlet-class>
+ <servlet-class>com.gitblit.servlet.RobotsTxtServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>RobotsTxtServlet</servlet-name>
@@ -188,11 +193,15 @@
* Wicket Filter ignorePaths parameter -->
<filter>
<filter-name>GitFilter</filter-name>
- <filter-class>com.gitblit.GitFilter</filter-class>
+ <filter-class>com.gitblit.servlet.GitFilter</filter-class>
</filter>
<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>
@@ -203,7 +212,7 @@
* Wicket Filter ignorePaths parameter -->
<filter>
<filter-name>SyndicationFilter</filter-name>
- <filter-class>com.gitblit.SyndicationFilter</filter-class>
+ <filter-class>com.gitblit.servlet.SyndicationFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>SyndicationFilter</filter-name>
@@ -218,7 +227,7 @@
* Wicket Filter ignorePaths parameter -->
<filter>
<filter-name>ZipFilter</filter-name>
- <filter-class>com.gitblit.DownloadZipFilter</filter-class>
+ <filter-class>com.gitblit.servlet.DownloadZipFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>ZipFilter</filter-name>
@@ -233,7 +242,7 @@
* Wicket Filter ignorePaths parameter -->
<filter>
<filter-name>RpcFilter</filter-name>
- <filter-class>com.gitblit.RpcFilter</filter-class>
+ <filter-class>com.gitblit.servlet.RpcFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>RpcFilter</filter-name>
@@ -248,7 +257,7 @@
* Wicket Filter ignorePaths parameter -->
<filter>
<filter-name>PagesFilter</filter-name>
- <filter-class>com.gitblit.PagesFilter</filter-class>
+ <filter-class>com.gitblit.servlet.PagesFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>PagesFilter</filter-name>
@@ -257,7 +266,7 @@
<filter>
<filter-name>EnforceAuthenticationFilter</filter-name>
- <filter-class>com.gitblit.EnforceAuthenticationFilter</filter-class>
+ <filter-class>com.gitblit.servlet.EnforceAuthenticationFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>EnforceAuthenticationFilter</filter-name>
@@ -270,11 +279,7 @@
<filter-name>wicketFilter</filter-name>
<filter-class>
com.gitblit.wicket.GitblitWicketFilter
- </filter-class>
- <init-param>
- <param-name>applicationClassName</param-name>
- <param-value>com.gitblit.wicket.GitBlitWebApp</param-value>
- </init-param>
+ </filter-class>
<init-param>
<param-name>ignorePaths</param-name>
<!-- Paths should match
@@ -295,11 +300,12 @@
* PagesFilter <url-pattern>
* PagesServlet <url-pattern>
* com.gitblit.Constants.PAGES_PATH -->
- <param-value>git/,feed/,zip/,federation/,rpc/,pages/,robots.txt,logo.png,graph/,sparkleshare/</param-value>
+ <param-value>r/,git/,feed/,zip/,federation/,rpc/,pages/,robots.txt,logo.png,graph/,sparkleshare/</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>wicketFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
+
</web-app>
\ No newline at end of file
--
Gitblit v1.9.1