diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitScmProtocolProviderWrapper.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitScmProtocolProviderWrapper.java index 87adbd65fe..318282d7bb 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitScmProtocolProviderWrapper.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitScmProtocolProviderWrapper.java @@ -21,25 +21,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.web; -import sonia.scm.api.v2.resources.ScmPathInfoStore; -import sonia.scm.config.ScmConfiguration; +import sonia.scm.RootURL; import sonia.scm.plugin.Extension; import sonia.scm.repository.GitRepositoryHandler; import sonia.scm.repository.spi.InitializingHttpScmProtocolWrapper; import javax.inject.Inject; -import javax.inject.Provider; import javax.inject.Singleton; @Singleton @Extension public class GitScmProtocolProviderWrapper extends InitializingHttpScmProtocolWrapper { @Inject - public GitScmProtocolProviderWrapper(ScmGitServletProvider servletProvider, Provider uriInfoStore, ScmConfiguration scmConfiguration) { - super(servletProvider, uriInfoStore, scmConfiguration); + public GitScmProtocolProviderWrapper(ScmGitServletProvider servletProvider, RootURL rootURL) { + super(servletProvider, rootURL); } @Override diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgScmProtocolProviderWrapper.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgScmProtocolProviderWrapper.java index 28f80952e2..12b85a1746 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgScmProtocolProviderWrapper.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgScmProtocolProviderWrapper.java @@ -21,25 +21,24 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.web; -import sonia.scm.api.v2.resources.ScmPathInfoStore; -import sonia.scm.config.ScmConfiguration; +import sonia.scm.RootURL; import sonia.scm.plugin.Extension; import sonia.scm.repository.HgRepositoryHandler; import sonia.scm.repository.spi.InitializingHttpScmProtocolWrapper; import javax.inject.Inject; -import javax.inject.Provider; import javax.inject.Singleton; @Singleton @Extension public class HgScmProtocolProviderWrapper extends InitializingHttpScmProtocolWrapper { + @Inject - public HgScmProtocolProviderWrapper(HgCGIServletProvider servletProvider, Provider uriInfoStore, ScmConfiguration scmConfiguration) { - super(servletProvider, uriInfoStore, scmConfiguration); + public HgScmProtocolProviderWrapper(HgCGIServletProvider servletProvider, RootURL rootURL) { + super(servletProvider, rootURL); } @Override diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnScmProtocolProviderWrapper.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnScmProtocolProviderWrapper.java index a8e8857066..fbe71d4bb2 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnScmProtocolProviderWrapper.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnScmProtocolProviderWrapper.java @@ -21,18 +21,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + package sonia.scm.web; -import sonia.scm.api.v2.resources.ScmPathInfoStore; -import sonia.scm.config.ScmConfiguration; +import sonia.scm.RootURL; import sonia.scm.plugin.Extension; import sonia.scm.repository.SvnRepositoryHandler; import sonia.scm.repository.spi.InitializingHttpScmProtocolWrapper; import sonia.scm.repository.spi.ScmProviderHttpServlet; import javax.inject.Inject; -import javax.inject.Provider; import javax.inject.Singleton; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; @@ -45,19 +43,18 @@ public class SvnScmProtocolProviderWrapper extends InitializingHttpScmProtocolWr public static final String PARAMETER_SVN_PARENTPATH = "SVNParentPath"; + @Inject + public SvnScmProtocolProviderWrapper(SvnDAVServletProvider servletProvider, RootURL rootURL) { + super(servletProvider, rootURL); + } + @Override public String getType() { return SvnRepositoryHandler.TYPE_NAME; } - @Inject - public SvnScmProtocolProviderWrapper(SvnDAVServletProvider servletProvider, Provider uriInfoStore, ScmConfiguration scmConfiguration) { - super(servletProvider, uriInfoStore, scmConfiguration); - } - @Override protected void initializeServlet(ServletConfig config, ScmProviderHttpServlet httpServlet) throws ServletException { - super.initializeServlet(new SvnConfigEnhancer(config), httpServlet); }