From aac5e7c070a6b16143e7a184f82e82a81973389e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 21 Feb 2014 10:10:41 -0500
Subject: [PATCH] Add timestamp to the default log4j configuration
---
src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java | 43 +++++++++++++++++--------------------------
1 files changed, 17 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
index 4b8b24f..d7f00c6 100644
--- a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
+++ b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
@@ -18,24 +18,22 @@
import java.io.IOException;
import java.text.MessageFormat;
-import javax.inject.Inject;
-import javax.inject.Singleton;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.gitblit.Constants;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
-import com.gitblit.Keys.fanout;
+import com.gitblit.dagger.DaggerServlet;
+import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.manager.IRepositoryManager;
-import com.gitblit.manager.IRuntimeManager;
-import com.gitblit.manager.ISessionManager;
import com.gitblit.manager.IUserManager;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
+
+import dagger.ObjectGraph;
/**
* Handles requests for Sparkleshare Invites
@@ -43,31 +41,24 @@
* @author James Moger
*
*/
-@Singleton
-public class SparkleShareInviteServlet extends HttpServlet {
+public class SparkleShareInviteServlet extends DaggerServlet {
private static final long serialVersionUID = 1L;
- private final IStoredSettings settings;
+ private IStoredSettings settings;
- private final IUserManager userManager;
+ private IUserManager userManager;
- private final ISessionManager sessionManager;
+ private IAuthenticationManager authenticationManager;
- private final IRepositoryManager repositoryManager;
+ private IRepositoryManager repositoryManager;
- @Inject
- public SparkleShareInviteServlet(
- IRuntimeManager runtimeManager,
- IUserManager userManager,
- ISessionManager sessionManager,
- IRepositoryManager repositoryManager) {
-
- super();
- this.settings = runtimeManager.getSettings();
- this.userManager = userManager;
- this.sessionManager = sessionManager;
- this.repositoryManager = repositoryManager;
+ @Override
+ protected void inject(ObjectGraph dagger) {
+ this.settings = dagger.get(IStoredSettings.class);
+ this.userManager = dagger.get(IUserManager.class);
+ this.authenticationManager = dagger.get(IAuthenticationManager.class);
+ this.repositoryManager = dagger.get(IRepositoryManager.class);
}
@Override
@@ -94,7 +85,7 @@
repoUrl = repoUrl.substring(0, repoUrl.length() - 4);
}
- String servletPath = Constants.GIT_PATH;
+ String servletPath = Constants.R_PATH;
int schemeIndex = repoUrl.indexOf("://") + 3;
String host = repoUrl.substring(0, repoUrl.indexOf('/', schemeIndex));
@@ -106,7 +97,7 @@
}
UserModel user;
if (StringUtils.isEmpty(username)) {
- user = sessionManager.authenticate(request);
+ user = authenticationManager.authenticate(request);
} else {
user = userManager.getUserModel(username);
}
--
Gitblit v1.9.1