From 2b42e7353083080c0d5647c61aaa102c15c3641f Mon Sep 17 00:00:00 2001 From: takezoe Date: Mon, 11 Nov 2013 03:12:41 +0900 Subject: [PATCH] (refs #173)Move BasicAuthenticationFilter to ScalatraBootstrap also. --- src/main/scala/ScalatraBootstrap.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/scala/ScalatraBootstrap.scala b/src/main/scala/ScalatraBootstrap.scala index d83bb87ac..4ef4c8804 100644 --- a/src/main/scala/ScalatraBootstrap.scala +++ b/src/main/scala/ScalatraBootstrap.scala @@ -1,4 +1,4 @@ -import servlet.TransactionFilter +import _root_.servlet.{BasicAuthenticationFilter, TransactionFilter} import app._ import jp.sf.amateras.scalatra.forms.ValidationJavaScriptProvider import org.scalatra._ @@ -7,9 +7,11 @@ import java.util.EnumSet class ScalatraBootstrap extends LifeCycle { override def init(context: ServletContext) { - // Register TransactionFilter at first + // Register TransactionFilter and BasicAuthenticationFilter at first context.addFilter("transactionFilter", new TransactionFilter) context.getFilterRegistration("transactionFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*") + context.addFilter("basicAuthenticationFilter", new BasicAuthenticationFilter) + context.getFilterRegistration("basicAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*") // Register controllers context.mount(new IndexController, "/")