Require the "administrate server" core capability

Capability scope was introduced to differentiate between plugin-owned
capabilities and core capabilities. Per default the scope of the
@RequiresCapability annotation is CapabilityScope.CONTEXT, which means
the scope is assumed to be that of the plugin.

Update the annotations to use CapabilityScope.CORE, to make sure the
proper "administrate server" capability is used.

Change-Id: I02d3ed77f6e7dee746686b5ec8711aa38dddd9c3

src/main/java/com/google/gerrit/plugins/ShowAccountCommand.java

diff --git a/src/main/java/com/google/gerrit/plugins/ShowAccountCommand.java b/src/main/java/com/google/gerrit/plugins/ShowAccountCommand.java
index bc6981e..e217cac 100644
--- a/src/main/java/com/google/gerrit/plugins/ShowAccountCommand.java
+++ b/src/main/java/com/google/gerrit/plugins/ShowAccountCommand.java
@@ -25,6 +25,7 @@
 import org.kohsuke.args4j.Option;
 
 import com.google.gerrit.common.data.GlobalCapability;
+import com.google.gerrit.extensions.annotations.CapabilityScope;
 import com.google.gerrit.extensions.annotations.RequiresCapability;
 import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.reviewdb.client.Account.Id;
@@ -43,8 +44,8 @@
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
-@RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
-@CommandMetaData(name = "show-account", descr = "Displays user information")
+@RequiresCapability(value=GlobalCapability.ADMINISTRATE_SERVER, scope=CapabilityScope.CORE)
+@CommandMetaData(name = "show-account", description = "Displays user information")
 public final class ShowAccountCommand extends SshCommand {
 
   @Argument(usage = "User information to find: LastName,\\ Firstname,  email@address.com, account id or an user name.  Be sure to double-escape spaces, for example: \"show-account Last,\\\\ First\"")

src/main/java/com/google/gerrit/plugins/ShowRepoAccessCommand.java

diff --git a/src/main/java/com/google/gerrit/plugins/ShowRepoAccessCommand.java b/src/main/java/com/google/gerrit/plugins/ShowRepoAccessCommand.java
index cdf325b..37c483c 100644
--- a/src/main/java/com/google/gerrit/plugins/ShowRepoAccessCommand.java
+++ b/src/main/java/com/google/gerrit/plugins/ShowRepoAccessCommand.java
@@ -25,6 +25,7 @@
 import com.google.gerrit.common.data.GlobalCapability;
 import com.google.gerrit.common.data.Permission;
 import com.google.gerrit.common.data.PermissionRule;
+import com.google.gerrit.extensions.annotations.CapabilityScope;
 import com.google.gerrit.extensions.annotations.RequiresCapability;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.git.MetaDataUpdate;
@@ -33,8 +34,8 @@
 import com.google.gerrit.sshd.SshCommand;
 import com.google.inject.Inject;
 
-@RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
-@CommandMetaData(name = "show-repo-access", descr = "Displays access on a specific repository")
+@RequiresCapability(value=GlobalCapability.ADMINISTRATE_SERVER, scope=CapabilityScope.CORE)
+@CommandMetaData(name = "show-repo-access", description = "Displays access on a specific repository")
 public final class ShowRepoAccessCommand extends SshCommand {
 
   @Argument(usage = "project to show access for?")

src/main/java/com/google/gerrit/plugins/ShowRepoAccountAccessCommand.java

diff --git a/src/main/java/com/google/gerrit/plugins/ShowRepoAccountAccessCommand.java b/src/main/java/com/google/gerrit/plugins/ShowRepoAccountAccessCommand.java
index cf2caeb..6148dbd 100644
--- a/src/main/java/com/google/gerrit/plugins/ShowRepoAccountAccessCommand.java
+++ b/src/main/java/com/google/gerrit/plugins/ShowRepoAccountAccessCommand.java
@@ -28,6 +28,7 @@
 import com.google.gerrit.common.data.GlobalCapability;
 import com.google.gerrit.common.data.Permission;
 import com.google.gerrit.common.data.PermissionRule;
+import com.google.gerrit.extensions.annotations.CapabilityScope;
 import com.google.gerrit.extensions.annotations.RequiresCapability;
 import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.reviewdb.client.Account.Id;
@@ -44,8 +45,8 @@
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
-@RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
-@CommandMetaData(name = "show-repo-account-access", descr = "Displays user's access on a specific repository")
+@RequiresCapability(value=GlobalCapability.ADMINISTRATE_SERVER, scope=CapabilityScope.CORE)
+@CommandMetaData(name = "show-repo-account-access", description = "Displays user's access on a specific repository")
 public final class ShowRepoAccountAccessCommand extends SshCommand {
 
   @Argument(usage = "project to show access for?")