Merge "Fix class comment on ListPlugins"
diff --git a/Documentation/cmd-create-group.txt b/Documentation/cmd-create-group.txt
index 8d404ec..8dc6dcc 100644
--- a/Documentation/cmd-create-group.txt
+++ b/Documentation/cmd-create-group.txt
@@ -9,8 +9,8 @@
--------
[verse]
'ssh' -p <port> <host> 'gerrit create-group'
- [--owner <GROUP>]
- [--description <DESC>]
+ [--owner <GROUP> | -o <GROUP>]
+ [--description <DESC> | -d <DESC>]
[--member <USERNAME>]
[--group <GROUP>]
[--visible-to-all]
diff --git a/Documentation/cmd-create-project.txt b/Documentation/cmd-create-project.txt
index 02aa078..d0e56fd 100644
--- a/Documentation/cmd-create-project.txt
+++ b/Documentation/cmd-create-project.txt
@@ -14,7 +14,7 @@
[--suggest-parents | -S ]
[--permissions-only]
[--description <DESC> | -d <DESC>]
- [--submit-type <TYPE> | -t <TYPE>]
+ [--submit-type <TYPE> | -t <TYPE>]
[--use-contributor-agreements | --ca]
[--use-signed-off-by | --so]
[--use-content-merge]
diff --git a/Documentation/cmd-ls-groups.txt b/Documentation/cmd-ls-groups.txt
index a50657b..306bb92 100644
--- a/Documentation/cmd-ls-groups.txt
+++ b/Documentation/cmd-ls-groups.txt
@@ -9,10 +9,11 @@
--------
[verse]
'ssh' -p <port> <host> 'gerrit ls-groups'
- [--project <NAME>]
- [--user <NAME>]
+ [--project <NAME> | -p <NAME>]
+ [--user <NAME> | -u <NAME>]
[--visible-to-all]
- [--type {internal | ldap | system}]
+ [--type {internal | system}]
+ [--verbose | -v]
DESCRIPTION
-----------
diff --git a/Documentation/cmd-ls-projects.txt b/Documentation/cmd-ls-projects.txt
index 25cd9a9..d7d5aa5 100644
--- a/Documentation/cmd-ls-projects.txt
+++ b/Documentation/cmd-ls-projects.txt
@@ -10,8 +10,12 @@
[verse]
'ssh' -p <port> <host> 'gerrit ls-projects'
[--show-branch <BRANCH> ...]
- [--tree]
+ [--description | -d]
+ [--tree | -t]
[--type {code | permissions | all}]
+ [--format {text | json | json_compact}]
+ [--all]
+ [--limit <N>]
DESCRIPTION
-----------
@@ -42,7 +46,7 @@
whole project is not shown.
--description::
---d::
+-d::
Allows listing of projects together with their respective
description.
+
diff --git a/Documentation/cmd-receive-pack.txt b/Documentation/cmd-receive-pack.txt
index 7e5ca09..68f686d 100644
--- a/Documentation/cmd-receive-pack.txt
+++ b/Documentation/cmd-receive-pack.txt
@@ -8,7 +8,10 @@
SYNOPSIS
--------
[verse]
-'git receive-pack' [--reviewer <address>] [--cc <address>] <project>
+'git receive-pack'
+ [--reviewer <address> | --re <address>]
+ [--cc <address>]
+ <project>
DESCRIPTION
-----------
diff --git a/Documentation/cmd-review.txt b/Documentation/cmd-review.txt
index eed6902..fdb5273 100644
--- a/Documentation/cmd-review.txt
+++ b/Documentation/cmd-review.txt
@@ -9,10 +9,10 @@
--------
[verse]
'ssh' -p <port> <host> 'gerrit review'
- [--project <PROJECT>]
- [--message <MESSAGE>]
+ [--project <PROJECT> | -p <PROJECT>]
+ [--message <MESSAGE> | -m <MESSAGE>]
[--force-message]
- [--submit]
+ [--submit | -s]
[--abandon | --restore]
[--publish]
[--delete]
diff --git a/Documentation/cmd-set-project.txt b/Documentation/cmd-set-project.txt
index c4b9b4f..059f063 100644
--- a/Documentation/cmd-set-project.txt
+++ b/Documentation/cmd-set-project.txt
@@ -10,7 +10,7 @@
[verse]
'ssh' -p <port> <host> 'gerrit set-project'
[--description <DESC> | -d <DESC>]
- [--submit-type <TYPE> | -t <TYPE>]
+ [--submit-type <TYPE> | -t <TYPE>]
[--use|no-contributor-agreements | --ca|nca]
[--use|no-signed-off-by | --so|nso]
[--use|no-content-merge]
diff --git a/Documentation/cmd-set-reviewers.txt b/Documentation/cmd-set-reviewers.txt
index 9e08e39..32fd35e 100644
--- a/Documentation/cmd-set-reviewers.txt
+++ b/Documentation/cmd-set-reviewers.txt
@@ -9,9 +9,9 @@
--------
[verse]
'ssh' -p <port> <host> 'gerrit set-reviewers'
- [--project <PROJECT>]
- [--add REVIEWER ...]
- [--remove REVIEWER ...]
+ [--project <PROJECT> | -p <PROJECT>]
+ [--add <REVIEWER> ... | -a <REVIEWER> ...]
+ [--remove <REVIEWER> ... | -r <REVIEWER> ...]
[--]
{COMMIT | CHANGE-ID}...
diff --git a/Documentation/cmd-show-connections.txt b/Documentation/cmd-show-connections.txt
index b5d41bd..8404a97 100644
--- a/Documentation/cmd-show-connections.txt
+++ b/Documentation/cmd-show-connections.txt
@@ -8,7 +8,7 @@
SYNOPSIS
--------
[verse]
-'ssh' -p <port> <host> 'gerrit show-connections' [-n]
+'ssh' -p <port> <host> 'gerrit show-connections' [--numeric | -n]
DESCRIPTION
-----------
diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt
index 7832aa9..0052d84 100644
--- a/Documentation/dev-plugins.txt
+++ b/Documentation/dev-plugins.txt
@@ -1,6 +1,12 @@
Gerrit Code Review - Plugin Development
=======================================
+The Gerrit server functionality can be extended by installing plugins.
+This page describes how plugins for Gerrit can be developed.
+
+Depending on how tightly the extension code is coupled with the Gerrit
+server code, there is a distinction between `plugins` and `extensions`.
+
A plugin in Gerrit is tightly coupled code that runs in the same
JVM as Gerrit. It has full access to all server internals. Plugins
are tightly coupled to a specific major.minor server version and
@@ -9,8 +15,8 @@
An extension in Gerrit runs inside of the same JVM as Gerrit
in the same way as a plugin, but has limited visibility to the
-server's internals. The limited visiblity reduces the extension's
-dependencies, enabling it to be compatiable across a wider range
+server's internals. The limited visibility reduces the extension's
+dependencies, enabling it to be compatible across a wider range
of server versions.
Most of this documentation refers to either type as a plugin.
@@ -18,7 +24,7 @@
Requirements
------------
-To start development, clone the sample maven project:
+To start development, clone the sample Maven project:
----
$ git clone https://gerrit.googlesource.com/plugins/helloworld
@@ -160,7 +166,7 @@
====
If no Guice modules are declared in the manifest, SSH commands may
-use auto-registration by providing an @Export annotatation:
+use auto-registration by providing an @Export annotation:
====
import com.google.gerrit.extensions.annotations.Export;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
index 071660a..76cee02 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
@@ -336,7 +336,9 @@
private void stopRemovedPlugins(List<File> jars) {
Set<String> unload = Sets.newHashSet(running.keySet());
for (File jar : jars) {
- unload.remove(nameOf(jar));
+ if (!jar.getName().endsWith(".disabled")) {
+ unload.remove(nameOf(jar));
+ }
}
for (String name : unload){
log.info(String.format("Unloading plugin %s", name));
@@ -347,7 +349,9 @@
private void dropRemovedDisabledPlugins(List<File> jars) {
Set<String> unload = Sets.newHashSet(disabled.keySet());
for (File jar : jars) {
- unload.remove(nameOf(jar));
+ if (jar.getName().endsWith(".disabled")) {
+ unload.remove(nameOf(jar));
+ }
}
for (String name : unload) {
disabled.remove(name);
