diff options
Diffstat (limited to 'src/main/java/com/gitblit/git')
5 files changed, 14 insertions, 14 deletions
diff --git a/src/main/java/com/gitblit/git/GitDaemon.java b/src/main/java/com/gitblit/git/GitDaemon.java index a7e7cd55..7273f387 100644 --- a/src/main/java/com/gitblit/git/GitDaemon.java +++ b/src/main/java/com/gitblit/git/GitDaemon.java @@ -67,7 +67,7 @@ import org.eclipse.jgit.transport.resolver.UploadPackFactory; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitblit.Gitblit;
+import com.gitblit.GitBlit;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.utils.StringUtils;
@@ -108,7 +108,7 @@ public class GitDaemon { private ReceivePackFactory<GitDaemonClient> receivePackFactory;
- public GitDaemon(Gitblit gitblit) {
+ public GitDaemon(GitBlit gitblit) {
IStoredSettings settings = gitblit.getSettings();
int port = settings.getInteger(Keys.git.daemonPort, 0);
diff --git a/src/main/java/com/gitblit/git/GitServlet.java b/src/main/java/com/gitblit/git/GitServlet.java index 35470a29..c5119424 100644 --- a/src/main/java/com/gitblit/git/GitServlet.java +++ b/src/main/java/com/gitblit/git/GitServlet.java @@ -21,7 +21,7 @@ import javax.servlet.ServletConfig; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import com.gitblit.Gitblit;
+import com.gitblit.GitBlit;
/**
* The GitServlet provides http/https access to Git repositories.
@@ -35,10 +35,10 @@ public class GitServlet extends org.eclipse.jgit.http.server.GitServlet { private static final long serialVersionUID = 1L;
- private final Gitblit gitblit;
+ private final GitBlit gitblit;
@Inject
- public GitServlet(Gitblit gitblit) {
+ public GitServlet(GitBlit gitblit) {
super();
this.gitblit = gitblit;
}
diff --git a/src/main/java/com/gitblit/git/GitblitReceivePack.java b/src/main/java/com/gitblit/git/GitblitReceivePack.java index cc1490e6..11b1bda8 100644 --- a/src/main/java/com/gitblit/git/GitblitReceivePack.java +++ b/src/main/java/com/gitblit/git/GitblitReceivePack.java @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; import com.gitblit.Constants;
import com.gitblit.Constants.AccessRestrictionType;
-import com.gitblit.Gitblit;
+import com.gitblit.GitBlit;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.client.Translation;
@@ -91,10 +91,10 @@ public class GitblitReceivePack extends ReceivePack implements PreReceiveHook, P private final IStoredSettings settings;
- private final Gitblit gitblit;
+ private final GitBlit gitblit;
public GitblitReceivePack(
- Gitblit gitblit,
+ GitBlit gitblit,
Repository db,
RepositoryModel repository,
UserModel user) {
diff --git a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java index 71a8e68b..e24d1192 100644 --- a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java +++ b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java @@ -26,7 +26,7 @@ import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.gitblit.Gitblit; +import com.gitblit.GitBlit; import com.gitblit.IStoredSettings; import com.gitblit.Keys; import com.gitblit.models.RepositoryModel; @@ -47,9 +47,9 @@ public class GitblitReceivePackFactory<X> implements ReceivePackFactory<X> { private final IStoredSettings settings; - private final Gitblit gitblit; + private final GitBlit gitblit; - public GitblitReceivePackFactory(Gitblit gitblit) { + public GitblitReceivePackFactory(GitBlit gitblit) { super(); this.settings = gitblit.getSettings(); this.gitblit = gitblit; diff --git a/src/main/java/com/gitblit/git/RepositoryResolver.java b/src/main/java/com/gitblit/git/RepositoryResolver.java index 39d1f396..8615eea1 100644 --- a/src/main/java/com/gitblit/git/RepositoryResolver.java +++ b/src/main/java/com/gitblit/git/RepositoryResolver.java @@ -27,7 +27,7 @@ import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.gitblit.Gitblit; +import com.gitblit.GitBlit; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; @@ -41,9 +41,9 @@ public class RepositoryResolver<X> extends FileResolver<X> { private final Logger logger = LoggerFactory.getLogger(RepositoryResolver.class); - private final Gitblit gitblit; + private final GitBlit gitblit; - public RepositoryResolver(Gitblit gitblit) { + public RepositoryResolver(GitBlit gitblit) { super(gitblit.getRepositoriesFolder(), true); this.gitblit = gitblit; } |