From 907b7ad94cf26bb4201d4632d8ae1cb6eb4ece9d Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Mon, 21 Aug 2017 08:03:59 +0200 Subject: [PATCH] Dissolve gerrit-util-cli top-level directory Change-Id: I5a3e7fcc1bc8ee5248376113f08f8dde74c3b607 --- gerrit-gwtdebug/BUILD | 2 +- gerrit-httpd/BUILD | 2 +- gerrit-pgm/BUILD | 2 +- gerrit-server/BUILD | 4 ++-- gerrit-sshd/BUILD | 2 +- {gerrit-util-cli => java/com/google/gerrit/util/cli}/BUILD | 2 +- .../com/google/gerrit/util/cli/CmdLineParser.java | 0 .../com/google/gerrit/util/cli/EndOfOptionsHandler.java | 0 .../com/google/gerrit/util/cli/OptionHandlerFactory.java | 0 .../com/google/gerrit/util/cli/OptionHandlerUtil.java | 0 .../com/google/gerrit/util/cli/OptionHandlers.java | 0 .../java => java}/com/google/gerrit/util/cli/Options.java | 0 12 files changed, 7 insertions(+), 7 deletions(-) rename {gerrit-util-cli => java/com/google/gerrit/util/cli}/BUILD (87%) rename {gerrit-util-cli/src/main/java => java}/com/google/gerrit/util/cli/CmdLineParser.java (100%) rename {gerrit-util-cli/src/main/java => java}/com/google/gerrit/util/cli/EndOfOptionsHandler.java (100%) rename {gerrit-util-cli/src/main/java => java}/com/google/gerrit/util/cli/OptionHandlerFactory.java (100%) rename {gerrit-util-cli/src/main/java => java}/com/google/gerrit/util/cli/OptionHandlerUtil.java (100%) rename {gerrit-util-cli/src/main/java => java}/com/google/gerrit/util/cli/OptionHandlers.java (100%) rename {gerrit-util-cli/src/main/java => java}/com/google/gerrit/util/cli/Options.java (100%) diff --git a/gerrit-gwtdebug/BUILD b/gerrit-gwtdebug/BUILD index 115c6b995b..fc21bd8781 100644 --- a/gerrit-gwtdebug/BUILD +++ b/gerrit-gwtdebug/BUILD @@ -6,7 +6,7 @@ java_library( "//gerrit-pgm:daemon", "//gerrit-pgm:pgm", "//gerrit-pgm:util", - "//gerrit-util-cli:cli", + "//java/com/google/gerrit/util/cli", "//lib/gwt:dev", "//lib/jetty:server", "//lib/jetty:servlet", diff --git a/gerrit-httpd/BUILD b/gerrit-httpd/BUILD index 180391f64f..a8165532b4 100644 --- a/gerrit-httpd/BUILD +++ b/gerrit-httpd/BUILD @@ -21,13 +21,13 @@ java_library( "//gerrit-server:metrics", "//gerrit-server:receive", "//gerrit-server:server", - "//gerrit-util-cli:cli", "//gerrit-util-http:http", "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/prettify:server", "//java/com/google/gerrit/reviewdb:server", + "//java/com/google/gerrit/util/cli", "//java/com/google/gwtexpui/linker:server", "//java/com/google/gwtexpui/server", "//java/org/eclipse/jgit:server", diff --git a/gerrit-pgm/BUILD b/gerrit-pgm/BUILD index f16f650f08..d581617d9e 100644 --- a/gerrit-pgm/BUILD +++ b/gerrit-pgm/BUILD @@ -65,7 +65,7 @@ java_library( REST_UTIL_DEPS = [ "//gerrit-cache-h2:cache-h2", - "//gerrit-util-cli:cli", + "//java/com/google/gerrit/util/cli", "//lib:args4j", "//lib/commons:dbcp", ] diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD index a7e7c2338b..ebde6e3f1b 100644 --- a/gerrit-server/BUILD +++ b/gerrit-server/BUILD @@ -43,13 +43,13 @@ java_library( "//gerrit-index:index", "//gerrit-index:query_exception", "//gerrit-patch-commonsnet:commons-net", - "//gerrit-util-cli:cli", "//gerrit-util-ssl:ssl", "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/prettify:server", "//java/com/google/gerrit/reviewdb:server", + "//java/com/google/gerrit/util/cli", "//java/org/eclipse/jgit:server", "//lib:args4j", "//lib:automaton", @@ -123,11 +123,11 @@ java_library( visibility = ["//visibility:public"], deps = [ ":server", - "//gerrit-util-cli:cli", "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/reviewdb:server", + "//java/com/google/gerrit/util/cli", "//lib:args4j", "//lib:guava", "//lib:gwtorm", diff --git a/gerrit-sshd/BUILD b/gerrit-sshd/BUILD index 47bd13899f..c264e4d6cb 100644 --- a/gerrit-sshd/BUILD +++ b/gerrit-sshd/BUILD @@ -12,11 +12,11 @@ java_library( "//gerrit-server:metrics", "//gerrit-server:receive", "//gerrit-server:server", - "//gerrit-util-cli:cli", "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/reviewdb:server", + "//java/com/google/gerrit/util/cli", "//java/org/eclipse/jgit:server", "//lib:args4j", "//lib:gson", diff --git a/gerrit-util-cli/BUILD b/java/com/google/gerrit/util/cli/BUILD similarity index 87% rename from gerrit-util-cli/BUILD rename to java/com/google/gerrit/util/cli/BUILD index 13d327c05f..91c14f72cf 100644 --- a/gerrit-util-cli/BUILD +++ b/java/com/google/gerrit/util/cli/BUILD @@ -1,6 +1,6 @@ java_library( name = "cli", - srcs = glob(["src/main/java/**/*.java"]), + srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ "//java/com/google/gerrit/common:annotations", diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java b/java/com/google/gerrit/util/cli/CmdLineParser.java similarity index 100% rename from gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java rename to java/com/google/gerrit/util/cli/CmdLineParser.java diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/EndOfOptionsHandler.java b/java/com/google/gerrit/util/cli/EndOfOptionsHandler.java similarity index 100% rename from gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/EndOfOptionsHandler.java rename to java/com/google/gerrit/util/cli/EndOfOptionsHandler.java diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerFactory.java b/java/com/google/gerrit/util/cli/OptionHandlerFactory.java similarity index 100% rename from gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerFactory.java rename to java/com/google/gerrit/util/cli/OptionHandlerFactory.java diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java b/java/com/google/gerrit/util/cli/OptionHandlerUtil.java similarity index 100% rename from gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlerUtil.java rename to java/com/google/gerrit/util/cli/OptionHandlerUtil.java diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlers.java b/java/com/google/gerrit/util/cli/OptionHandlers.java similarity index 100% rename from gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlers.java rename to java/com/google/gerrit/util/cli/OptionHandlers.java diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/Options.java b/java/com/google/gerrit/util/cli/Options.java similarity index 100% rename from gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/Options.java rename to java/com/google/gerrit/util/cli/Options.java