(refs #173)Move TransactionFilter to ScalatraBootstrap from web.xml to support Tomcat 7.0.29 or before.

This commit is contained in:
takezoe
2013-11-10 05:24:38 +09:00
parent b4250d8254
commit f573fef9eb
2 changed files with 10 additions and 2 deletions

View File

@@ -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()

View File

@@ -27,7 +27,7 @@
<servlet-name>GitRepositoryServlet</servlet-name>
<url-pattern>/git/*</url-pattern>
</servlet-mapping>
<!--
<filter>
<filter-name>TransactionFilter</filter-name>
<filter-class>servlet.TransactionFilter</filter-class>
@@ -37,7 +37,7 @@
<filter-name>TransactionFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-->
<filter>
<filter-name>BasicAuthenticationFilter</filter-name>
<filter-class>servlet.BasicAuthenticationFilter</filter-class>