From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/manager/IGitblit.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/IGitblit.java b/src/main/java/com/gitblit/manager/IGitblit.java
index 50210e9..489de62 100644
--- a/src/main/java/com/gitblit/manager/IGitblit.java
+++ b/src/main/java/com/gitblit/manager/IGitblit.java
@@ -16,36 +16,25 @@
package com.gitblit.manager;
import java.util.Collection;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
import com.gitblit.GitBlitException;
import com.gitblit.models.GitClientApplication;
import com.gitblit.models.RepositoryModel;
-import com.gitblit.models.RepositoryUrl;
import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
import com.gitblit.tickets.ITicketService;
+import com.gitblit.transport.ssh.IPublicKeyManager;
public interface IGitblit extends IManager,
IRuntimeManager,
+ IPluginManager,
INotificationManager,
IUserManager,
IAuthenticationManager,
IRepositoryManager,
IProjectManager,
- IFederationManager {
-
- /**
- * Returns a list of repository URLs and the user access permission.
- *
- * @param request
- * @param user
- * @param repository
- * @return a list of repository urls
- */
- List<RepositoryUrl> getRepositoryUrls(HttpServletRequest request, UserModel user, RepositoryModel repository);
+ IFederationManager,
+ IFilestoreManager {
/**
* Creates a complete user object.
@@ -53,6 +42,7 @@
* @param user
* @param isCreate
* @throws GitBlitException
+ * @since 1.4.0
*/
void addUser(UserModel user) throws GitBlitException;
@@ -63,6 +53,7 @@
* @param username
* @param user
* @throws GitBlitException
+ * @since 1.4.0
*/
void reviseUser(String username, UserModel user) throws GitBlitException;
@@ -71,6 +62,7 @@
*
* @param team
* @param isCreate
+ * @since 1.4.0
*/
void addTeam(TeamModel team) throws GitBlitException;
@@ -79,6 +71,7 @@
*
* @param teamname
* @param team
+ * @since 1.4.0
*/
void reviseTeam(String teamname, TeamModel team) throws GitBlitException;
@@ -91,6 +84,7 @@
* @param user
* @return the repository model of the fork, if successful
* @throws GitBlitException
+ * @since 1.4.0
*/
RepositoryModel fork(RepositoryModel repository, UserModel user) throws GitBlitException;
@@ -99,6 +93,7 @@
* repository url panel;
*
* @return a collection of client applications
+ * @since 1.4.0
*/
Collection<GitClientApplication> getClientApplications();
@@ -106,7 +101,16 @@
* Returns the ticket service.
*
* @return a ticket service
+ * @since 1.4.0
*/
ITicketService getTicketService();
+ /**
+ * Returns the SSH public key manager.
+ *
+ * @return the SSH public key manager
+ * @since 1.5.0
+ */
+ IPublicKeyManager getPublicKeyManager();
+
}
\ No newline at end of file
--
Gitblit v1.9.1