From 0d3e3ca5b85d7e81066030a5081ea3a9cbe76607 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 21 Jul 2011 14:48:15 -0400
Subject: [PATCH] Rollback to Jetty 7.4.3 for now.
---
tests/com/gitblit/tests/GitBlitSuite.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/tests/com/gitblit/tests/GitBlitSuite.java b/tests/com/gitblit/tests/GitBlitSuite.java
index c9e383e..bbf7c4b 100644
--- a/tests/com/gitblit/tests/GitBlitSuite.java
+++ b/tests/com/gitblit/tests/GitBlitSuite.java
@@ -24,7 +24,7 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.storage.file.FileRepository;
-import com.gitblit.FileLoginService;
+import com.gitblit.FileUserService;
import com.gitblit.FileSettings;
import com.gitblit.GitBlit;
import com.gitblit.GitBlitException;
@@ -45,6 +45,7 @@
suite.addTestSuite(ByteFormatTest.class);
suite.addTestSuite(MarkdownUtilsTest.class);
suite.addTestSuite(JGitUtilsTest.class);
+ suite.addTestSuite(SyndicationUtilsTest.class);
suite.addTestSuite(DiffUtilsTest.class);
suite.addTestSuite(MetricUtilsTest.class);
suite.addTestSuite(TicgitUtilsTest.class);
@@ -72,8 +73,8 @@
protected void setUp() throws Exception {
FileSettings settings = new FileSettings("distrib/gitblit.properties");
GitBlit.self().configureContext(settings);
- FileLoginService loginService = new FileLoginService(new File("distrib/users.properties"));
- GitBlit.self().setLoginService(loginService);
+ FileUserService loginService = new FileUserService(new File("distrib/users.properties"));
+ GitBlit.self().setUserService(loginService);
if (REPOSITORIES.exists() || REPOSITORIES.mkdirs()) {
cloneOrFetch("helloworld.git", "https://github.com/git/hello-world.git");
@@ -100,7 +101,7 @@
try {
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
model.useTickets = true;
- GitBlit.self().editRepositoryModel(model.name, model, false);
+ GitBlit.self().updateRepositoryModel(model.name, model, false);
} catch (GitBlitException g) {
g.printStackTrace();
}
@@ -110,7 +111,7 @@
try {
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
model.useDocs = true;
- GitBlit.self().editRepositoryModel(model.name, model, false);
+ GitBlit.self().updateRepositoryModel(model.name, model, false);
} catch (GitBlitException g) {
g.printStackTrace();
}
@@ -120,7 +121,7 @@
try {
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
model.showRemoteBranches = true;
- GitBlit.self().editRepositoryModel(model.name, model, false);
+ GitBlit.self().updateRepositoryModel(model.name, model, false);
} catch (GitBlitException g) {
g.printStackTrace();
}
--
Gitblit v1.9.1