From d65a6baca9a20461f976a2455d70eecc7faf2db5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 26 Nov 2013 16:07:04 -0500
Subject: [PATCH] Update to Jetty 8.1.13 for Servlet 3
---
src/test/java/com/gitblit/tests/GitBlitSuite.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/GitBlitSuite.java b/src/test/java/com/gitblit/tests/GitBlitSuite.java
index 239f523..f623032 100644
--- a/src/test/java/com/gitblit/tests/GitBlitSuite.java
+++ b/src/test/java/com/gitblit/tests/GitBlitSuite.java
@@ -36,6 +36,7 @@
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.utils.JGitUtils;
@@ -98,11 +99,6 @@
return getRepository("test/ambition.git");
}
- public static Repository getIssuesTestRepository() throws Exception {
- JGitUtils.createRepository(REPOSITORIES, "gb-issues.git").close();
- return getRepository("gb-issues.git");
- }
-
public static Repository getGitectiveRepository() throws Exception {
return getRepository("test/gitective.git");
}
@@ -160,7 +156,6 @@
cloneOrFetch("test/ambition.git", "https://github.com/defunkt/ambition.git");
cloneOrFetch("test/gitective.git", "https://github.com/kevinsawicki/gitective.git");
- enableDocs("ticgit.git");
showRemoteBranches("ticgit.git");
automaticallyTagBranchTips("ticgit.git");
showRemoteBranches("test/jgit.git");
@@ -183,21 +178,12 @@
System.out.println("done.");
}
- private static void enableDocs(String repositoryName) {
- try {
- RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
- model.useDocs = true;
- GitBlit.self().updateRepositoryModel(model.name, model, false);
- } catch (GitBlitException g) {
- g.printStackTrace();
- }
- }
-
private static void showRemoteBranches(String repositoryName) {
try {
- RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
+ IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);
+ RepositoryModel model = repositoryManager.getRepositoryModel(repositoryName);
model.showRemoteBranches = true;
- GitBlit.self().updateRepositoryModel(model.name, model, false);
+ repositoryManager.updateRepositoryModel(model.name, model, false);
} catch (GitBlitException g) {
g.printStackTrace();
}
@@ -205,9 +191,10 @@
private static void automaticallyTagBranchTips(String repositoryName) {
try {
- RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
+ IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);
+ RepositoryModel model = repositoryManager.getRepositoryModel(repositoryName);
model.useIncrementalPushTags = true;
- GitBlit.self().updateRepositoryModel(model.name, model, false);
+ repositoryManager.updateRepositoryModel(model.name, model, false);
} catch (GitBlitException g) {
g.printStackTrace();
}
--
Gitblit v1.9.1