Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 23:15:43 +01:00
Code Issues Packages Projects Releases Activity

merge with branch issue-77

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-12-14 17:35:44 +01:00
parent d7f0c9f33a 787924dddc
commit 5bddcc1ab8
13 changed files with 138 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
View File

@@ -36,7 +36,6 @@ package sonia.scm.web;
//~--- non-JDK imports --------------------------------------------------------
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import org.slf4j.Logger;
@@ -48,6 +47,7 @@ import sonia.scm.repository.HgHookManager;
import sonia.scm.repository.HgRepositoryHandler;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryRequestListenerUtil;
import sonia.scm.repository.RepositoryProvider;
import sonia.scm.util.AssertUtil;
import sonia.scm.web.cgi.CGIExecutor;
import sonia.scm.web.cgi.CGIExecutorFactory;
@@ -112,7 +112,7 @@ public class HgCGIServlet extends HttpServlet
@Inject
public HgCGIServlet(CGIExecutorFactory cgiExecutorFactory,
ScmConfiguration configuration,
Provider<Repository> repositoryProvider,
RepositoryProvider repositoryProvider,
HgRepositoryHandler handler, HgHookManager hookManager,
RepositoryRequestListenerUtil requestListenerUtil)
{
@@ -292,7 +292,7 @@ public class HgCGIServlet extends HttpServlet
private HgHookManager hookManager;
/** Field description */
private Provider<Repository> repositoryProvider;
private RepositoryProvider repositoryProvider;
/** Field description */
private RepositoryRequestListenerUtil requestListenerUtil;

4
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgPermissionFilter.java
View File

@@ -39,7 +39,7 @@ import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryProvider;
import sonia.scm.web.filter.ProviderPermissionFilter;
import sonia.scm.web.security.WebSecurityContext;
@@ -65,7 +65,7 @@ public class HgPermissionFilter extends ProviderPermissionFilter
@Inject
public HgPermissionFilter(
Provider<WebSecurityContext> securityContextProvider,
Provider<Repository> repositoryProvider)
RepositoryProvider repositoryProvider)
{
super(securityContextProvider, repositoryProvider);
}