Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 08:25:44 +01:00
Code Issues Packages Projects Releases Activity

user guice provider instead of jax-rs context

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-01-30 14:44:47 +01:00
parent 9a7481726a
commit 4392e309d1
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
View File

@@ -43,7 +43,6 @@ import org.slf4j.LoggerFactory;
import sonia.scm.SCMContext; import sonia.scm.SCMContext;
import sonia.scm.ScmState; import sonia.scm.ScmState;
import sonia.scm.Type;
import sonia.scm.repository.RepositoryManager; import sonia.scm.repository.RepositoryManager;
import sonia.scm.user.User; import sonia.scm.user.User;
import sonia.scm.web.security.WebSecurityContext; import sonia.scm.web.security.WebSecurityContext;

12
scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
View File

@@ -59,7 +59,6 @@ import java.util.Collection;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.core.Context;
/** /**
* *
@@ -82,15 +81,18 @@ public class RepositoryResource extends AbstractResource<Repository>
* @param configuration * @param configuration
* @param repositoryManager * @param repositoryManager
* @param securityContextProvider * @param securityContextProvider
* @param requestProvider
*/ */
@Inject @Inject
public RepositoryResource( public RepositoryResource(
ScmConfiguration configuration, RepositoryManager repositoryManager, ScmConfiguration configuration, RepositoryManager repositoryManager,
Provider<WebSecurityContext> securityContextProvider) Provider<WebSecurityContext> securityContextProvider,
Provider<HttpServletRequest> requestProvider)
{ {
this.configuration = configuration; this.configuration = configuration;
this.repositoryManager = repositoryManager; this.repositoryManager = repositoryManager;
this.securityContextProvider = securityContextProvider; this.securityContextProvider = securityContextProvider;
this.requestProvider = requestProvider;
} }
//~--- methods -------------------------------------------------------------- //~--- methods --------------------------------------------------------------
@@ -227,6 +229,7 @@ public class RepositoryResource extends AbstractResource<Repository>
if (handler != null) if (handler != null)
{ {
HttpServletRequest request = requestProvider.get();
StringBuilder url = new StringBuilder(request.getScheme()); StringBuilder url = new StringBuilder(request.getScheme());
url.append("://").append(configuration.getServername()); url.append("://").append(configuration.getServername());
@@ -290,9 +293,8 @@ public class RepositoryResource extends AbstractResource<Repository>
/** Field description */ /** Field description */
private RepositoryManager repositoryManager; private RepositoryManager repositoryManager;
/** TODO path request direct to method */ /** Field description */
@Context private Provider<HttpServletRequest> requestProvider;
private HttpServletRequest request;
/** Field description */ /** Field description */
private Provider<WebSecurityContext> securityContextProvider; private Provider<WebSecurityContext> securityContextProvider;