From b5b4026628c50ffdfa3ceeb93badb613cdca18eb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 03 May 2011 15:59:20 -0400
Subject: [PATCH] Drop new lines between table rows for Opera.
---
src/com/gitblit/GitBlit.java | 165 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 121 insertions(+), 44 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 2764143..32ee73c 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -1,20 +1,21 @@
package com.gitblit;
import java.io.File;
+import java.io.IOException;
+import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.wicket.Request;
import org.apache.wicket.protocol.http.WebResponse;
-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
-import org.eclipse.jgit.http.server.resolver.FileResolver;
-import org.eclipse.jgit.http.server.resolver.ServiceNotEnabledException;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.StoredConfig;
+import org.eclipse.jgit.transport.resolver.FileResolver;
+import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -22,38 +23,43 @@
import com.gitblit.wicket.User;
import com.gitblit.wicket.models.RepositoryModel;
-public class GitBlit {
+public class GitBlit implements ServletContextListener {
- private static GitBlit gitblit;
+ private final static GitBlit gitblit;
private final Logger logger = LoggerFactory.getLogger(GitBlit.class);
- private final boolean debugMode;
+ private FileResolver<Void> repositoryResolver;
- private final FileResolver repositoryResolver;
+ private File repositoriesFolder;
- private final File repositories;
-
- private final boolean exportAll;
+ private boolean exportAll;
private ILoginService loginService;
+ private IStoredSettings storedSettings;
+
+ static {
+ gitblit = new GitBlit();
+ }
+
public static GitBlit self() {
- if (gitblit == null) {
- gitblit = new GitBlit();
- }
return gitblit;
}
private GitBlit() {
- repositories = new File(StoredSettings.getString("repositoriesFolder", "repos"));
- exportAll = StoredSettings.getBoolean("exportAll", true);
- repositoryResolver = new FileResolver(repositories, exportAll);
- debugMode = StoredSettings.getBoolean("debugMode", false);
}
-
+
+ public IStoredSettings settings() {
+ return storedSettings;
+ }
+
public boolean isDebugMode() {
- return debugMode;
+ return storedSettings.getBoolean(Keys.web.debugMode, false);
+ }
+
+ public String getCloneUrl(String repositoryName) {
+ return storedSettings.getString(Keys.git.cloneUrl, "https://localhost/git/") + repositoryName;
}
public void setLoginService(ILoginService loginService) {
@@ -90,38 +96,109 @@
}
public List<String> getRepositoryList() {
- return JGitUtils.getRepositoryList(repositories, exportAll, StoredSettings.getBoolean("nestedRepositories", true));
+ return JGitUtils.getRepositoryList(repositoriesFolder, exportAll, storedSettings.getBoolean(Keys.git.nestedRepositories, true));
}
- public List<RepositoryModel> getRepositories(Request request) {
- List<String> list = getRepositoryList();
- ServletWebRequest servletWebRequest = (ServletWebRequest) request;
- HttpServletRequest req = servletWebRequest.getHttpServletRequest();
-
- List<RepositoryModel> repositories = new ArrayList<RepositoryModel>();
- for (String repo : list) {
- Repository r = getRepository(req, repo);
- String description = JGitUtils.getRepositoryDescription(r);
- String owner = JGitUtils.getRepositoryOwner(r);
- Date lastchange = JGitUtils.getLastChange(r);
- r.close();
- repositories.add(new RepositoryModel(repo, description, owner, lastchange));
- }
- return repositories;
- }
-
- public Repository getRepository(HttpServletRequest req, String repositoryName) {
+ public Repository getRepository(String repositoryName) {
Repository r = null;
try {
- r = repositoryResolver.open(req, repositoryName);
+ r = repositoryResolver.open(null, repositoryName);
} catch (RepositoryNotFoundException e) {
r = null;
- logger.error("Failed to find repository " + repositoryName);
- e.printStackTrace();
+ logger.error("GitBlit.getRepository(String) failed to find repository " + repositoryName);
} catch (ServiceNotEnabledException e) {
r = null;
e.printStackTrace();
}
return r;
}
+
+ public List<RepositoryModel> getRepositoryModels() {
+ List<String> list = getRepositoryList();
+ List<RepositoryModel> repositories = new ArrayList<RepositoryModel>();
+ for (String repo : list) {
+ RepositoryModel model = getRepositoryModel(repo);
+ repositories.add(model);
+ }
+ return repositories;
+ }
+
+ public RepositoryModel getRepositoryModel(String repositoryName) {
+ Repository r = getRepository(repositoryName);
+ RepositoryModel model = new RepositoryModel();
+ model.name = repositoryName;
+ model.hasCommits = JGitUtils.hasCommits(r);
+ model.lastChange = JGitUtils.getLastChange(r);
+ StoredConfig config = JGitUtils.readConfig(r);
+ if (config != null) {
+ model.description = config.getString("gitblit", null, "description");
+ model.owner = config.getString("gitblit", null, "owner");
+ model.group = config.getString("gitblit", null, "group");
+ model.useTickets = config.getBoolean("gitblit", "useTickets", false);
+ model.useDocs = config.getBoolean("gitblit", "useDocs", false);
+ model.useRestrictedAccess = config.getBoolean("gitblit", "restrictedAccess", false);
+ }
+ r.close();
+ return model;
+ }
+
+ public void editRepositoryModel(RepositoryModel repository, boolean isCreate) throws GitBlitException {
+ Repository r = null;
+ if (isCreate) {
+ if (new File(repositoriesFolder, repository.name).exists()) {
+ throw new GitBlitException(MessageFormat.format("Can not create repository {0} because it already exists.", repository.name));
+ }
+ // create repository
+ logger.info("create repository " + repository.name);
+ r = JGitUtils.createRepository(repositoriesFolder, repository.name, true);
+ } else {
+ // load repository
+ logger.info("edit repository " + repository.name);
+ try {
+ r = repositoryResolver.open(null, repository.name);
+ } catch (RepositoryNotFoundException e) {
+ logger.error("Repository not found", e);
+ } catch (ServiceNotEnabledException e) {
+ logger.error("Service not enabled", e);
+ }
+ }
+
+ // update settings
+ StoredConfig config = JGitUtils.readConfig(r);
+ config.setString("gitblit", null, "description", repository.description);
+ config.setString("gitblit", null, "owner", repository.owner);
+ config.setBoolean("gitblit", null, "useTickets", repository.useTickets);
+ config.setBoolean("gitblit", null, "useDocs", repository.useDocs);
+ config.setBoolean("gitblit", null, "restrictedAccess", repository.useRestrictedAccess);
+ try {
+ config.save();
+ } catch (IOException e) {
+ logger.error("Failed to save repository config!", e);
+ }
+ r.close();
+ }
+
+ public void setupContext(IStoredSettings settings) {
+ logger.info("Setting up GitBlit context from " + settings.toString());
+ this.storedSettings = settings;
+ repositoriesFolder = new File(settings.getString(Keys.git.repositoriesFolder, "repos"));
+ exportAll = settings.getBoolean(Keys.git.exportAll, true);
+ repositoryResolver = new FileResolver<Void>(repositoriesFolder, exportAll);
+ }
+
+ @Override
+ public void contextInitialized(ServletContextEvent contextEvent) {
+ logger.info("GitBlit context initialization by servlet container...");
+ if (storedSettings == null) {
+ WebXmlSettings webxmlSettings = new WebXmlSettings(contextEvent.getServletContext());
+ setupContext(webxmlSettings);
+ } else {
+ logger.info("GitBlit context already setup by " + storedSettings.toString());
+ }
+ }
+
+ @Override
+ public void contextDestroyed(ServletContextEvent contextEvent) {
+ logger.info("GitBlit context destroyed by servlet container.");
+ }
}
--
Gitblit v1.9.1