Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-06 21:45: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

7
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnDAVConfig.java
View File

@@ -35,12 +35,11 @@ package sonia.scm.web;
//~--- non-JDK imports --------------------------------------------------------
import com.google.inject.Provider;
import org.tmatesoft.svn.core.internal.server.dav.DAVConfig;
import org.tmatesoft.svn.core.internal.server.dav.SVNPathBasedAccess;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryProvider;
import sonia.scm.repository.SvnRepositoryHandler;
//~--- JDK imports ------------------------------------------------------------
@@ -63,7 +62,7 @@ public class SvnDAVConfig extends DAVConfig
* @param repositoryProvider
*/
public SvnDAVConfig(DAVConfig davConfig, SvnRepositoryHandler handler,
Provider<Repository> repositoryProvider)
RepositoryProvider repositoryProvider)
{
this.davConfig = davConfig;
this.handler = handler;
@@ -292,5 +291,5 @@ public class SvnDAVConfig extends DAVConfig
private SvnRepositoryHandler handler;
/** Field description */
private Provider<Repository> repositoryProvider;
private RepositoryProvider repositoryProvider;
}

10
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnDAVServlet.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;
@@ -47,6 +46,7 @@ import org.tmatesoft.svn.core.internal.server.dav.DAVServlet;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryRequestListenerUtil;
import sonia.scm.repository.RepositoryProvider;
import sonia.scm.repository.SvnRepositoryHandler;
import sonia.scm.util.AssertUtil;
import sonia.scm.util.HttpUtil;
@@ -88,7 +88,7 @@ public class SvnDAVServlet extends DAVServlet
@Inject
public SvnDAVServlet(
SvnRepositoryHandler handler,
Provider<Repository> repositoryProvider,
RepositoryProvider repositoryProvider,
RepositoryRequestListenerUtil repositoryRequestListenerUtil)
{
this.handler = handler;
@@ -169,7 +169,7 @@ public class SvnDAVServlet extends DAVServlet
* @param repositoryProvider
*/
public SvnHttpServletRequestWrapper(HttpServletRequest request,
Provider<Repository> repositoryProvider)
RepositoryProvider repositoryProvider)
{
super(request);
this.repositoryProvider = repositoryProvider;
@@ -233,7 +233,7 @@ public class SvnDAVServlet extends DAVServlet
//~--- fields -------------------------------------------------------------
/** Field description */
private Provider<Repository> repositoryProvider;
private RepositoryProvider repositoryProvider;
}
@@ -243,7 +243,7 @@ public class SvnDAVServlet extends DAVServlet
private SvnRepositoryHandler handler;
/** Field description */
private Provider<Repository> repositoryProvider;
private RepositoryProvider repositoryProvider;
/** Field description */
private RepositoryRequestListenerUtil repositoryRequestListenerUtil;

4
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnPermissionFilter.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;
@@ -78,7 +78,7 @@ public class SvnPermissionFilter extends ProviderPermissionFilter
@Inject
public SvnPermissionFilter(
Provider<WebSecurityContext> securityContextProvider,
Provider<Repository> repository)
RepositoryProvider repository)
{
super(securityContextProvider, repository);
}