mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-08 06:25:51 +01:00
(refs #173)Move TransactionFilter to ScalatraBootstrap from web.xml to support Tomcat 7.0.29 or before.
This commit is contained in:
@@ -1,10 +1,17 @@
|
|||||||
|
import servlet.TransactionFilter
|
||||||
import app._
|
import app._
|
||||||
import jp.sf.amateras.scalatra.forms.ValidationJavaScriptProvider
|
import jp.sf.amateras.scalatra.forms.ValidationJavaScriptProvider
|
||||||
import org.scalatra._
|
import org.scalatra._
|
||||||
import javax.servlet._
|
import javax.servlet._
|
||||||
|
import java.util.EnumSet
|
||||||
|
|
||||||
class ScalatraBootstrap extends LifeCycle {
|
class ScalatraBootstrap extends LifeCycle {
|
||||||
override def init(context: ServletContext) {
|
override def init(context: ServletContext) {
|
||||||
|
// Register TransactionFilter at first
|
||||||
|
context.addFilter("transactionFilter", new TransactionFilter)
|
||||||
|
context.getFilterRegistration("transactionFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
|
||||||
|
|
||||||
|
// Register controllers
|
||||||
context.mount(new IndexController, "/")
|
context.mount(new IndexController, "/")
|
||||||
context.mount(new SearchController, "/")
|
context.mount(new SearchController, "/")
|
||||||
context.mount(new FileUploadController, "/upload")
|
context.mount(new FileUploadController, "/upload")
|
||||||
@@ -23,6 +30,7 @@ class ScalatraBootstrap extends LifeCycle {
|
|||||||
context.mount(new RepositorySettingsController, "/*")
|
context.mount(new RepositorySettingsController, "/*")
|
||||||
context.mount(new ValidationJavaScriptProvider, "/assets/common/js/*")
|
context.mount(new ValidationJavaScriptProvider, "/assets/common/js/*")
|
||||||
|
|
||||||
|
// Create GITBUCKET_HOME directory if it does not exist
|
||||||
val dir = new java.io.File(_root_.util.Directory.GitBucketHome)
|
val dir = new java.io.File(_root_.util.Directory.GitBucketHome)
|
||||||
if(!dir.exists){
|
if(!dir.exists){
|
||||||
dir.mkdirs()
|
dir.mkdirs()
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
<servlet-name>GitRepositoryServlet</servlet-name>
|
<servlet-name>GitRepositoryServlet</servlet-name>
|
||||||
<url-pattern>/git/*</url-pattern>
|
<url-pattern>/git/*</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
|
<!--
|
||||||
<filter>
|
<filter>
|
||||||
<filter-name>TransactionFilter</filter-name>
|
<filter-name>TransactionFilter</filter-name>
|
||||||
<filter-class>servlet.TransactionFilter</filter-class>
|
<filter-class>servlet.TransactionFilter</filter-class>
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
<filter-name>TransactionFilter</filter-name>
|
<filter-name>TransactionFilter</filter-name>
|
||||||
<url-pattern>/*</url-pattern>
|
<url-pattern>/*</url-pattern>
|
||||||
</filter-mapping>
|
</filter-mapping>
|
||||||
|
-->
|
||||||
<filter>
|
<filter>
|
||||||
<filter-name>BasicAuthenticationFilter</filter-name>
|
<filter-name>BasicAuthenticationFilter</filter-name>
|
||||||
<filter-class>servlet.BasicAuthenticationFilter</filter-class>
|
<filter-class>servlet.BasicAuthenticationFilter</filter-class>
|
||||||
|
|||||||
Reference in New Issue
Block a user