From 3675f601fa3ebad004f65a4e01a12dd8cc0713fe Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 23 Aug 2017 01:13:41 +0200 Subject: [PATCH] Dissolve gerrit-sshd top-level directory Change-Id: Ie907bcd88fc30030883c0aa0705f8791cf2c3f6b --- gerrit-acceptance-tests/BUILD | 2 +- gerrit-pgm/BUILD | 2 +- gerrit-plugin-api/BUILD | 4 ++-- gerrit-war/BUILD | 2 +- .../gerrit/sshd/AbstractGitCommand.java | 0 .../gerrit/sshd/AdminHighPriorityCommand.java | 0 .../com/google/gerrit/sshd/AliasCommand.java | 0 .../gerrit/sshd/AliasCommandProvider.java | 0 .../com/google/gerrit/sshd}/BUILD | 20 +------------------ .../com/google/gerrit/sshd/BaseCommand.java | 0 .../sshd/CachingPublicKeyAuthenticator.java | 0 .../gerrit/sshd/ChangeArgumentParser.java | 0 .../google/gerrit/sshd/CommandExecutor.java | 0 .../gerrit/sshd/CommandExecutorProvider.java | 0 .../sshd/CommandExecutorQueueProvider.java | 0 .../gerrit/sshd/CommandFactoryProvider.java | 0 .../google/gerrit/sshd/CommandMetaData.java | 0 .../com/google/gerrit/sshd/CommandModule.java | 0 .../com/google/gerrit/sshd/CommandName.java | 0 .../google/gerrit/sshd/CommandProvider.java | 0 .../com/google/gerrit/sshd/Commands.java | 0 .../gerrit/sshd/DatabasePubKeyAuth.java | 0 .../google/gerrit/sshd/DispatchCommand.java | 0 .../gerrit/sshd/DispatchCommandProvider.java | 0 .../gerrit/sshd/GerritGSSAuthenticator.java | 0 .../google/gerrit/sshd/HostKeyProvider.java | 0 .../com/google/gerrit/sshd/NoShell.java | 0 .../gerrit/sshd/PluginCommandModule.java | 0 .../sshd/SingleCommandPluginModule.java | 0 .../sshd/SshAutoRegisterModuleGenerator.java | 0 .../com/google/gerrit/sshd/SshCommand.java | 0 .../com/google/gerrit/sshd/SshDaemon.java | 0 .../google/gerrit/sshd/SshHostKeyModule.java | 0 .../google/gerrit/sshd/SshKeyCacheEntry.java | 0 .../google/gerrit/sshd/SshKeyCacheImpl.java | 0 .../google/gerrit/sshd/SshKeyCreatorImpl.java | 0 .../com/google/gerrit/sshd/SshLog.java | 0 .../com/google/gerrit/sshd/SshLogLayout.java | 0 .../com/google/gerrit/sshd/SshModule.java | 0 .../gerrit/sshd/SshPluginStarterCallback.java | 0 .../gerrit/sshd/SshRemotePeerProvider.java | 0 .../com/google/gerrit/sshd/SshScope.java | 0 .../com/google/gerrit/sshd/SshSession.java | 0 .../com/google/gerrit/sshd/SshUtil.java | 0 .../gerrit/sshd/StreamCommandExecutor.java | 0 .../sshd/StreamCommandExecutorProvider.java | 0 .../com/google/gerrit/sshd/SuExec.java | 0 .../gerrit/sshd/commands/AdminQueryShell.java | 0 .../gerrit/sshd/commands/AdminSetParent.java | 0 .../gerrit/sshd/commands/ApproveOption.java | 0 .../gerrit/sshd/commands/AproposCommand.java | 0 .../sshd/commands/BanCommitCommand.java | 0 .../sshd/commands/BaseTestPrologCommand.java | 0 .../gerrit/sshd/commands/CloseConnection.java | 0 .../sshd/commands/CreateAccountCommand.java | 0 .../sshd/commands/CreateBranchCommand.java | 0 .../sshd/commands/CreateGroupCommand.java | 0 .../sshd/commands/CreateProjectCommand.java | 0 .../sshd/commands/DefaultCommandModule.java | 0 .../gerrit/sshd/commands/FlushCaches.java | 0 .../commands/GarbageCollectionCommand.java | 0 .../sshd/commands/IndexActivateCommand.java | 0 .../sshd/commands/IndexChangesCommand.java | 0 .../sshd/commands/IndexCommandsModule.java | 0 .../sshd/commands/IndexProjectCommand.java | 0 .../sshd/commands/IndexStartCommand.java | 0 .../gerrit/sshd/commands/KillCommand.java | 0 .../sshd/commands/ListGroupsCommand.java | 0 .../commands/ListLoggingLevelCommand.java | 0 .../sshd/commands/ListMembersCommand.java | 0 .../sshd/commands/ListProjectsCommand.java | 0 .../gerrit/sshd/commands/LsUserRefs.java | 0 ...NotSupportedInSlaveModeFailureCommand.java | 0 .../gerrit/sshd/commands/PatchSetParser.java | 0 .../sshd/commands/PluginAdminSshCommand.java | 0 .../sshd/commands/PluginEnableCommand.java | 0 .../sshd/commands/PluginInstallCommand.java | 0 .../gerrit/sshd/commands/PluginLsCommand.java | 0 .../sshd/commands/PluginReloadCommand.java | 0 .../sshd/commands/PluginRemoveCommand.java | 0 .../google/gerrit/sshd/commands/Query.java | 0 .../gerrit/sshd/commands/QueryShell.java | 0 .../google/gerrit/sshd/commands/Receive.java | 0 .../sshd/commands/RenameGroupCommand.java | 0 .../gerrit/sshd/commands/ReviewCommand.java | 0 .../gerrit/sshd/commands/ScpCommand.java | 0 .../sshd/commands/SetAccountCommand.java | 0 .../gerrit/sshd/commands/SetHeadCommand.java | 0 .../sshd/commands/SetLoggingLevelCommand.java | 0 .../sshd/commands/SetMembersCommand.java | 0 .../sshd/commands/SetProjectCommand.java | 0 .../sshd/commands/SetReviewersCommand.java | 0 .../gerrit/sshd/commands/ShowCaches.java | 0 .../gerrit/sshd/commands/ShowConnections.java | 0 .../gerrit/sshd/commands/ShowQueue.java | 0 .../gerrit/sshd/commands/StreamEvents.java | 0 .../sshd/commands/TestSubmitRuleCommand.java | 0 .../sshd/commands/TestSubmitTypeCommand.java | 0 .../google/gerrit/sshd/commands/Upload.java | 0 .../gerrit/sshd/commands/UploadArchive.java | 0 .../gerrit/sshd/commands/VersionCommand.java | 0 .../sshd/plugin/LfsPluginAuthCommand.java | 0 javatests/com/google/gerrit/sshd/BUILD | 13 ++++++++++++ .../ProjectConfigParamParserTest.java | 0 104 files changed, 19 insertions(+), 24 deletions(-) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/AbstractGitCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/AdminHighPriorityCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/AliasCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/AliasCommandProvider.java (100%) rename {gerrit-sshd => java/com/google/gerrit/sshd}/BUILD (77%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/BaseCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/CachingPublicKeyAuthenticator.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/ChangeArgumentParser.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/CommandExecutor.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/CommandExecutorProvider.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/CommandExecutorQueueProvider.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/CommandFactoryProvider.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/CommandMetaData.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/CommandModule.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/CommandName.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/CommandProvider.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/Commands.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/DatabasePubKeyAuth.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/DispatchCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/DispatchCommandProvider.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/GerritGSSAuthenticator.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/HostKeyProvider.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/NoShell.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/PluginCommandModule.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SingleCommandPluginModule.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshAutoRegisterModuleGenerator.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshDaemon.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshHostKeyModule.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshKeyCacheEntry.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshKeyCacheImpl.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshKeyCreatorImpl.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshLog.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshLogLayout.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshModule.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshPluginStarterCallback.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshRemotePeerProvider.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshScope.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshSession.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SshUtil.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/StreamCommandExecutor.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/StreamCommandExecutorProvider.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/SuExec.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/AdminQueryShell.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/AdminSetParent.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/ApproveOption.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/AproposCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/BanCommitCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/BaseTestPrologCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/CloseConnection.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/CreateAccountCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/CreateBranchCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/CreateGroupCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/CreateProjectCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/DefaultCommandModule.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/FlushCaches.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/GarbageCollectionCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/IndexActivateCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/IndexChangesCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/IndexCommandsModule.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/IndexProjectCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/IndexStartCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/KillCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/ListGroupsCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/ListLoggingLevelCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/ListMembersCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/ListProjectsCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/LsUserRefs.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/NotSupportedInSlaveModeFailureCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/PatchSetParser.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/PluginAdminSshCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/PluginEnableCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/PluginInstallCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/PluginLsCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/PluginReloadCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/PluginRemoveCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/Query.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/QueryShell.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/Receive.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/RenameGroupCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/ReviewCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/ScpCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/SetAccountCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/SetHeadCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/SetMembersCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/SetProjectCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/SetReviewersCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/ShowCaches.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/ShowConnections.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/ShowQueue.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/StreamEvents.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/TestSubmitRuleCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/TestSubmitTypeCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/Upload.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/UploadArchive.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/commands/VersionCommand.java (100%) rename {gerrit-sshd/src/main/java => java}/com/google/gerrit/sshd/plugin/LfsPluginAuthCommand.java (100%) create mode 100644 javatests/com/google/gerrit/sshd/BUILD rename {gerrit-sshd/src/test/java => javatests}/com/google/gerrit/sshd/commands/ProjectConfigParamParserTest.java (100%) diff --git a/gerrit-acceptance-tests/BUILD b/gerrit-acceptance-tests/BUILD index b594f29001..2a3a2a31ae 100644 --- a/gerrit-acceptance-tests/BUILD +++ b/gerrit-acceptance-tests/BUILD @@ -16,7 +16,6 @@ java_library( "//gerrit-server:receive", "//gerrit-server:server", "//gerrit-server:testutil", - "//gerrit-sshd:sshd", "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", @@ -26,6 +25,7 @@ java_library( "//java/com/google/gerrit/lucene", "//java/com/google/gerrit/metrics", "//java/com/google/gerrit/reviewdb:server", + "//java/com/google/gerrit/sshd", "//lib:args4j", "//lib:gson", "//lib:guava-retrying", diff --git a/gerrit-pgm/BUILD b/gerrit-pgm/BUILD index f1026c3f9f..7d5dd105ee 100644 --- a/gerrit-pgm/BUILD +++ b/gerrit-pgm/BUILD @@ -13,11 +13,11 @@ BASE_JETTY_DEPS = [ "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/lifecycle", + "//java/com/google/gerrit/sshd", "//java/com/google/gwtexpui/linker:server", "//java/com/google/gwtexpui/server", "//gerrit-httpd:httpd", "//gerrit-server:server", - "//gerrit-sshd:sshd", "//lib:guava", "//lib/guice:guice", "//lib/guice:guice-assistedinject", diff --git a/gerrit-plugin-api/BUILD b/gerrit-plugin-api/BUILD index 894dc063f4..3ada986b20 100644 --- a/gerrit-plugin-api/BUILD +++ b/gerrit-plugin-api/BUILD @@ -2,7 +2,7 @@ PLUGIN_API = [ "//gerrit-httpd:httpd", "//gerrit-pgm:init-api", "//gerrit-server:server", - "//gerrit-sshd:sshd", + "//java/com/google/gerrit/sshd", ] EXPORTS = [ @@ -80,7 +80,6 @@ java_binary( "//gerrit-httpd:libhttpd-src.jar", "//gerrit-pgm:libinit-api-src.jar", "//gerrit-server:libserver-src.jar", - "//gerrit-sshd:libsshd-src.jar", "//java/com/google/gerrit/common:libannotations-src.jar", "//java/com/google/gerrit/common:libserver-src.jar", "//java/com/google/gerrit/extensions:libapi-src.jar", @@ -88,6 +87,7 @@ java_binary( "//java/com/google/gerrit/index:libquery_exception-src.jar", "//java/com/google/gerrit/index:libquery_parser-src.jar", "//java/com/google/gerrit/reviewdb:libserver-src.jar", + "//java/com/google/gerrit/sshd:libsshd-src.jar", "//java/com/google/gwtexpui/server:libserver-src.jar", ], ) diff --git a/gerrit-war/BUILD b/gerrit-war/BUILD index 3b948a548c..d8985ca1f5 100644 --- a/gerrit-war/BUILD +++ b/gerrit-war/BUILD @@ -15,7 +15,6 @@ java_library( "//gerrit-server:module", "//gerrit-server:receive", "//gerrit-server:server", - "//gerrit-sshd:sshd", "//java/com/google/gerrit/elasticsearch", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/gpg", @@ -24,6 +23,7 @@ java_library( "//java/com/google/gerrit/metrics/dropwizard", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server/cache/h2", + "//java/com/google/gerrit/sshd", "//lib:guava", "//lib:gwtorm", "//lib:servlet-api-3_1", diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java b/java/com/google/gerrit/sshd/AbstractGitCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java rename to java/com/google/gerrit/sshd/AbstractGitCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AdminHighPriorityCommand.java b/java/com/google/gerrit/sshd/AdminHighPriorityCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/AdminHighPriorityCommand.java rename to java/com/google/gerrit/sshd/AdminHighPriorityCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommand.java b/java/com/google/gerrit/sshd/AliasCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommand.java rename to java/com/google/gerrit/sshd/AliasCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommandProvider.java b/java/com/google/gerrit/sshd/AliasCommandProvider.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommandProvider.java rename to java/com/google/gerrit/sshd/AliasCommandProvider.java diff --git a/gerrit-sshd/BUILD b/java/com/google/gerrit/sshd/BUILD similarity index 77% rename from gerrit-sshd/BUILD rename to java/com/google/gerrit/sshd/BUILD index e32e23a5f6..a7dea9ec00 100644 --- a/gerrit-sshd/BUILD +++ b/java/com/google/gerrit/sshd/BUILD @@ -1,10 +1,6 @@ -load("//tools/bzl:junit.bzl", "junit_tests") - -SRCS = glob(["src/main/java/**/*.java"]) - java_library( name = "sshd", - srcs = SRCS, + srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ "//gerrit-server:receive", @@ -40,17 +36,3 @@ java_library( "//lib/mina:sshd", ], ) - -junit_tests( - name = "sshd_tests", - srcs = glob( - ["src/test/java/**/*.java"], - ), - deps = [ - ":sshd", - "//gerrit-server:server", - "//java/com/google/gerrit/extensions:api", - "//lib:truth", - "//lib/mina:sshd", - ], -) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java b/java/com/google/gerrit/sshd/BaseCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java rename to java/com/google/gerrit/sshd/BaseCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CachingPublicKeyAuthenticator.java b/java/com/google/gerrit/sshd/CachingPublicKeyAuthenticator.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/CachingPublicKeyAuthenticator.java rename to java/com/google/gerrit/sshd/CachingPublicKeyAuthenticator.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java b/java/com/google/gerrit/sshd/ChangeArgumentParser.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java rename to java/com/google/gerrit/sshd/ChangeArgumentParser.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutor.java b/java/com/google/gerrit/sshd/CommandExecutor.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutor.java rename to java/com/google/gerrit/sshd/CommandExecutor.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorProvider.java b/java/com/google/gerrit/sshd/CommandExecutorProvider.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorProvider.java rename to java/com/google/gerrit/sshd/CommandExecutorProvider.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java b/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java rename to java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java b/java/com/google/gerrit/sshd/CommandFactoryProvider.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java rename to java/com/google/gerrit/sshd/CommandFactoryProvider.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandMetaData.java b/java/com/google/gerrit/sshd/CommandMetaData.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandMetaData.java rename to java/com/google/gerrit/sshd/CommandMetaData.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandModule.java b/java/com/google/gerrit/sshd/CommandModule.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandModule.java rename to java/com/google/gerrit/sshd/CommandModule.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandName.java b/java/com/google/gerrit/sshd/CommandName.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandName.java rename to java/com/google/gerrit/sshd/CommandName.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandProvider.java b/java/com/google/gerrit/sshd/CommandProvider.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandProvider.java rename to java/com/google/gerrit/sshd/CommandProvider.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/Commands.java b/java/com/google/gerrit/sshd/Commands.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/Commands.java rename to java/com/google/gerrit/sshd/Commands.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java b/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java rename to java/com/google/gerrit/sshd/DatabasePubKeyAuth.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java b/java/com/google/gerrit/sshd/DispatchCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java rename to java/com/google/gerrit/sshd/DispatchCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java b/java/com/google/gerrit/sshd/DispatchCommandProvider.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java rename to java/com/google/gerrit/sshd/DispatchCommandProvider.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java b/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java rename to java/com/google/gerrit/sshd/GerritGSSAuthenticator.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java b/java/com/google/gerrit/sshd/HostKeyProvider.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java rename to java/com/google/gerrit/sshd/HostKeyProvider.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java b/java/com/google/gerrit/sshd/NoShell.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java rename to java/com/google/gerrit/sshd/NoShell.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java b/java/com/google/gerrit/sshd/PluginCommandModule.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/PluginCommandModule.java rename to java/com/google/gerrit/sshd/PluginCommandModule.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SingleCommandPluginModule.java b/java/com/google/gerrit/sshd/SingleCommandPluginModule.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SingleCommandPluginModule.java rename to java/com/google/gerrit/sshd/SingleCommandPluginModule.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshAutoRegisterModuleGenerator.java b/java/com/google/gerrit/sshd/SshAutoRegisterModuleGenerator.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshAutoRegisterModuleGenerator.java rename to java/com/google/gerrit/sshd/SshAutoRegisterModuleGenerator.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshCommand.java b/java/com/google/gerrit/sshd/SshCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshCommand.java rename to java/com/google/gerrit/sshd/SshCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/java/com/google/gerrit/sshd/SshDaemon.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java rename to java/com/google/gerrit/sshd/SshDaemon.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshHostKeyModule.java b/java/com/google/gerrit/sshd/SshHostKeyModule.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshHostKeyModule.java rename to java/com/google/gerrit/sshd/SshHostKeyModule.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheEntry.java b/java/com/google/gerrit/sshd/SshKeyCacheEntry.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheEntry.java rename to java/com/google/gerrit/sshd/SshKeyCacheEntry.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheImpl.java b/java/com/google/gerrit/sshd/SshKeyCacheImpl.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheImpl.java rename to java/com/google/gerrit/sshd/SshKeyCacheImpl.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCreatorImpl.java b/java/com/google/gerrit/sshd/SshKeyCreatorImpl.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCreatorImpl.java rename to java/com/google/gerrit/sshd/SshKeyCreatorImpl.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java b/java/com/google/gerrit/sshd/SshLog.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java rename to java/com/google/gerrit/sshd/SshLog.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLogLayout.java b/java/com/google/gerrit/sshd/SshLogLayout.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLogLayout.java rename to java/com/google/gerrit/sshd/SshLogLayout.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java b/java/com/google/gerrit/sshd/SshModule.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java rename to java/com/google/gerrit/sshd/SshModule.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshPluginStarterCallback.java b/java/com/google/gerrit/sshd/SshPluginStarterCallback.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshPluginStarterCallback.java rename to java/com/google/gerrit/sshd/SshPluginStarterCallback.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java b/java/com/google/gerrit/sshd/SshRemotePeerProvider.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java rename to java/com/google/gerrit/sshd/SshRemotePeerProvider.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java b/java/com/google/gerrit/sshd/SshScope.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java rename to java/com/google/gerrit/sshd/SshScope.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshSession.java b/java/com/google/gerrit/sshd/SshSession.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshSession.java rename to java/com/google/gerrit/sshd/SshSession.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java b/java/com/google/gerrit/sshd/SshUtil.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshUtil.java rename to java/com/google/gerrit/sshd/SshUtil.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutor.java b/java/com/google/gerrit/sshd/StreamCommandExecutor.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutor.java rename to java/com/google/gerrit/sshd/StreamCommandExecutor.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java b/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java rename to java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SuExec.java b/java/com/google/gerrit/sshd/SuExec.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/SuExec.java rename to java/com/google/gerrit/sshd/SuExec.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminQueryShell.java b/java/com/google/gerrit/sshd/commands/AdminQueryShell.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminQueryShell.java rename to java/com/google/gerrit/sshd/commands/AdminQueryShell.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java b/java/com/google/gerrit/sshd/commands/AdminSetParent.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java rename to java/com/google/gerrit/sshd/commands/AdminSetParent.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java b/java/com/google/gerrit/sshd/commands/ApproveOption.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ApproveOption.java rename to java/com/google/gerrit/sshd/commands/ApproveOption.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AproposCommand.java b/java/com/google/gerrit/sshd/commands/AproposCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AproposCommand.java rename to java/com/google/gerrit/sshd/commands/AproposCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java b/java/com/google/gerrit/sshd/commands/BanCommitCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java rename to java/com/google/gerrit/sshd/commands/BanCommitCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BaseTestPrologCommand.java b/java/com/google/gerrit/sshd/commands/BaseTestPrologCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BaseTestPrologCommand.java rename to java/com/google/gerrit/sshd/commands/BaseTestPrologCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CloseConnection.java b/java/com/google/gerrit/sshd/commands/CloseConnection.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CloseConnection.java rename to java/com/google/gerrit/sshd/commands/CloseConnection.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateAccountCommand.java b/java/com/google/gerrit/sshd/commands/CreateAccountCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateAccountCommand.java rename to java/com/google/gerrit/sshd/commands/CreateAccountCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateBranchCommand.java b/java/com/google/gerrit/sshd/commands/CreateBranchCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateBranchCommand.java rename to java/com/google/gerrit/sshd/commands/CreateBranchCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java b/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java rename to java/com/google/gerrit/sshd/commands/CreateGroupCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java b/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java rename to java/com/google/gerrit/sshd/commands/CreateProjectCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java b/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java rename to java/com/google/gerrit/sshd/commands/DefaultCommandModule.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/FlushCaches.java b/java/com/google/gerrit/sshd/commands/FlushCaches.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/FlushCaches.java rename to java/com/google/gerrit/sshd/commands/FlushCaches.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/GarbageCollectionCommand.java b/java/com/google/gerrit/sshd/commands/GarbageCollectionCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/GarbageCollectionCommand.java rename to java/com/google/gerrit/sshd/commands/GarbageCollectionCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexActivateCommand.java b/java/com/google/gerrit/sshd/commands/IndexActivateCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexActivateCommand.java rename to java/com/google/gerrit/sshd/commands/IndexActivateCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexChangesCommand.java b/java/com/google/gerrit/sshd/commands/IndexChangesCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexChangesCommand.java rename to java/com/google/gerrit/sshd/commands/IndexChangesCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexCommandsModule.java b/java/com/google/gerrit/sshd/commands/IndexCommandsModule.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexCommandsModule.java rename to java/com/google/gerrit/sshd/commands/IndexCommandsModule.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexProjectCommand.java b/java/com/google/gerrit/sshd/commands/IndexProjectCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexProjectCommand.java rename to java/com/google/gerrit/sshd/commands/IndexProjectCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexStartCommand.java b/java/com/google/gerrit/sshd/commands/IndexStartCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexStartCommand.java rename to java/com/google/gerrit/sshd/commands/IndexStartCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/KillCommand.java b/java/com/google/gerrit/sshd/commands/KillCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/KillCommand.java rename to java/com/google/gerrit/sshd/commands/KillCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java b/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java rename to java/com/google/gerrit/sshd/commands/ListGroupsCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListLoggingLevelCommand.java b/java/com/google/gerrit/sshd/commands/ListLoggingLevelCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListLoggingLevelCommand.java rename to java/com/google/gerrit/sshd/commands/ListLoggingLevelCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListMembersCommand.java b/java/com/google/gerrit/sshd/commands/ListMembersCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListMembersCommand.java rename to java/com/google/gerrit/sshd/commands/ListMembersCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjectsCommand.java b/java/com/google/gerrit/sshd/commands/ListProjectsCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjectsCommand.java rename to java/com/google/gerrit/sshd/commands/ListProjectsCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java b/java/com/google/gerrit/sshd/commands/LsUserRefs.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java rename to java/com/google/gerrit/sshd/commands/LsUserRefs.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/NotSupportedInSlaveModeFailureCommand.java b/java/com/google/gerrit/sshd/commands/NotSupportedInSlaveModeFailureCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/NotSupportedInSlaveModeFailureCommand.java rename to java/com/google/gerrit/sshd/commands/NotSupportedInSlaveModeFailureCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PatchSetParser.java b/java/com/google/gerrit/sshd/commands/PatchSetParser.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PatchSetParser.java rename to java/com/google/gerrit/sshd/commands/PatchSetParser.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginAdminSshCommand.java b/java/com/google/gerrit/sshd/commands/PluginAdminSshCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginAdminSshCommand.java rename to java/com/google/gerrit/sshd/commands/PluginAdminSshCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginEnableCommand.java b/java/com/google/gerrit/sshd/commands/PluginEnableCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginEnableCommand.java rename to java/com/google/gerrit/sshd/commands/PluginEnableCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginInstallCommand.java b/java/com/google/gerrit/sshd/commands/PluginInstallCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginInstallCommand.java rename to java/com/google/gerrit/sshd/commands/PluginInstallCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginLsCommand.java b/java/com/google/gerrit/sshd/commands/PluginLsCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginLsCommand.java rename to java/com/google/gerrit/sshd/commands/PluginLsCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginReloadCommand.java b/java/com/google/gerrit/sshd/commands/PluginReloadCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginReloadCommand.java rename to java/com/google/gerrit/sshd/commands/PluginReloadCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginRemoveCommand.java b/java/com/google/gerrit/sshd/commands/PluginRemoveCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginRemoveCommand.java rename to java/com/google/gerrit/sshd/commands/PluginRemoveCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Query.java b/java/com/google/gerrit/sshd/commands/Query.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Query.java rename to java/com/google/gerrit/sshd/commands/Query.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java b/java/com/google/gerrit/sshd/commands/QueryShell.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java rename to java/com/google/gerrit/sshd/commands/QueryShell.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java b/java/com/google/gerrit/sshd/commands/Receive.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java rename to java/com/google/gerrit/sshd/commands/Receive.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/RenameGroupCommand.java b/java/com/google/gerrit/sshd/commands/RenameGroupCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/RenameGroupCommand.java rename to java/com/google/gerrit/sshd/commands/RenameGroupCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java b/java/com/google/gerrit/sshd/commands/ReviewCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java rename to java/com/google/gerrit/sshd/commands/ReviewCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java b/java/com/google/gerrit/sshd/commands/ScpCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java rename to java/com/google/gerrit/sshd/commands/ScpCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java b/java/com/google/gerrit/sshd/commands/SetAccountCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java rename to java/com/google/gerrit/sshd/commands/SetAccountCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetHeadCommand.java b/java/com/google/gerrit/sshd/commands/SetHeadCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetHeadCommand.java rename to java/com/google/gerrit/sshd/commands/SetHeadCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java b/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java rename to java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java b/java/com/google/gerrit/sshd/commands/SetMembersCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java rename to java/com/google/gerrit/sshd/commands/SetMembersCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetProjectCommand.java b/java/com/google/gerrit/sshd/commands/SetProjectCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetProjectCommand.java rename to java/com/google/gerrit/sshd/commands/SetProjectCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java b/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java rename to java/com/google/gerrit/sshd/commands/SetReviewersCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowCaches.java b/java/com/google/gerrit/sshd/commands/ShowCaches.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowCaches.java rename to java/com/google/gerrit/sshd/commands/ShowCaches.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java b/java/com/google/gerrit/sshd/commands/ShowConnections.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java rename to java/com/google/gerrit/sshd/commands/ShowConnections.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java b/java/com/google/gerrit/sshd/commands/ShowQueue.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java rename to java/com/google/gerrit/sshd/commands/ShowQueue.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java b/java/com/google/gerrit/sshd/commands/StreamEvents.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java rename to java/com/google/gerrit/sshd/commands/StreamEvents.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitRuleCommand.java b/java/com/google/gerrit/sshd/commands/TestSubmitRuleCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitRuleCommand.java rename to java/com/google/gerrit/sshd/commands/TestSubmitRuleCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitTypeCommand.java b/java/com/google/gerrit/sshd/commands/TestSubmitTypeCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitTypeCommand.java rename to java/com/google/gerrit/sshd/commands/TestSubmitTypeCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java b/java/com/google/gerrit/sshd/commands/Upload.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java rename to java/com/google/gerrit/sshd/commands/Upload.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java b/java/com/google/gerrit/sshd/commands/UploadArchive.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java rename to java/com/google/gerrit/sshd/commands/UploadArchive.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/VersionCommand.java b/java/com/google/gerrit/sshd/commands/VersionCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/VersionCommand.java rename to java/com/google/gerrit/sshd/commands/VersionCommand.java diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/plugin/LfsPluginAuthCommand.java b/java/com/google/gerrit/sshd/plugin/LfsPluginAuthCommand.java similarity index 100% rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/plugin/LfsPluginAuthCommand.java rename to java/com/google/gerrit/sshd/plugin/LfsPluginAuthCommand.java diff --git a/javatests/com/google/gerrit/sshd/BUILD b/javatests/com/google/gerrit/sshd/BUILD new file mode 100644 index 0000000000..fb8c615f13 --- /dev/null +++ b/javatests/com/google/gerrit/sshd/BUILD @@ -0,0 +1,13 @@ +load("//tools/bzl:junit.bzl", "junit_tests") + +junit_tests( + name = "sshd_tests", + srcs = glob(["**/*.java"]), + deps = [ + "//gerrit-server:server", + "//java/com/google/gerrit/extensions:api", + "//java/com/google/gerrit/sshd", + "//lib:truth", + "//lib/mina:sshd", + ], +) diff --git a/gerrit-sshd/src/test/java/com/google/gerrit/sshd/commands/ProjectConfigParamParserTest.java b/javatests/com/google/gerrit/sshd/commands/ProjectConfigParamParserTest.java similarity index 100% rename from gerrit-sshd/src/test/java/com/google/gerrit/sshd/commands/ProjectConfigParamParserTest.java rename to javatests/com/google/gerrit/sshd/commands/ProjectConfigParamParserTest.java