make use of new WebElement and Priority annotation

This commit is contained in:
Sebastian Sdorra
2015-02-01 19:52:53 +01:00
parent 79e1e5e972
commit 30b49490a7
19 changed files with 161 additions and 85 deletions

View File

@@ -39,7 +39,10 @@ import com.google.inject.Singleton;
import org.eclipse.jgit.http.server.GitSmartHttpTools;
import sonia.scm.ClientMessages;
import sonia.scm.Priority;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.filter.Filters;
import sonia.scm.filter.WebElement;
import sonia.scm.repository.GitUtil;
import sonia.scm.web.filter.AutoLoginModule;
import sonia.scm.web.filter.BasicAuthenticationFilter;
@@ -57,7 +60,8 @@ import javax.servlet.http.HttpServletResponse;
*
* @author Sebastian Sdorra
*/
@Singleton
@Priority(Filters.PRIORITY_AUTHENTICATION)
@WebElement(value = GitServletModule.PATTERN_GIT)
public class GitBasicAuthenticationFilter extends BasicAuthenticationFilter
{

View File

@@ -52,12 +52,16 @@ import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import sonia.scm.Priority;
import sonia.scm.filter.Filters;
import sonia.scm.filter.WebElement;
/**
*
* @author Sebastian Sdorra
*/
@Singleton
@Priority(Filters.PRIORITY_AUTHORIZATION)
@WebElement(value = GitServletModule.PATTERN_GIT)
public class GitPermissionFilter extends ProviderPermissionFilter
{

View File

@@ -67,8 +67,6 @@ public class GitServletModule extends ServletModule
bind(ScmTransportProtocol.class);
// serlvelts and filters
filter(PATTERN_GIT).through(GitBasicAuthenticationFilter.class);
filter(PATTERN_GIT).through(GitPermissionFilter.class);
serve(PATTERN_GIT).with(ScmGitServlet.class);
}
}