From fc42a53629eee92eb4155326841a270907640209 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 21 Oct 2011 17:48:48 -0400
Subject: [PATCH] Documentation and some .gitignore updates
---
src/com/gitblit/RpcServlet.java | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/src/com/gitblit/RpcServlet.java b/src/com/gitblit/RpcServlet.java
index de5d94e..6a8c2c5 100644
--- a/src/com/gitblit/RpcServlet.java
+++ b/src/com/gitblit/RpcServlet.java
@@ -22,7 +22,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -95,17 +94,24 @@
} else if (RpcRequest.CREATE_REPOSITORY.equals(reqType)) {
// create repository
RepositoryModel model = deserialize(request, response, RepositoryModel.class);
- GitBlit.self().updateRepositoryModel(model.name, model, true);
+ try {
+ GitBlit.self().updateRepositoryModel(model.name, model, true);
+ } catch (GitBlitException e) {
+ response.setStatus(failureCode);
+ }
} else if (RpcRequest.EDIT_REPOSITORY.equals(reqType)) {
// edit repository
RepositoryModel model = deserialize(request, response, RepositoryModel.class);
- // name parameter specifies original repository name in event of
- // rename
+ // name specifies original repository name in event of rename
String repoName = objectName;
if (repoName == null) {
repoName = model.name;
}
- GitBlit.self().updateRepositoryModel(repoName, model, false);
+ try {
+ GitBlit.self().updateRepositoryModel(repoName, model, false);
+ } catch (GitBlitException e) {
+ response.setStatus(failureCode);
+ }
} else if (RpcRequest.DELETE_REPOSITORY.equals(reqType)) {
// delete repository
RepositoryModel model = deserialize(request, response, RepositoryModel.class);
@@ -113,7 +119,11 @@
} else if (RpcRequest.CREATE_USER.equals(reqType)) {
// create user
UserModel model = deserialize(request, response, UserModel.class);
- GitBlit.self().updateUserModel(model.username, model, true);
+ try {
+ GitBlit.self().updateUserModel(model.username, model, true);
+ } catch (GitBlitException e) {
+ response.setStatus(failureCode);
+ }
} else if (RpcRequest.EDIT_USER.equals(reqType)) {
// edit user
UserModel model = deserialize(request, response, UserModel.class);
@@ -122,11 +132,17 @@
if (username == null) {
username = model.username;
}
- GitBlit.self().updateUserModel(username, model, false);
+ try {
+ GitBlit.self().updateUserModel(username, model, false);
+ } catch (GitBlitException e) {
+ response.setStatus(failureCode);
+ }
} else if (RpcRequest.DELETE_USER.equals(reqType)) {
// delete user
UserModel model = deserialize(request, response, UserModel.class);
- GitBlit.self().deleteUser(model.username);
+ if (!GitBlit.self().deleteUser(model.username)) {
+ response.setStatus(failureCode);
+ }
} else if (RpcRequest.LIST_REPOSITORY_MEMBERS.equals(reqType)) {
// get repository members
RepositoryModel model = GitBlit.self().getRepositoryModel(objectName);
@@ -137,7 +153,7 @@
Collection<String> names = deserialize(request, response, RpcUtils.NAMES_TYPE);
List<String> users = new ArrayList<String>(names);
if (!GitBlit.self().setRepositoryUsers(model, users)) {
- response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ response.setStatus(failureCode);
}
} else if (RpcRequest.LIST_FEDERATION_REGISTRATIONS.equals(reqType)) {
// return the list of federation registrations
@@ -147,14 +163,14 @@
if (GitBlit.canFederate()) {
result = GitBlit.self().getFederationResultRegistrations();
} else {
- response.sendError(HttpServletResponse.SC_FORBIDDEN);
+ response.sendError(notAllowedCode);
}
} else if (RpcRequest.LIST_FEDERATION_PROPOSALS.equals(reqType)) {
// return the list of federation proposals
if (GitBlit.canFederate()) {
result = GitBlit.self().getPendingFederationProposals();
} else {
- response.sendError(HttpServletResponse.SC_FORBIDDEN);
+ response.sendError(notAllowedCode);
}
} else if (RpcRequest.LIST_FEDERATION_SETS.equals(reqType)) {
// return the list of federation sets
@@ -162,19 +178,14 @@
String gitblitUrl = HttpUtils.getGitblitURL(request);
result = GitBlit.self().getFederationSets(gitblitUrl);
} else {
- response.sendError(HttpServletResponse.SC_FORBIDDEN);
+ response.sendError(notAllowedCode);
}
} else if (RpcRequest.LIST_SETTINGS.equals(reqType)) {
// return the server's settings
- Properties settings = new Properties();
- List<String> keys = GitBlit.getAllKeys(null);
- for (String key:keys) {
- String value = GitBlit.getString(key, null);
- if (value != null) {
- settings.put(key, value);
- }
- }
- result = settings;
+ result = GitBlit.self().getSettingModels();
+ } else if (RpcRequest.LIST_SERVER_STATUS.equals(reqType)) {
+ // return the server's status information
+ result = GitBlit.self().getStatus();
}
// send the result of the request
--
Gitblit v1.9.1