Added Git Daemon support

4 files changed, 372 insertions, 34 deletions

diff --git a/src/test/java/com/gitblit/tests/GitBlitSuite.java b/src/test/java/com/gitblit/tests/GitBlitSuite.java
index 64d792ec..005c39f8 100644
--- a/src/test/java/com/gitblit/tests/GitBlitSuite.java
+++ b/src/test/java/com/gitblit/tests/GitBlitSuite.java
@@ -58,7 +58,7 @@ import com.gitblit.utils.JGitUtils;
 		ObjectCacheTest.class, PermissionsTest.class, UserServiceTest.class, LdapUserServiceTest.class,

 		MarkdownUtilsTest.class, JGitUtilsTest.class, SyndicationUtilsTest.class,

 		DiffUtilsTest.class, MetricUtilsTest.class, TicgitUtilsTest.class, X509UtilsTest.class,

-		GitBlitTest.class, FederationTests.class, RpcTests.class, GitServletTest.class,

+		GitBlitTest.class, FederationTests.class, RpcTests.class, GitServletTest.class, GitDaemonTest.class,

 		GroovyScriptTest.class, LuceneExecutorTest.class, IssuesTest.class, RepositoryModelTest.class,

 		FanoutServiceTest.class })

 public class GitBlitSuite {

@@ -66,9 +66,12 @@ public class GitBlitSuite {
 	public static final File REPOSITORIES = new File("data/git");

 

 	static int port = 8280;

+	static int gitPort = 8300;

 	static int shutdownPort = 8281;

 

 	public static String url = "http://localhost:" + port;

+	public static String gitServletUrl = "http://localhost:" + port + "/git";

+	public static String gitDaemonUrl = "git://localhost:" + gitPort;

 	public static String account = "admin";

 	public static String password = "admin";

 

@@ -115,7 +118,7 @@ public class GitBlitSuite {
 		Executors.newSingleThreadExecutor().execute(new Runnable() {

 			public void run() {

 				GitBlitServer.main("--httpPort", "" + port, "--httpsPort", "0", "--shutdownPort",

-						"" + shutdownPort, "--repositoriesFolder",

+						"" + shutdownPort, "--gitPort", "" + gitPort, "--repositoriesFolder",

 						"\"" + GitBlitSuite.REPOSITORIES.getAbsolutePath() + "\"", "--userService",

 						"test-users.conf", "--settings", "test-gitblit.properties",

 						"--baseFolder", "data");

@@ -166,7 +169,11 @@ public class GitBlitSuite {
 

 	private static void cloneOrFetch(String name, String fromUrl) throws Exception {

 		System.out.print("Fetching " + name + "... ");

-		JGitUtils.cloneRepository(REPOSITORIES, name, fromUrl);

+		try {

+			JGitUtils.cloneRepository(REPOSITORIES, name, fromUrl);

+		} catch (Throwable t) {

+			System.out.println("Error: " + t.getMessage());

+		}

 		System.out.println("done.");

 	}

 

diff --git a/src/test/java/com/gitblit/tests/GitDaemonTest.java b/src/test/java/com/gitblit/tests/GitDaemonTest.java
new file mode 100644
index 00000000..6b181d04
--- /dev/null
+++ b/src/test/java/com/gitblit/tests/GitDaemonTest.java
@@ -0,0 +1,312 @@
+/*
+ * Copyright 2013 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.tests;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.text.MessageFormat;
+import java.util.Date;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.eclipse.jgit.api.CloneCommand;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.transport.PushResult;
+import org.eclipse.jgit.transport.RemoteRefUpdate;
+import org.eclipse.jgit.transport.RemoteRefUpdate.Status;
+import org.eclipse.jgit.util.FileUtils;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.gitblit.Constants.AccessRestrictionType;
+import com.gitblit.Constants.AuthorizationControl;
+import com.gitblit.GitBlit;
+import com.gitblit.models.RepositoryModel;
+
+public class GitDaemonTest extends Assert {
+
+	static File ticgitFolder = new File(GitBlitSuite.REPOSITORIES, "working/ticgit");
+	
+	static File ticgit2Folder = new File(GitBlitSuite.REPOSITORIES, "working/ticgit2");
+
+	static File jgitFolder = new File(GitBlitSuite.REPOSITORIES, "working/jgit");
+	
+	static File jgit2Folder = new File(GitBlitSuite.REPOSITORIES, "working/jgit2");
+
+	String url = GitBlitSuite.gitDaemonUrl;
+
+	private static final AtomicBoolean started = new AtomicBoolean(false);
+
+	@BeforeClass
+	public static void startGitblit() throws Exception {
+		started.set(GitBlitSuite.startGitblit());
+	}
+
+	@AfterClass
+	public static void stopGitblit() throws Exception {
+		if (started.get()) {
+			GitBlitSuite.stopGitblit();
+			deleteWorkingFolders();
+		}
+	}
+
+	public static void deleteWorkingFolders() throws Exception {
+		if (ticgitFolder.exists()) {
+			GitBlitSuite.close(ticgitFolder);
+			FileUtils.delete(ticgitFolder, FileUtils.RECURSIVE);
+		}
+		if (ticgit2Folder.exists()) {
+			GitBlitSuite.close(ticgit2Folder);
+			FileUtils.delete(ticgit2Folder, FileUtils.RECURSIVE);
+		}
+		if (jgitFolder.exists()) {
+			GitBlitSuite.close(jgitFolder);
+			FileUtils.delete(jgitFolder, FileUtils.RECURSIVE);
+		}
+		if (jgit2Folder.exists()) {
+			GitBlitSuite.close(jgit2Folder);
+			FileUtils.delete(jgit2Folder, FileUtils.RECURSIVE);
+		}
+	}
+
+	@Test
+	public void testAnonymousClone() throws Exception {
+		GitBlitSuite.close(ticgitFolder);
+		if (ticgitFolder.exists()) {
+			FileUtils.delete(ticgitFolder, FileUtils.RECURSIVE | FileUtils.RETRY);
+		}
+
+		// set push restriction
+		RepositoryModel model = GitBlit.self().getRepositoryModel("ticgit.git");
+		model.accessRestriction = AccessRestrictionType.PUSH;
+		model.authorizationControl = AuthorizationControl.NAMED;
+		GitBlit.self().updateRepositoryModel(model.name, model, false);
+		
+		CloneCommand clone = Git.cloneRepository();
+		clone.setURI(MessageFormat.format("{0}/ticgit.git", url));
+		clone.setDirectory(ticgitFolder);
+		clone.setBare(false);
+		clone.setCloneAllBranches(true);
+		GitBlitSuite.close(clone.call());		
+		assertTrue(true);
+		
+		// restore anonymous repository access
+		model.accessRestriction = AccessRestrictionType.NONE;
+		model.authorizationControl = AuthorizationControl.NAMED;
+		GitBlit.self().updateRepositoryModel(model.name, model, false);
+	}
+	
+	@Test
+	public void testCloneRestrictedRepo() throws Exception {
+		GitBlitSuite.close(ticgit2Folder);
+		if (ticgit2Folder.exists()) {
+			FileUtils.delete(ticgit2Folder, FileUtils.RECURSIVE);
+		}
+
+		// restrict repository access
+		RepositoryModel model = GitBlit.self().getRepositoryModel("ticgit.git");
+		model.accessRestriction = AccessRestrictionType.CLONE;
+		model.authorizationControl = AuthorizationControl.NAMED;
+		GitBlit.self().updateRepositoryModel(model.name, model, false);
+		
+		// delete any existing working folder		
+		boolean cloned = false;
+		try {
+			CloneCommand clone = Git.cloneRepository();
+			clone.setURI(MessageFormat.format("{0}/ticgit.git", url));
+			clone.setDirectory(ticgit2Folder);
+			clone.setBare(false);
+			clone.setCloneAllBranches(true);
+			GitBlitSuite.close(clone.call());
+			cloned = true;
+		} catch (Exception e) {
+			// swallow the exception which we expect
+		}
+
+		assertFalse("Anonymous was able to clone the repository?!", cloned);
+
+		FileUtils.delete(ticgit2Folder, FileUtils.RECURSIVE);
+		
+		// restore anonymous repository access
+		model.accessRestriction = AccessRestrictionType.NONE;
+		model.authorizationControl = AuthorizationControl.NAMED;
+		GitBlit.self().updateRepositoryModel(model.name, model, false);
+	}
+
+	@Test
+	public void testAnonymousPush() throws Exception {
+		GitBlitSuite.close(ticgitFolder);
+		if (ticgitFolder.exists()) {
+			FileUtils.delete(ticgitFolder, FileUtils.RECURSIVE | FileUtils.RETRY);
+		}
+
+		// restore anonymous repository access
+		RepositoryModel model = GitBlit.self().getRepositoryModel("ticgit.git");
+		model.accessRestriction = AccessRestrictionType.NONE;
+		model.authorizationControl = AuthorizationControl.NAMED;
+		GitBlit.self().updateRepositoryModel(model.name, model, false);
+
+		CloneCommand clone = Git.cloneRepository();
+		clone.setURI(MessageFormat.format("{0}/ticgit.git", url));
+		clone.setDirectory(ticgitFolder);
+		clone.setBare(false);
+		clone.setCloneAllBranches(true);
+		GitBlitSuite.close(clone.call());		
+		assertTrue(true);
+		
+		Git git = Git.open(ticgitFolder);
+		File file = new File(ticgitFolder, "TODO");
+		OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true), Constants.CHARSET);
+		BufferedWriter w = new BufferedWriter(os);
+		w.write("// hellol中文 " + new Date().toString() + "\n");
+		w.close();
+		git.add().addFilepattern(file.getName()).call();
+		git.commit().setMessage("test commit").call();
+		Iterable<PushResult> results = git.push().setPushAll().call();
+		GitBlitSuite.close(git);
+		for (PushResult result : results) {
+			for (RemoteRefUpdate update : result.getRemoteUpdates()) {
+				assertEquals(Status.OK, update.getStatus());
+			}
+		}
+	}
+
+	@Test
+	public void testPushRestrictedRepo() throws Exception {
+		GitBlitSuite.close(ticgitFolder);
+		if (ticgitFolder.exists()) {
+			FileUtils.delete(ticgitFolder, FileUtils.RECURSIVE | FileUtils.RETRY);
+		}
+
+		// restore anonymous repository access
+		RepositoryModel model = GitBlit.self().getRepositoryModel("ticgit.git");
+		model.accessRestriction = AccessRestrictionType.PUSH;
+		model.authorizationControl = AuthorizationControl.NAMED;
+		GitBlit.self().updateRepositoryModel(model.name, model, false);
+
+		CloneCommand clone = Git.cloneRepository();
+		clone.setURI(MessageFormat.format("{0}/ticgit.git", url));
+		clone.setDirectory(ticgitFolder);
+		clone.setBare(false);
+		clone.setCloneAllBranches(true);
+		GitBlitSuite.close(clone.call());		
+		assertTrue(true);
+		
+		Git git = Git.open(ticgitFolder);
+		File file = new File(ticgitFolder, "TODO");
+		OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true), Constants.CHARSET);
+		BufferedWriter w = new BufferedWriter(os);
+		w.write("// hellol中文 " + new Date().toString() + "\n");
+		w.close();
+		git.add().addFilepattern(file.getName()).call();
+		git.commit().setMessage("test commit").call();
+		Iterable<PushResult> results = git.push().setPushAll().call();
+		GitBlitSuite.close(git);
+		for (PushResult result : results) {
+			for (RemoteRefUpdate update : result.getRemoteUpdates()) {
+				assertEquals(Status.REJECTED_OTHER_REASON, update.getStatus());
+			}
+		}
+	}
+
+	@Test
+	public void testPushToFrozenRepo() throws Exception {
+		GitBlitSuite.close(jgitFolder);
+		if (jgitFolder.exists()) {
+			FileUtils.delete(jgitFolder, FileUtils.RECURSIVE | FileUtils.RETRY);
+		}
+		
+		CloneCommand clone = Git.cloneRepository();
+		clone.setURI(MessageFormat.format("{0}/test/jgit.git", url));
+		clone.setDirectory(jgitFolder);
+		clone.setBare(false);
+		clone.setCloneAllBranches(true);
+		GitBlitSuite.close(clone.call());
+		assertTrue(true);
+		
+		// freeze repo
+		RepositoryModel model = GitBlit.self().getRepositoryModel("test/jgit.git");
+		model.isFrozen = true;
+		GitBlit.self().updateRepositoryModel(model.name, model, false);
+
+		Git git = Git.open(jgitFolder);
+		File file = new File(jgitFolder, "TODO");
+		OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true), Constants.CHARSET);
+		BufferedWriter w = new BufferedWriter(os);
+		w.write("// " + new Date().toString() + "\n");
+		w.close();
+		git.add().addFilepattern(file.getName()).call();
+		git.commit().setMessage("test commit").call();
+		
+		Iterable<PushResult> results = git.push().call();
+		for (PushResult result : results) {
+			for (RemoteRefUpdate update : result.getRemoteUpdates()) {
+				assertEquals(Status.REJECTED_OTHER_REASON, update.getStatus());
+			}
+		}
+	
+		// unfreeze repo
+		model.isFrozen = false;
+		GitBlit.self().updateRepositoryModel(model.name, model, false);
+
+		results = git.push().setPushAll().call();
+		GitBlitSuite.close(git);
+		for (PushResult result : results) {
+			for (RemoteRefUpdate update : result.getRemoteUpdates()) {
+				assertEquals(Status.OK, update.getStatus());
+			}
+		}
+	}
+	
+	@Test
+	public void testPushToNonBareRepository() throws Exception {
+		GitBlitSuite.close(jgit2Folder);
+		if (jgit2Folder.exists()) {
+			FileUtils.delete(jgit2Folder, FileUtils.RECURSIVE | FileUtils.RETRY);
+		}
+		
+		CloneCommand clone = Git.cloneRepository();
+		clone.setURI(MessageFormat.format("{0}/working/jgit", url));
+		clone.setDirectory(jgit2Folder);
+		clone.setBare(false);
+		clone.setCloneAllBranches(true);
+		GitBlitSuite.close(clone.call());
+		assertTrue(true);
+
+		Git git = Git.open(jgit2Folder);
+		File file = new File(jgit2Folder, "NONBARE");
+		OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true), Constants.CHARSET);
+		BufferedWriter w = new BufferedWriter(os);
+		w.write("// " + new Date().toString() + "\n");
+		w.close();
+		git.add().addFilepattern(file.getName()).call();
+		git.commit().setMessage("test commit followed by push to non-bare repository").call();
+
+		Iterable<PushResult> results = git.push().setPushAll().call();
+		GitBlitSuite.close(git);
+		
+		for (PushResult result : results) {
+			for (RemoteRefUpdate update : result.getRemoteUpdates()) {
+				assertEquals(Status.REJECTED_OTHER_REASON, update.getStatus());
+			}
+		}
+	}
+
+}
diff --git a/src/test/java/com/gitblit/tests/GitServletTest.java b/src/test/java/com/gitblit/tests/GitServletTest.java
index 8d1fa104..2402ab35 100644
--- a/src/test/java/com/gitblit/tests/GitServletTest.java
+++ b/src/test/java/com/gitblit/tests/GitServletTest.java
@@ -54,7 +54,7 @@ public class GitServletTest {
 	

 	static File jgit2Folder = new File(GitBlitSuite.REPOSITORIES, "working/jgit2");

 

-	String url = GitBlitSuite.url;

+	String url = GitBlitSuite.gitServletUrl;

 	String account = GitBlitSuite.account;

 	String password = GitBlitSuite.password;

 

@@ -100,7 +100,7 @@ public class GitServletTest {
 		}

 		

 		CloneCommand clone = Git.cloneRepository();

-		clone.setURI(MessageFormat.format("{0}/git/ticgit.git", url));

+		clone.setURI(MessageFormat.format("{0}/ticgit.git", url));

 		clone.setDirectory(ticgitFolder);

 		clone.setBare(false);

 		clone.setCloneAllBranches(true);

@@ -120,7 +120,7 @@ public class GitServletTest {
 		boolean cloned = false;

 		try {

 			CloneCommand clone = Git.cloneRepository();

-			clone.setURI(MessageFormat.format("{0}/git/ticgit.git", url));

+			clone.setURI(MessageFormat.format("{0}/ticgit.git", url));

 			clone.setDirectory(ticgit2Folder);

 			clone.setBare(false);

 			clone.setCloneAllBranches(true);

@@ -155,7 +155,7 @@ public class GitServletTest {
 		boolean cloned = false;

 		try {

 			CloneCommand clone = Git.cloneRepository();

-			clone.setURI(MessageFormat.format("{0}/git/ticgit.git", url));

+			clone.setURI(MessageFormat.format("{0}/ticgit.git", url));

 			clone.setDirectory(ticgit2Folder);

 			clone.setBare(false);

 			clone.setCloneAllBranches(true);

@@ -177,7 +177,7 @@ public class GitServletTest {
 		// try clone again

 		cloned = false;

 		CloneCommand clone = Git.cloneRepository();

-		clone.setURI(MessageFormat.format("{0}/git/ticgit.git", url));

+		clone.setURI(MessageFormat.format("{0}/ticgit.git", url));

 		clone.setDirectory(ticgit2Folder);

 		clone.setBare(false);

 		clone.setCloneAllBranches(true);

@@ -203,8 +203,12 @@ public class GitServletTest {
 			FileUtils.delete(ticgitFolder, FileUtils.RECURSIVE | FileUtils.RETRY);

 		}

 

+		RepositoryModel model = GitBlit.self().getRepositoryModel("ticgit.git");

+		model.accessRestriction = AccessRestrictionType.NONE;

+		GitBlit.self().updateRepositoryModel(model.name, model, false);

+

 		CloneCommand clone = Git.cloneRepository();

-		clone.setURI(MessageFormat.format("{0}/git/ticgit.git", url));

+		clone.setURI(MessageFormat.format("{0}/ticgit.git", url));

 		clone.setDirectory(ticgitFolder);

 		clone.setBare(false);

 		clone.setCloneAllBranches(true);

@@ -220,8 +224,13 @@ public class GitServletTest {
 		w.close();

 		git.add().addFilepattern(file.getName()).call();

 		git.commit().setMessage("test commit").call();

-		git.push().setPushAll().call();

+		Iterable<PushResult> results = git.push().setPushAll().call();

 		GitBlitSuite.close(git);

+		for (PushResult result : results) {

+			for (RemoteRefUpdate update : result.getRemoteUpdates()) {

+				assertEquals(Status.OK, update.getStatus());

+			}

+		}

 	}

 

 	@Test

@@ -232,7 +241,7 @@ public class GitServletTest {
 		}

 		

 		CloneCommand clone = Git.cloneRepository();

-		clone.setURI(MessageFormat.format("{0}/git/test/jgit.git", url));

+		clone.setURI(MessageFormat.format("{0}/test/jgit.git", url));

 		clone.setDirectory(jgitFolder);

 		clone.setBare(false);

 		clone.setCloneAllBranches(true);

@@ -248,8 +257,13 @@ public class GitServletTest {
 		w.close();

 		git.add().addFilepattern(file.getName()).call();

 		git.commit().setMessage("test commit").call();

-		git.push().setPushAll().setCredentialsProvider(new UsernamePasswordCredentialsProvider(account, password)).call();

+		Iterable<PushResult> results = git.push().setPushAll().setCredentialsProvider(new UsernamePasswordCredentialsProvider(account, password)).call();

 		GitBlitSuite.close(git);

+		for (PushResult result : results) {

+			for (RemoteRefUpdate update : result.getRemoteUpdates()) {

+				assertEquals(Status.OK, update.getStatus());

+			}

+		}

 	}

 	

 	@Test

@@ -260,7 +274,7 @@ public class GitServletTest {
 		}

 		

 		CloneCommand clone = Git.cloneRepository();

-		clone.setURI(MessageFormat.format("{0}/git/test/jgit.git", url));

+		clone.setURI(MessageFormat.format("{0}/test/jgit.git", url));

 		clone.setDirectory(jgitFolder);

 		clone.setBare(false);

 		clone.setCloneAllBranches(true);

@@ -282,25 +296,30 @@ public class GitServletTest {
 		git.add().addFilepattern(file.getName()).call();

 		git.commit().setMessage("test commit").call();

 		

-		try {

-			git.push().setPushAll().setCredentialsProvider(new UsernamePasswordCredentialsProvider(account, password)).call();

-			assertTrue(false);

-		} catch (Exception e) {

-			assertTrue(e.getCause().getMessage().contains("access forbidden"));

+		Iterable<PushResult> results = git.push().setPushAll().setCredentialsProvider(new UsernamePasswordCredentialsProvider(account, password)).call();

+		for (PushResult result : results) {

+			for (RemoteRefUpdate update : result.getRemoteUpdates()) {

+				assertEquals(Status.REJECTED_OTHER_REASON, update.getStatus());

+			}

 		}

 		

 		// unfreeze repo

 		model.isFrozen = false;

 		GitBlit.self().updateRepositoryModel(model.name, model, false);

 

-		git.push().setPushAll().setCredentialsProvider(new UsernamePasswordCredentialsProvider(account, password)).call();

+		results = git.push().setPushAll().setCredentialsProvider(new UsernamePasswordCredentialsProvider(account, password)).call();

 		GitBlitSuite.close(git);

+		for (PushResult result : results) {

+			for (RemoteRefUpdate update : result.getRemoteUpdates()) {

+				assertEquals(Status.OK, update.getStatus());

+			}

+		}

 	}

 	

 	@Test

 	public void testPushToNonBareRepository() throws Exception {

 		CloneCommand clone = Git.cloneRepository();

-		clone.setURI(MessageFormat.format("{0}/git/working/jgit", url));

+		clone.setURI(MessageFormat.format("{0}/working/jgit", url));

 		clone.setDirectory(jgit2Folder);

 		clone.setBare(false);

 		clone.setCloneAllBranches(true);

@@ -316,13 +335,13 @@ public class GitServletTest {
 		w.close();

 		git.add().addFilepattern(file.getName()).call();

 		git.commit().setMessage("test commit followed by push to non-bare repository").call();

-		try {

-			git.push().setPushAll().setCredentialsProvider(new UsernamePasswordCredentialsProvider(account, password)).call();

-			assertTrue(false);

-		} catch (Exception e) {

-			assertTrue(e.getCause().getMessage().contains("git-receive-pack not permitted"));

-		}

+		Iterable<PushResult> results = git.push().setPushAll().setCredentialsProvider(new UsernamePasswordCredentialsProvider(account, password)).call();

 		GitBlitSuite.close(git);

+		for (PushResult result : results) {

+			for (RemoteRefUpdate update : result.getRemoteUpdates()) {

+				assertEquals(Status.REJECTED_OTHER_REASON, update.getStatus());

+			}

+		}

 	}

 

 	@Test

@@ -367,7 +386,7 @@ public class GitServletTest {
 			FileUtils.delete(verification, FileUtils.RECURSIVE);

 		}

 		CloneCommand clone = Git.cloneRepository();

-		clone.setURI(MessageFormat.format("{0}/git/ticgit.git", url));

+		clone.setURI(MessageFormat.format("{0}/ticgit.git", url));

 		clone.setDirectory(verification);

 		clone.setBare(true);

 		clone.setCloneAllBranches(true);

@@ -392,7 +411,7 @@ public class GitServletTest {
 			FileUtils.delete(local, FileUtils.RECURSIVE);

 		}

 		clone = Git.cloneRepository();

-		clone.setURI(MessageFormat.format("{0}/git/{1}", url, model.name));

+		clone.setURI(MessageFormat.format("{0}/{1}", url, model.name));

 		clone.setDirectory(local);

 		clone.setBare(false);

 		clone.setCloneAllBranches(true);

@@ -478,7 +497,7 @@ public class GitServletTest {
 			FileUtils.delete(refChecks, FileUtils.RECURSIVE);

 		}

 		CloneCommand clone = Git.cloneRepository();

-		clone.setURI(MessageFormat.format("{0}/git/ticgit.git", url));

+		clone.setURI(MessageFormat.format("{0}/ticgit.git", url));

 		clone.setDirectory(refChecks);

 		clone.setBare(true);

 		clone.setCloneAllBranches(true);

@@ -511,7 +530,7 @@ public class GitServletTest {
 			FileUtils.delete(local, FileUtils.RECURSIVE);

 		}

 		clone = Git.cloneRepository();

-		clone.setURI(MessageFormat.format("{0}/git/{1}", url, model.name));

+		clone.setURI(MessageFormat.format("{0}/{1}", url, model.name));

 		clone.setDirectory(local);

 		clone.setBare(false);

 		clone.setCloneAllBranches(true);

@@ -698,7 +717,7 @@ public class GitServletTest {
 		}

 

 		CloneCommand clone = Git.cloneRepository();

-		clone.setURI(MessageFormat.format("{0}/git/ticgit.git", url));

+		clone.setURI(MessageFormat.format("{0}/ticgit.git", url));

 		clone.setDirectory(createCheck);

 		clone.setBare(true);

 		clone.setCloneAllBranches(true);

@@ -708,8 +727,8 @@ public class GitServletTest {
 		GitBlitSuite.close(personalRepo);

 		

 		// add a personal repository remote and a project remote

-		git.getRepository().getConfig().setString("remote", "user", "url", MessageFormat.format("{0}/git/~{1}/ticgit.git", url, user.username));

-		git.getRepository().getConfig().setString("remote", "project", "url", MessageFormat.format("{0}/git/project/ticgit.git", url));

+		git.getRepository().getConfig().setString("remote", "user", "url", MessageFormat.format("{0}/~{1}/ticgit.git", url, user.username));

+		git.getRepository().getConfig().setString("remote", "project", "url", MessageFormat.format("{0}/project/ticgit.git", url));

 		git.getRepository().getConfig().save();

 

 		// push to non-existent user repository

diff --git a/src/test/java/de/akquinet/devops/GitBlit4UITests.java b/src/test/java/de/akquinet/devops/GitBlit4UITests.java
index 130f2c96..966d72b1 100644
--- a/src/test/java/de/akquinet/devops/GitBlit4UITests.java
+++ b/src/test/java/de/akquinet/devops/GitBlit4UITests.java
@@ -13,7 +13,7 @@ public class GitBlit4UITests extends GitBlit {
 	}
 
 	@Override
-	protected void enableLuceneIndexing() {
+	protected void configureLuceneIndexing() {
 		if (luceneIndexingEnabled) {
 			getScheduledExecutor().scheduleAtFixedRate(getLuceneExecutor(), 1,
 					2, TimeUnit.MINUTES);