Moved servlets and services to separate packages

Change-Id: I5f0f50f4ae7d332e9f724a2e6f074fa71f646035

6 files changed, 22 insertions, 22 deletions

diff --git a/src/test/java/com/gitblit/tests/GitBlitSuite.java b/src/test/java/com/gitblit/tests/GitBlitSuite.java
index f623032c..57e94e51 100644
--- a/src/test/java/com/gitblit/tests/GitBlitSuite.java
+++ b/src/test/java/com/gitblit/tests/GitBlitSuite.java
@@ -33,11 +33,11 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;

 import org.junit.runners.Suite.SuiteClasses;

 

-import com.gitblit.GitBlit;

 import com.gitblit.GitBlitException;

 import com.gitblit.GitBlitServer;

 import com.gitblit.manager.IRepositoryManager;

 import com.gitblit.models.RepositoryModel;

+import com.gitblit.servlet.GitblitContext;

 import com.gitblit.utils.JGitUtils;

 

 /**

@@ -180,7 +180,7 @@ public class GitBlitSuite {
 

 	private static void showRemoteBranches(String repositoryName) {

 		try {

-			IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);

+			IRepositoryManager repositoryManager = GitblitContext.getManager(IRepositoryManager.class);

 			RepositoryModel model = repositoryManager.getRepositoryModel(repositoryName);

 			model.showRemoteBranches = true;

 			repositoryManager.updateRepositoryModel(model.name, model, false);

@@ -191,7 +191,7 @@ public class GitBlitSuite {
 

 	private static void automaticallyTagBranchTips(String repositoryName) {

 		try {

-			IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);

+			IRepositoryManager repositoryManager = GitblitContext.getManager(IRepositoryManager.class);

 			RepositoryModel model = repositoryManager.getRepositoryModel(repositoryName);

 			model.useIncrementalPushTags = true;

 			repositoryManager.updateRepositoryModel(model.name, model, false);

diff --git a/src/test/java/com/gitblit/tests/GitblitUnitTest.java b/src/test/java/com/gitblit/tests/GitblitUnitTest.java
index fc70e107..500e9b9f 100644
--- a/src/test/java/com/gitblit/tests/GitblitUnitTest.java
+++ b/src/test/java/com/gitblit/tests/GitblitUnitTest.java
@@ -15,7 +15,6 @@
  */
 package com.gitblit.tests;
 
-import com.gitblit.GitBlit;
 import com.gitblit.IStoredSettings;
 import com.gitblit.manager.IFederationManager;
 import com.gitblit.manager.IGitblitManager;
@@ -25,6 +24,7 @@ import com.gitblit.manager.IRepositoryManager;
 import com.gitblit.manager.IRuntimeManager;
 import com.gitblit.manager.ISessionManager;
 import com.gitblit.manager.IUserManager;
+import com.gitblit.servlet.GitblitContext;
 
 
 public class GitblitUnitTest extends org.junit.Assert {
@@ -34,34 +34,34 @@ public class GitblitUnitTest extends org.junit.Assert {
 	}
 
 	public static IRuntimeManager runtime() {
-		return GitBlit.getManager(IRuntimeManager.class);
+		return GitblitContext.getManager(IRuntimeManager.class);
 	}
 
 	public static INotificationManager notifier() {
-		return GitBlit.getManager(INotificationManager.class);
+		return GitblitContext.getManager(INotificationManager.class);
 	}
 
 	public static IUserManager users() {
-		return GitBlit.getManager(IUserManager.class);
+		return GitblitContext.getManager(IUserManager.class);
 	}
 
 	public static ISessionManager session() {
-		return GitBlit.getManager(ISessionManager.class);
+		return GitblitContext.getManager(ISessionManager.class);
 	}
 
 	public static IRepositoryManager repositories() {
-		return GitBlit.getManager(IRepositoryManager.class);
+		return GitblitContext.getManager(IRepositoryManager.class);
 	}
 
 	public static IProjectManager projects() {
-		return GitBlit.getManager(IProjectManager.class);
+		return GitblitContext.getManager(IProjectManager.class);
 	}
 
 	public static IFederationManager federation() {
-		return GitBlit.getManager(IFederationManager.class);
+		return GitblitContext.getManager(IFederationManager.class);
 	}
 
 	public static IGitblitManager gitblit() {
-		return GitBlit.getManager(IGitblitManager.class);
+		return GitblitContext.getManager(IGitblitManager.class);
 	}
 }
diff --git a/src/test/java/com/gitblit/tests/LuceneExecutorTest.java b/src/test/java/com/gitblit/tests/LuceneExecutorTest.java
index 4041a060..8ffe8469 100644
--- a/src/test/java/com/gitblit/tests/LuceneExecutorTest.java
+++ b/src/test/java/com/gitblit/tests/LuceneExecutorTest.java
@@ -24,13 +24,13 @@ import org.junit.Before;
 import org.junit.Test;

 

 import com.gitblit.Keys;

-import com.gitblit.LuceneExecutor;

 import com.gitblit.manager.RepositoryManager;

 import com.gitblit.manager.RuntimeManager;

 import com.gitblit.manager.UserManager;

 import com.gitblit.models.RefModel;

 import com.gitblit.models.RepositoryModel;

 import com.gitblit.models.SearchResult;

+import com.gitblit.service.LuceneService;

 import com.gitblit.tests.mock.MemorySettings;

 import com.gitblit.utils.FileUtils;

 import com.gitblit.utils.JGitUtils;

@@ -43,15 +43,15 @@ import com.gitblit.utils.JGitUtils;
  */

 public class LuceneExecutorTest extends GitblitUnitTest {

 

-	LuceneExecutor lucene;

+	LuceneService lucene;

 

-	private LuceneExecutor newLuceneExecutor() {

+	private LuceneService newLuceneExecutor() {

 		MemorySettings settings = new MemorySettings();

 		settings.put(Keys.git.repositoriesFolder, GitBlitSuite.REPOSITORIES);

 		RuntimeManager runtime = new RuntimeManager(settings);

 		UserManager users = new UserManager(runtime);

 		RepositoryManager repos = new RepositoryManager(runtime, users);

-		return new LuceneExecutor(settings, repos);

+		return new LuceneService(settings, repos);

 	}

 

 	private RepositoryModel newRepositoryModel(Repository repository) {

diff --git a/src/test/java/com/gitblit/tests/MailTest.java b/src/test/java/com/gitblit/tests/MailTest.java
index 7598568b..df09ca59 100644
--- a/src/test/java/com/gitblit/tests/MailTest.java
+++ b/src/test/java/com/gitblit/tests/MailTest.java
@@ -21,14 +21,14 @@ import org.junit.Test;
 

 import com.gitblit.FileSettings;

 import com.gitblit.Keys;

-import com.gitblit.MailExecutor;

+import com.gitblit.service.MailService;

 

 public class MailTest extends GitblitUnitTest {

 

 	@Test

 	public void testSendMail() throws Exception {

 		FileSettings settings = new FileSettings("mailtest.properties");

-		MailExecutor mail = new MailExecutor(settings);

+		MailService mail = new MailService(settings);

 		Message message = mail.createMessage(settings.getStrings(Keys.mail.adminAddresses));

 		message.setSubject("Test");

 		message.setText("Lägger till andra stycket i ny fil. UTF-8 encoded");

diff --git a/src/test/java/com/gitblit/tests/RpcTests.java b/src/test/java/com/gitblit/tests/RpcTests.java
index 33e8505e..e1ba9072 100644
--- a/src/test/java/com/gitblit/tests/RpcTests.java
+++ b/src/test/java/com/gitblit/tests/RpcTests.java
@@ -35,7 +35,6 @@ import com.gitblit.Constants.RegistrantType;
 import com.gitblit.GitBlitException.NotAllowedException;

 import com.gitblit.GitBlitException.UnauthorizedException;

 import com.gitblit.Keys;

-import com.gitblit.RpcServlet;

 import com.gitblit.models.FederationModel;

 import com.gitblit.models.FederationProposal;

 import com.gitblit.models.FederationSet;

@@ -45,6 +44,7 @@ import com.gitblit.models.ServerSettings;
 import com.gitblit.models.ServerStatus;

 import com.gitblit.models.TeamModel;

 import com.gitblit.models.UserModel;

+import com.gitblit.servlet.RpcServlet;

 import com.gitblit.utils.RpcUtils;

 

 /**

diff --git a/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java b/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java
index 6ee98a03..5e361b99 100644
--- a/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java
+++ b/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java
@@ -6,10 +6,10 @@ import java.util.List;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.ParameterException;
-import com.gitblit.GitBlit;
 import com.gitblit.GitBlitServer;
 import com.gitblit.IStoredSettings;
 import com.gitblit.Keys;
+import com.gitblit.servlet.GitblitContext;
 
 public class GitBlitServer4UITests extends GitBlitServer {
 
@@ -54,8 +54,8 @@ public class GitBlitServer4UITests extends GitBlitServer {
 	}
 
 	@Override
-	protected GitBlit newGitblit(IStoredSettings settings, File baseFolder) {
+	protected GitblitContext newGitblit(IStoredSettings settings, File baseFolder) {
 		settings.overrideSetting(Keys.web.allowLuceneIndexing, false);
-		return new GitBlit(settings, baseFolder);
+		return new GitblitContext(settings, baseFolder);
 	}
 }