diff options
| author | Philipp Thun | 2011-02-09 15:53:43 +0000 |
|---|---|---|
| committer | Chris Aniszczyk | 2011-02-15 19:45:03 +0000 |
| commit | e7bf2593a9168522752241494adcdd005c9cf8d2 (patch) | |
| tree | 50f4ab4f7403adf7f9ed13d8bfc0152531d30be0 | |
| parent | 85763e3b7bd2f99c49abffda85026ac6a0bcefef (diff) | |
| download | egit-e7bf2593a9168522752241494adcdd005c9cf8d2.tar.gz egit-e7bf2593a9168522752241494adcdd005c9cf8d2.tar.xz egit-e7bf2593a9168522752241494adcdd005c9cf8d2.zip | |
Fix SampleTestRepository due to JGit changes
After checking out JGit change 'daemon: Use HTTP's resolver and
factory pattern' (I1efa6b2bd7c6567e983fbbf346947238ea2e847e),
SampleTestRepository does not compile anymore. With this
fix the changed daemon API is used.
Change-Id: I23f2611462d60ae6fef107dab6ea3e08f427b3d6
Signed-off-by: Philipp Thun <philipp.thun@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
| -rw-r--r-- | org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 1 | ||||
| -rw-r--r-- | org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/SampleTestRepository.java | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 435caefa34..7d43adad37 100644 --- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF @@ -19,6 +19,7 @@ Import-Package: org.eclipse.jgit.junit.http;version="[0.12.0,0.13.0)", org.eclipse.jgit.revwalk;version="[0.12.0,0.13.0)", org.eclipse.jgit.storage.file;version="[0.12.0,0.13.0)", org.eclipse.jgit.transport;version="[0.12.0,0.13.0)", + org.eclipse.jgit.transport.resolver;version="[0.12.0,0.13.0)", org.eclipse.jgit.util;version="[0.12.0,0.13.0)", org.eclipse.jgit.api;version="[0.12.0,0.13.0)", org.eclipse.jgit.api.errors;version="[0.12.0,0.13.0)", diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/SampleTestRepository.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/SampleTestRepository.java index d6cc8bd52a..21a6e253c3 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/SampleTestRepository.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/SampleTestRepository.java @@ -22,6 +22,8 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevTag;
import org.eclipse.jgit.storage.file.FileRepository;
import org.eclipse.jgit.transport.Daemon;
+import org.eclipse.jgit.transport.DaemonClient;
+import org.eclipse.jgit.transport.resolver.FileResolver;
import org.eclipse.jgit.util.FileUtils;
/**
@@ -152,7 +154,9 @@ public class SampleTestRepository { private void serve() throws IOException {
d = new Daemon();
- d.exportRepository(REPO_NAME, src.getRepository());
+ FileResolver<DaemonClient> resolver = new FileResolver<DaemonClient>();
+ resolver.exportRepository(REPO_NAME, src.getRepository());
+ d.setRepositoryResolver(resolver);
d.start();
uri = "git://localhost:" + d.getAddress().getPort() + "/" + REPO_NAME
+ Constants.DOT_GIT;
|