From 7bf6e183ff8abd0c35eeb29f399da12389562ecb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Moved servlets and services to separate packages
---
src/main/java/com/gitblit/Gitblit.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/gitblit/Gitblit.java b/src/main/java/com/gitblit/Gitblit.java
index 687e4e2..64316bb 100644
--- a/src/main/java/com/gitblit/Gitblit.java
+++ b/src/main/java/com/gitblit/Gitblit.java
@@ -22,8 +22,6 @@
import java.util.Map;
import java.util.TimeZone;
-import javax.inject.Inject;
-import javax.inject.Singleton;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -33,7 +31,6 @@
import com.gitblit.Constants.FederationToken;
import com.gitblit.manager.IFederationManager;
import com.gitblit.manager.IGitblitManager;
-import com.gitblit.manager.IManager;
import com.gitblit.manager.INotificationManager;
import com.gitblit.manager.IProjectManager;
import com.gitblit.manager.IRepositoryManager;
@@ -65,7 +62,6 @@
* @author James Moger
*
*/
-@Singleton
public class Gitblit implements IRuntimeManager,
INotificationManager,
IUserManager,
@@ -87,11 +83,10 @@
private final IProjectManager projectManager;
- private final IFederationManager federationManager;
-
private final IGitblitManager gitblitManager;
- @Inject
+ private final IFederationManager federationManager;
+
public Gitblit(
IRuntimeManager runtimeManager,
INotificationManager notificationManager,
@@ -99,8 +94,8 @@
ISessionManager sessionManager,
IRepositoryManager repositoryManager,
IProjectManager projectManager,
- IFederationManager federationManager,
- IGitblitManager gitblitManager) {
+ IGitblitManager gitblitManager,
+ IFederationManager federationManager) {
this.runtimeManager = runtimeManager;
this.notificationManager = notificationManager;
@@ -108,17 +103,17 @@
this.sessionManager = sessionManager;
this.repositoryManager = repositoryManager;
this.projectManager = projectManager;
- this.federationManager = federationManager;
this.gitblitManager = gitblitManager;
+ this.federationManager = federationManager;
}
@Override
- public IManager setup() {
+ public Gitblit start() {
return this;
}
@Override
- public IManager stop() {
+ public Gitblit stop() {
return this;
}
@@ -348,8 +343,8 @@
}
@Override
- public List<String> getTeamnamesForRepositoryRole(String role) {
- return userManager.getTeamnamesForRepositoryRole(role);
+ public List<String> getTeamNamesForRepositoryRole(String role) {
+ return userManager.getTeamNamesForRepositoryRole(role);
}
@Override
--
Gitblit v1.9.1