mirror of
				https://github.com/gitbucket/gitbucket.git
				synced 2025-11-03 20:15:59 +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 jp.sf.amateras.scalatra.forms.ValidationJavaScriptProvider
 | 
			
		||||
import org.scalatra._
 | 
			
		||||
import javax.servlet._
 | 
			
		||||
import java.util.EnumSet
 | 
			
		||||
 | 
			
		||||
class ScalatraBootstrap extends LifeCycle {
 | 
			
		||||
  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 SearchController, "/")
 | 
			
		||||
    context.mount(new FileUploadController, "/upload")
 | 
			
		||||
@@ -23,6 +30,7 @@ class ScalatraBootstrap extends LifeCycle {
 | 
			
		||||
    context.mount(new RepositorySettingsController, "/*")
 | 
			
		||||
    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)
 | 
			
		||||
    if(!dir.exists){
 | 
			
		||||
      dir.mkdirs()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user