Isolate gerrit:server rule in gerrit/server package
Move c.g.g.rules and c.g.g.audit packages to c.g.g.server package to
reflect the real dependencies on server package for these clases.
This allows us to move server code related BUILD rules from general
package c.g.g to c.g.g.server package. With this small refactoring we
can achieve our goal having the BUILD files as close to the sources as
possible. Moreover, this non-intrusive change (no core plugins were
affected) significantly simplifies the whole build structure as this
allows us to eliminate BUILD rule in general c.g.g package.
Before this change a developer must study build files to actually
understand what parts of codes are controlled by c.g.g/BUILD build file.
With this change, it is obvious, because all BUILD files are located as
close as possible to the sources they control.
This changes also leaves place for improvement. At the moment, the
sources can be isolated from the giant java/com/google/gerrit/server
rules, the packages can be moved outside of c.g.g.server package and
de-coupled from java/com/google/gerrit/server rules, as it was already
done with receive, index, metrics and lifecycle packages. These future
and further decomposition of java/com/google/gerrit/server rule is
beyond of the scope of this change.
Change-Id: Iac35422bd9d6ad933c2dded2293c679cdd2aead5
diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD
index 49ddb7c..732c1f7 100644
--- a/java/com/google/gerrit/acceptance/BUILD
+++ b/java/com/google/gerrit/acceptance/BUILD
@@ -8,7 +8,6 @@
visibility = ["//visibility:public"],
exports = [
":framework-lib",
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@@ -23,6 +22,7 @@
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/pgm/util",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/git/receive",
"//java/com/google/gerrit/server/project/testing:project-test-util",
"//java/com/google/gerrit/sshd",
@@ -50,7 +50,6 @@
)
PROVIDED = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@@ -59,6 +58,7 @@
"//java/com/google/gerrit/lucene",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/server/git/receive",
"//lib:gson",
diff --git a/java/com/google/gerrit/elasticsearch/BUILD b/java/com/google/gerrit/elasticsearch/BUILD
index 2a49496..f6d4608 100644
--- a/java/com/google/gerrit/elasticsearch/BUILD
+++ b/java/com/google/gerrit/elasticsearch/BUILD
@@ -3,12 +3,12 @@
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/index",
"//java/com/google/gerrit/index:query_exception",
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//lib:gson",
"//lib:guava",
"//lib:gwtorm",
diff --git a/java/com/google/gerrit/gpg/BUILD b/java/com/google/gerrit/gpg/BUILD
index c9f1399..bd6edab 100644
--- a/java/com/google/gerrit/gpg/BUILD
+++ b/java/com/google/gerrit/gpg/BUILD
@@ -3,10 +3,10 @@
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//lib:guava",
"//lib:gwtorm",
"//lib/bouncycastle:bcpg-neverlink",
diff --git a/java/com/google/gerrit/httpd/BUILD b/java/com/google/gerrit/httpd/BUILD
index c651f84..c6aa2d7 100644
--- a/java/com/google/gerrit/httpd/BUILD
+++ b/java/com/google/gerrit/httpd/BUILD
@@ -5,7 +5,6 @@
resources = ["//resources/com/google/gerrit/httpd"],
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@@ -13,6 +12,7 @@
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/git/receive",
"//java/com/google/gerrit/util/cli",
"//java/com/google/gerrit/util/http",
diff --git a/java/com/google/gerrit/httpd/HttpLogoutServlet.java b/java/com/google/gerrit/httpd/HttpLogoutServlet.java
index eb77a30..39a39c6 100644
--- a/java/com/google/gerrit/httpd/HttpLogoutServlet.java
+++ b/java/com/google/gerrit/httpd/HttpLogoutServlet.java
@@ -15,12 +15,12 @@
package com.google.gerrit.httpd;
import com.google.common.base.Strings;
-import com.google.gerrit.audit.AuditEvent;
-import com.google.gerrit.audit.AuditService;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.server.CurrentUser;
+import com.google.gerrit.server.audit.AuditEvent;
+import com.google.gerrit.server.audit.AuditService;
import com.google.gerrit.server.config.AuthConfig;
import com.google.gerrit.server.config.CanonicalWebUrl;
import com.google.inject.Inject;
diff --git a/java/com/google/gerrit/httpd/auth/oauth/BUILD b/java/com/google/gerrit/httpd/auth/oauth/BUILD
index af0e3a7..aa63f0d 100644
--- a/java/com/google/gerrit/httpd/auth/oauth/BUILD
+++ b/java/com/google/gerrit/httpd/auth/oauth/BUILD
@@ -5,11 +5,11 @@
resources = ["//resources/com/google/gerrit/httpd/auth/oauth"],
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/httpd",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//lib:gson",
"//lib:guava",
"//lib:gwtorm",
diff --git a/java/com/google/gerrit/httpd/auth/oauth/OAuthLogoutServlet.java b/java/com/google/gerrit/httpd/auth/oauth/OAuthLogoutServlet.java
index 126a1d7..d25ff60 100644
--- a/java/com/google/gerrit/httpd/auth/oauth/OAuthLogoutServlet.java
+++ b/java/com/google/gerrit/httpd/auth/oauth/OAuthLogoutServlet.java
@@ -14,11 +14,11 @@
package com.google.gerrit.httpd.auth.oauth;
-import com.google.gerrit.audit.AuditService;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.httpd.HttpLogoutServlet;
import com.google.gerrit.httpd.WebSession;
+import com.google.gerrit.server.audit.AuditService;
import com.google.gerrit.server.config.AuthConfig;
import com.google.gerrit.server.config.CanonicalWebUrl;
import com.google.inject.Inject;
diff --git a/java/com/google/gerrit/httpd/auth/openid/BUILD b/java/com/google/gerrit/httpd/auth/openid/BUILD
index ae45439..44b7bd1 100644
--- a/java/com/google/gerrit/httpd/auth/openid/BUILD
+++ b/java/com/google/gerrit/httpd/auth/openid/BUILD
@@ -12,7 +12,7 @@
"//java/com/google/gerrit/httpd",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gwtexpui/server",
- "//java/com/google/gerrit:server",
+ "//java/com/google/gerrit/server",
"//lib:guava",
"//lib:gwtorm",
"//lib:servlet-api-3_1",
diff --git a/java/com/google/gerrit/httpd/auth/openid/OAuthOverOpenIDLogoutServlet.java b/java/com/google/gerrit/httpd/auth/openid/OAuthOverOpenIDLogoutServlet.java
index eecfb7f..8299c16 100644
--- a/java/com/google/gerrit/httpd/auth/openid/OAuthOverOpenIDLogoutServlet.java
+++ b/java/com/google/gerrit/httpd/auth/openid/OAuthOverOpenIDLogoutServlet.java
@@ -14,11 +14,11 @@
package com.google.gerrit.httpd.auth.openid;
-import com.google.gerrit.audit.AuditService;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.httpd.HttpLogoutServlet;
import com.google.gerrit.httpd.WebSession;
+import com.google.gerrit.server.audit.AuditService;
import com.google.gerrit.server.config.AuthConfig;
import com.google.gerrit.server.config.CanonicalWebUrl;
import com.google.inject.Inject;
diff --git a/java/com/google/gerrit/httpd/init/BUILD b/java/com/google/gerrit/httpd/init/BUILD
index cd80152..8e1f898 100644
--- a/java/com/google/gerrit/httpd/init/BUILD
+++ b/java/com/google/gerrit/httpd/init/BUILD
@@ -3,8 +3,6 @@
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:module",
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/elasticsearch",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/gpg",
@@ -17,6 +15,8 @@
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/pgm/util",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
+ "//java/com/google/gerrit/server:module",
"//java/com/google/gerrit/server/cache/h2",
"//java/com/google/gerrit/server/git/receive",
"//java/com/google/gerrit/sshd",
diff --git a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
index d1e4e889..ce8741c 100644
--- a/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
+++ b/java/com/google/gerrit/httpd/restapi/RestApiServlet.java
@@ -60,8 +60,6 @@
import com.google.common.io.CountingOutputStream;
import com.google.common.math.IntMath;
import com.google.common.net.HttpHeaders;
-import com.google.gerrit.audit.AuditService;
-import com.google.gerrit.audit.ExtendedHttpAuditEvent;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.RawInputUtil;
import com.google.gerrit.common.TimeUtil;
@@ -100,6 +98,8 @@
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.OptionUtil;
import com.google.gerrit.server.OutputFormat;
+import com.google.gerrit.server.audit.AuditService;
+import com.google.gerrit.server.audit.ExtendedHttpAuditEvent;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.permissions.GlobalPermission;
import com.google.gerrit.server.permissions.PermissionBackend;
diff --git a/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java b/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java
index 178cda9..0a6d05b 100644
--- a/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java
+++ b/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java
@@ -16,8 +16,6 @@
import com.google.common.collect.ListMultimap;
import com.google.common.collect.MultimapBuilder;
-import com.google.gerrit.audit.AuditService;
-import com.google.gerrit.audit.RpcAuditEvent;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.common.audit.Audit;
import com.google.gerrit.common.auth.SignInRequired;
@@ -26,6 +24,8 @@
import com.google.gerrit.httpd.WebSession;
import com.google.gerrit.server.AccessPath;
import com.google.gerrit.server.CurrentUser;
+import com.google.gerrit.server.audit.AuditService;
+import com.google.gerrit.server.audit.RpcAuditEvent;
import com.google.gson.GsonBuilder;
import com.google.gwtjsonrpc.common.RemoteJsonService;
import com.google.gwtjsonrpc.server.ActiveCall;
diff --git a/java/com/google/gerrit/lucene/BUILD b/java/com/google/gerrit/lucene/BUILD
index 80877c9..2254905 100644
--- a/java/com/google/gerrit/lucene/BUILD
+++ b/java/com/google/gerrit/lucene/BUILD
@@ -5,10 +5,10 @@
srcs = QUERY_BUILDER,
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/index",
"//java/com/google/gerrit/index:query_exception",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//lib:guava",
"//lib:gwtorm",
"//lib/lucene:lucene-core-and-backward-codecs",
@@ -24,7 +24,6 @@
visibility = ["//visibility:public"],
deps = [
":query_builder",
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@@ -32,6 +31,7 @@
"//java/com/google/gerrit/index:query_exception",
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//lib:guava",
"//lib:gwtorm",
"//lib/guice",
diff --git a/java/com/google/gerrit/metrics/dropwizard/BUILD b/java/com/google/gerrit/metrics/dropwizard/BUILD
index 54ae69e..9adb375 100644
--- a/java/com/google/gerrit/metrics/dropwizard/BUILD
+++ b/java/com/google/gerrit/metrics/dropwizard/BUILD
@@ -3,10 +3,10 @@
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/metrics",
+ "//java/com/google/gerrit/server",
"//lib:args4j",
"//lib:guava",
"//lib/dropwizard:dropwizard-core",
diff --git a/java/com/google/gerrit/pgm/BUILD b/java/com/google/gerrit/pgm/BUILD
index ff2c0e6..dce3ea1 100644
--- a/java/com/google/gerrit/pgm/BUILD
+++ b/java/com/google/gerrit/pgm/BUILD
@@ -15,8 +15,6 @@
resources = ["//resources/com/google/gerrit/pgm"],
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:module",
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/elasticsearch",
@@ -35,6 +33,8 @@
"//java/com/google/gerrit/pgm/init/api",
"//java/com/google/gerrit/pgm/util",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
+ "//java/com/google/gerrit/server:module",
"//java/com/google/gerrit/server/cache/h2",
"//java/com/google/gerrit/server/git/receive",
"//java/com/google/gerrit/sshd",
diff --git a/java/com/google/gerrit/pgm/http/jetty/BUILD b/java/com/google/gerrit/pgm/http/jetty/BUILD
index 0b3460a..86961d6 100644
--- a/java/com/google/gerrit/pgm/http/jetty/BUILD
+++ b/java/com/google/gerrit/pgm/http/jetty/BUILD
@@ -3,12 +3,12 @@
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/httpd",
"//java/com/google/gerrit/launcher",
"//java/com/google/gerrit/lifecycle",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/sshd",
"//java/com/google/gwtexpui/server",
"//lib:guava",
diff --git a/java/com/google/gerrit/pgm/init/BUILD b/java/com/google/gerrit/pgm/init/BUILD
index ea15e6b..ef3a063 100644
--- a/java/com/google/gerrit/pgm/init/BUILD
+++ b/java/com/google/gerrit/pgm/init/BUILD
@@ -5,7 +5,6 @@
resources = ["//resources/com/google/gerrit/pgm/init"],
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/elasticsearch",
@@ -17,6 +16,7 @@
"//java/com/google/gerrit/pgm/init/api",
"//java/com/google/gerrit/pgm/util",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//lib:guava",
"//lib:gwtjsonrpc",
"//lib:gwtorm",
diff --git a/java/com/google/gerrit/pgm/init/api/BUILD b/java/com/google/gerrit/pgm/init/api/BUILD
index fe476f1..d84261c 100644
--- a/java/com/google/gerrit/pgm/init/api/BUILD
+++ b/java/com/google/gerrit/pgm/init/api/BUILD
@@ -3,10 +3,10 @@
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//lib:guava",
"//lib:gwtorm",
"//lib/guice",
diff --git a/java/com/google/gerrit/pgm/util/BUILD b/java/com/google/gerrit/pgm/util/BUILD
index 53880ae..42cdf6f 100644
--- a/java/com/google/gerrit/pgm/util/BUILD
+++ b/java/com/google/gerrit/pgm/util/BUILD
@@ -3,14 +3,14 @@
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:module",
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/metrics/dropwizard",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
+ "//java/com/google/gerrit/server:module",
"//java/com/google/gerrit/server/cache/h2",
"//java/com/google/gerrit/server/git/receive",
"//java/com/google/gerrit/util/cli",
diff --git a/java/com/google/gerrit/pgm/util/BatchProgramModule.java b/java/com/google/gerrit/pgm/util/BatchProgramModule.java
index 32d8dd8..3fc2a4a 100644
--- a/java/com/google/gerrit/pgm/util/BatchProgramModule.java
+++ b/java/com/google/gerrit/pgm/util/BatchProgramModule.java
@@ -26,7 +26,6 @@
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.restapi.RestView;
import com.google.gerrit.reviewdb.client.AccountGroup;
-import com.google.gerrit.rules.PrologModule;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.AccountCacheImpl;
@@ -71,6 +70,7 @@
import com.google.gerrit.server.project.SubmitRuleEvaluator;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.query.change.ChangeQueryProcessor;
+import com.google.gerrit.server.rules.PrologModule;
import com.google.gerrit.server.update.BatchUpdate;
import com.google.inject.Inject;
import com.google.inject.Module;
diff --git a/java/com/google/gerrit/BUILD b/java/com/google/gerrit/server/BUILD
similarity index 89%
rename from java/com/google/gerrit/BUILD
rename to java/com/google/gerrit/server/BUILD
index 267a5de..46ba01b 100644
--- a/java/com/google/gerrit/BUILD
+++ b/java/com/google/gerrit/server/BUILD
@@ -1,14 +1,9 @@
-# TODO(davido): Consider to isolate former gerrit-server specific rules
-# in server directory. Otherwise it is hard to see the whole dependency
-# picture given that this file is located in com/google/gerrit, but only
-# controls three directory: audit, rules and server.
-
CONSTANTS_SRC = [
- "server/documentation/Constants.java",
+ "documentation/Constants.java",
]
GERRIT_GLOBAL_MODULE_SRC = [
- "server/config/GerritGlobalModule.java",
+ "config/GerritGlobalModule.java",
]
java_library(
@@ -30,7 +25,7 @@
exclude = CONSTANTS_SRC + GERRIT_GLOBAL_MODULE_SRC,
),
resource_strip_prefix = "resources",
- resources = ["//resources/com/google/gerrit:server"],
+ resources = ["//resources/com/google/gerrit/server"],
visibility = ["//visibility:public"],
deps = [
":constants",
diff --git a/java/com/google/gerrit/audit/AuditEvent.java b/java/com/google/gerrit/server/audit/AuditEvent.java
similarity index 98%
rename from java/com/google/gerrit/audit/AuditEvent.java
rename to java/com/google/gerrit/server/audit/AuditEvent.java
index 7a4e683..4abdfd9 100644
--- a/java/com/google/gerrit/audit/AuditEvent.java
+++ b/java/com/google/gerrit/server/audit/AuditEvent.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.audit;
+package com.google.gerrit.server.audit;
import com.google.auto.value.AutoValue;
import com.google.common.base.MoreObjects;
diff --git a/java/com/google/gerrit/audit/AuditListener.java b/java/com/google/gerrit/server/audit/AuditListener.java
similarity index 94%
rename from java/com/google/gerrit/audit/AuditListener.java
rename to java/com/google/gerrit/server/audit/AuditListener.java
index 8eb8ed4..3f8c298 100644
--- a/java/com/google/gerrit/audit/AuditListener.java
+++ b/java/com/google/gerrit/server/audit/AuditListener.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.audit;
+package com.google.gerrit.server.audit;
import com.google.gerrit.extensions.annotations.ExtensionPoint;
diff --git a/java/com/google/gerrit/audit/AuditModule.java b/java/com/google/gerrit/server/audit/AuditModule.java
similarity index 95%
rename from java/com/google/gerrit/audit/AuditModule.java
rename to java/com/google/gerrit/server/audit/AuditModule.java
index aedb8a7..c4d0f4d 100644
--- a/java/com/google/gerrit/audit/AuditModule.java
+++ b/java/com/google/gerrit/server/audit/AuditModule.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.audit;
+package com.google.gerrit.server.audit;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.inject.AbstractModule;
diff --git a/java/com/google/gerrit/audit/AuditService.java b/java/com/google/gerrit/server/audit/AuditService.java
similarity index 98%
rename from java/com/google/gerrit/audit/AuditService.java
rename to java/com/google/gerrit/server/audit/AuditService.java
index cc29559..b1ecb9b 100644
--- a/java/com/google/gerrit/audit/AuditService.java
+++ b/java/com/google/gerrit/server/audit/AuditService.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.audit;
+package com.google.gerrit.server.audit;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.reviewdb.client.Account;
diff --git a/java/com/google/gerrit/audit/ExtendedHttpAuditEvent.java b/java/com/google/gerrit/server/audit/ExtendedHttpAuditEvent.java
similarity index 97%
rename from java/com/google/gerrit/audit/ExtendedHttpAuditEvent.java
rename to java/com/google/gerrit/server/audit/ExtendedHttpAuditEvent.java
index 4db8a51..29629f0 100644
--- a/java/com/google/gerrit/audit/ExtendedHttpAuditEvent.java
+++ b/java/com/google/gerrit/server/audit/ExtendedHttpAuditEvent.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.audit;
+package com.google.gerrit.server.audit;
import com.google.common.base.Preconditions;
import com.google.common.collect.ListMultimap;
diff --git a/java/com/google/gerrit/audit/GroupMemberAuditListener.java b/java/com/google/gerrit/server/audit/GroupMemberAuditListener.java
similarity index 96%
rename from java/com/google/gerrit/audit/GroupMemberAuditListener.java
rename to java/com/google/gerrit/server/audit/GroupMemberAuditListener.java
index 0878499..9ac5994 100644
--- a/java/com/google/gerrit/audit/GroupMemberAuditListener.java
+++ b/java/com/google/gerrit/server/audit/GroupMemberAuditListener.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.audit;
+package com.google.gerrit.server.audit;
import com.google.gerrit.extensions.annotations.ExtensionPoint;
import com.google.gerrit.reviewdb.client.Account;
diff --git a/java/com/google/gerrit/audit/HttpAuditEvent.java b/java/com/google/gerrit/server/audit/HttpAuditEvent.java
similarity index 97%
rename from java/com/google/gerrit/audit/HttpAuditEvent.java
rename to java/com/google/gerrit/server/audit/HttpAuditEvent.java
index cd19606..11a6b63 100644
--- a/java/com/google/gerrit/audit/HttpAuditEvent.java
+++ b/java/com/google/gerrit/server/audit/HttpAuditEvent.java
@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.audit;
+package com.google.gerrit.server.audit;
import com.google.common.collect.ListMultimap;
import com.google.gerrit.server.CurrentUser;
diff --git a/java/com/google/gerrit/audit/RpcAuditEvent.java b/java/com/google/gerrit/server/audit/RpcAuditEvent.java
similarity index 97%
rename from java/com/google/gerrit/audit/RpcAuditEvent.java
rename to java/com/google/gerrit/server/audit/RpcAuditEvent.java
index f6b955c..6c53bb2 100644
--- a/java/com/google/gerrit/audit/RpcAuditEvent.java
+++ b/java/com/google/gerrit/server/audit/RpcAuditEvent.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.audit;
+package com.google.gerrit.server.audit;
import com.google.common.collect.ListMultimap;
import com.google.gerrit.server.CurrentUser;
diff --git a/java/com/google/gerrit/audit/SshAuditEvent.java b/java/com/google/gerrit/server/audit/SshAuditEvent.java
similarity index 95%
rename from java/com/google/gerrit/audit/SshAuditEvent.java
rename to java/com/google/gerrit/server/audit/SshAuditEvent.java
index 98cba09..89f01ac 100644
--- a/java/com/google/gerrit/audit/SshAuditEvent.java
+++ b/java/com/google/gerrit/server/audit/SshAuditEvent.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.audit;
+package com.google.gerrit.server.audit;
import com.google.common.collect.ListMultimap;
import com.google.gerrit.server.CurrentUser;
diff --git a/java/com/google/gerrit/server/cache/h2/BUILD b/java/com/google/gerrit/server/cache/h2/BUILD
index ba2f9e4..f8d0105 100644
--- a/java/com/google/gerrit/server/cache/h2/BUILD
+++ b/java/com/google/gerrit/server/cache/h2/BUILD
@@ -3,10 +3,10 @@
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/lifecycle",
+ "//java/com/google/gerrit/server",
"//lib:guava",
"//lib:h2",
"//lib/guice",
diff --git a/java/com/google/gerrit/server/change/TestSubmitRule.java b/java/com/google/gerrit/server/change/TestSubmitRule.java
index 1792c83..3b8d439 100644
--- a/java/com/google/gerrit/server/change/TestSubmitRule.java
+++ b/java/com/google/gerrit/server/change/TestSubmitRule.java
@@ -23,10 +23,10 @@
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.RestModifyView;
import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.rules.RulesCache;
import com.google.gerrit.server.account.AccountLoader;
import com.google.gerrit.server.project.SubmitRuleEvaluator;
import com.google.gerrit.server.query.change.ChangeData;
+import com.google.gerrit.server.rules.RulesCache;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
diff --git a/java/com/google/gerrit/server/change/TestSubmitType.java b/java/com/google/gerrit/server/change/TestSubmitType.java
index ca6f9cf..1d869a3 100644
--- a/java/com/google/gerrit/server/change/TestSubmitType.java
+++ b/java/com/google/gerrit/server/change/TestSubmitType.java
@@ -24,9 +24,9 @@
import com.google.gerrit.extensions.restapi.RestModifyView;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.rules.RulesCache;
import com.google.gerrit.server.project.SubmitRuleEvaluator;
import com.google.gerrit.server.query.change.ChangeData;
+import com.google.gerrit.server.rules.RulesCache;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
diff --git a/java/com/google/gerrit/server/config/GerritGlobalModule.java b/java/com/google/gerrit/server/config/GerritGlobalModule.java
index f8e5d3f..5382371 100644
--- a/java/com/google/gerrit/server/config/GerritGlobalModule.java
+++ b/java/com/google/gerrit/server/config/GerritGlobalModule.java
@@ -17,7 +17,6 @@
import static com.google.inject.Scopes.SINGLETON;
import com.google.common.cache.Cache;
-import com.google.gerrit.audit.AuditModule;
import com.google.gerrit.extensions.annotations.Exports;
import com.google.gerrit.extensions.api.changes.ActionVisitor;
import com.google.gerrit.extensions.api.projects.CommentLinkInfo;
@@ -69,8 +68,6 @@
import com.google.gerrit.extensions.webui.TagWebLink;
import com.google.gerrit.extensions.webui.TopMenu;
import com.google.gerrit.extensions.webui.WebUiPlugin;
-import com.google.gerrit.rules.PrologModule;
-import com.google.gerrit.rules.RulesCache;
import com.google.gerrit.server.AnonymousUser;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.ChangeFinder;
@@ -93,6 +90,7 @@
import com.google.gerrit.server.account.VersionedAuthorizedKeys;
import com.google.gerrit.server.account.externalids.ExternalIdModule;
import com.google.gerrit.server.api.accounts.AccountExternalIdCreator;
+import com.google.gerrit.server.audit.AuditModule;
import com.google.gerrit.server.auth.AuthBackend;
import com.google.gerrit.server.auth.UniversalAuthBackend;
import com.google.gerrit.server.auth.oauth.OAuthTokenCache;
@@ -172,6 +170,8 @@
import com.google.gerrit.server.query.change.ChangeQueryBuilder;
import com.google.gerrit.server.query.change.ChangeQueryProcessor;
import com.google.gerrit.server.query.change.ConflictsCacheImpl;
+import com.google.gerrit.server.rules.PrologModule;
+import com.google.gerrit.server.rules.RulesCache;
import com.google.gerrit.server.ssh.SshAddressesModule;
import com.google.gerrit.server.tools.ToolsCatalog;
import com.google.gerrit.server.update.BatchUpdate;
diff --git a/java/com/google/gerrit/server/git/receive/BUILD b/java/com/google/gerrit/server/git/receive/BUILD
index db7a0ba..52b2372 100644
--- a/java/com/google/gerrit/server/git/receive/BUILD
+++ b/java/com/google/gerrit/server/git/receive/BUILD
@@ -3,11 +3,11 @@
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//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/server",
"//java/com/google/gerrit/util/cli",
"//lib:args4j",
"//lib:guava",
diff --git a/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java b/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java
index 5af7ebd..2e203b3 100644
--- a/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java
+++ b/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java
@@ -15,7 +15,6 @@
package com.google.gerrit.server.group;
import com.google.common.base.Joiner;
-import com.google.gerrit.audit.GroupMemberAuditListener;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountGroup;
@@ -27,6 +26,7 @@
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.GroupCache;
import com.google.gerrit.server.account.UniversalGroupBackend;
+import com.google.gerrit.server.audit.GroupMemberAuditListener;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
diff --git a/java/com/google/gerrit/server/group/Module.java b/java/com/google/gerrit/server/group/Module.java
index 03eafc8..f14212d 100644
--- a/java/com/google/gerrit/server/group/Module.java
+++ b/java/com/google/gerrit/server/group/Module.java
@@ -18,11 +18,11 @@
import static com.google.gerrit.server.group.MemberResource.MEMBER_KIND;
import static com.google.gerrit.server.group.SubgroupResource.SUBGROUP_KIND;
-import com.google.gerrit.audit.GroupMemberAuditListener;
import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.restapi.RestApiModule;
import com.google.gerrit.server.IdentifiedUser;
+import com.google.gerrit.server.audit.GroupMemberAuditListener;
import com.google.gerrit.server.group.AddMembers.UpdateMember;
import com.google.gerrit.server.group.AddSubgroups.UpdateSubgroup;
import com.google.gerrit.server.group.DeleteMembers.DeleteMember;
diff --git a/java/com/google/gerrit/server/group/db/GroupsUpdate.java b/java/com/google/gerrit/server/group/db/GroupsUpdate.java
index 7df726f..79001d9 100644
--- a/java/com/google/gerrit/server/group/db/GroupsUpdate.java
+++ b/java/com/google/gerrit/server/group/db/GroupsUpdate.java
@@ -20,7 +20,6 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
-import com.google.gerrit.audit.AuditService;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.errors.NameAlreadyUsedException;
import com.google.gerrit.common.errors.NoSuchGroupException;
@@ -34,6 +33,7 @@
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.GroupCache;
import com.google.gerrit.server.account.GroupIncludeCache;
+import com.google.gerrit.server.audit.AuditService;
import com.google.gerrit.server.git.RenameGroupOp;
import com.google.gerrit.server.group.InternalGroup;
import com.google.gwtorm.server.OrmException;
diff --git a/java/com/google/gerrit/server/project/ProjectState.java b/java/com/google/gerrit/server/project/ProjectState.java
index bd6386c..3c55baf 100644
--- a/java/com/google/gerrit/server/project/ProjectState.java
+++ b/java/com/google/gerrit/server/project/ProjectState.java
@@ -36,8 +36,6 @@
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
-import com.google.gerrit.rules.PrologEnvironment;
-import com.google.gerrit.rules.RulesCache;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.CapabilityCollection;
import com.google.gerrit.server.config.AllProjectsName;
@@ -48,6 +46,8 @@
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.git.ProjectLevelConfig;
import com.google.gerrit.server.notedb.ChangeNotes;
+import com.google.gerrit.server.rules.PrologEnvironment;
+import com.google.gerrit.server.rules.RulesCache;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import com.googlecode.prolog_cafe.exceptions.CompileException;
diff --git a/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java b/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java
index 9a6776c..398abd5 100644
--- a/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java
+++ b/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java
@@ -24,13 +24,13 @@
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
-import com.google.gerrit.rules.PrologEnvironment;
-import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.Accounts;
import com.google.gerrit.server.account.Emails;
import com.google.gerrit.server.query.change.ChangeData;
+import com.google.gerrit.server.rules.PrologEnvironment;
+import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
diff --git a/java/com/google/gerrit/server/project/testing/BUILD b/java/com/google/gerrit/server/project/testing/BUILD
index 683e678..ca1ffae 100644
--- a/java/com/google/gerrit/server/project/testing/BUILD
+++ b/java/com/google/gerrit/server/project/testing/BUILD
@@ -4,8 +4,8 @@
srcs = glob(["*.java"]),
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
],
)
diff --git a/java/com/google/gerrit/rules/PredicateClassLoader.java b/java/com/google/gerrit/server/rules/PredicateClassLoader.java
similarity index 97%
rename from java/com/google/gerrit/rules/PredicateClassLoader.java
rename to java/com/google/gerrit/server/rules/PredicateClassLoader.java
index 3478694..2589253 100644
--- a/java/com/google/gerrit/rules/PredicateClassLoader.java
+++ b/java/com/google/gerrit/server/rules/PredicateClassLoader.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.rules;
+package com.google.gerrit.server.rules;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.SetMultimap;
diff --git a/java/com/google/gerrit/rules/PredicateProvider.java b/java/com/google/gerrit/server/rules/PredicateProvider.java
similarity index 96%
rename from java/com/google/gerrit/rules/PredicateProvider.java
rename to java/com/google/gerrit/server/rules/PredicateProvider.java
index c64bc92..57ca7cd 100644
--- a/java/com/google/gerrit/rules/PredicateProvider.java
+++ b/java/com/google/gerrit/server/rules/PredicateProvider.java
@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.rules;
+package com.google.gerrit.server.rules;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.extensions.annotations.ExtensionPoint;
diff --git a/java/com/google/gerrit/rules/PrologEnvironment.java b/java/com/google/gerrit/server/rules/PrologEnvironment.java
similarity index 99%
rename from java/com/google/gerrit/rules/PrologEnvironment.java
rename to java/com/google/gerrit/server/rules/PrologEnvironment.java
index 36cb4cc..170ff23 100644
--- a/java/com/google/gerrit/rules/PrologEnvironment.java
+++ b/java/com/google/gerrit/server/rules/PrologEnvironment.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.rules;
+package com.google.gerrit.server.rules;
import com.google.gerrit.server.AnonymousUser;
import com.google.gerrit.server.IdentifiedUser;
diff --git a/java/com/google/gerrit/rules/PrologModule.java b/java/com/google/gerrit/server/rules/PrologModule.java
similarity index 96%
rename from java/com/google/gerrit/rules/PrologModule.java
rename to java/com/google/gerrit/server/rules/PrologModule.java
index 7ed048b..1a8b46c 100644
--- a/java/com/google/gerrit/rules/PrologModule.java
+++ b/java/com/google/gerrit/server/rules/PrologModule.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.rules;
+package com.google.gerrit.server.rules;
import com.google.gerrit.extensions.config.FactoryModule;
import com.google.gerrit.extensions.registration.DynamicSet;
diff --git a/java/com/google/gerrit/rules/RulesCache.java b/java/com/google/gerrit/server/rules/RulesCache.java
similarity index 99%
rename from java/com/google/gerrit/rules/RulesCache.java
rename to java/com/google/gerrit/server/rules/RulesCache.java
index 9ab0dd6..d7a614d 100644
--- a/java/com/google/gerrit/rules/RulesCache.java
+++ b/java/com/google/gerrit/server/rules/RulesCache.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.rules;
+package com.google.gerrit.server.rules;
import static com.googlecode.prolog_cafe.lang.PrologMachineCopy.save;
diff --git a/java/com/google/gerrit/rules/StoredValue.java b/java/com/google/gerrit/server/rules/StoredValue.java
similarity index 98%
rename from java/com/google/gerrit/rules/StoredValue.java
rename to java/com/google/gerrit/server/rules/StoredValue.java
index 461f3ab..c3bc53f 100644
--- a/java/com/google/gerrit/rules/StoredValue.java
+++ b/java/com/google/gerrit/server/rules/StoredValue.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.rules;
+package com.google.gerrit.server.rules;
import com.googlecode.prolog_cafe.exceptions.SystemException;
import com.googlecode.prolog_cafe.lang.Prolog;
diff --git a/java/com/google/gerrit/rules/StoredValues.java b/java/com/google/gerrit/server/rules/StoredValues.java
similarity index 98%
rename from java/com/google/gerrit/rules/StoredValues.java
rename to java/com/google/gerrit/server/rules/StoredValues.java
index 89fedda..287845d 100644
--- a/java/com/google/gerrit/rules/StoredValues.java
+++ b/java/com/google/gerrit/server/rules/StoredValues.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.rules;
+package com.google.gerrit.server.rules;
-import static com.google.gerrit.rules.StoredValue.create;
+import static com.google.gerrit.server.rules.StoredValue.create;
import com.google.gerrit.extensions.client.DiffPreferencesInfo.Whitespace;
import com.google.gerrit.reviewdb.client.Account;
diff --git a/java/com/google/gerrit/sshd/BUILD b/java/com/google/gerrit/sshd/BUILD
index 0538872..0de5377 100644
--- a/java/com/google/gerrit/sshd/BUILD
+++ b/java/com/google/gerrit/sshd/BUILD
@@ -3,7 +3,6 @@
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@@ -11,6 +10,7 @@
"//java/com/google/gerrit/lucene",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/cache/h2",
"//java/com/google/gerrit/server/git/receive",
"//java/com/google/gerrit/util/cli",
diff --git a/java/com/google/gerrit/sshd/SshLog.java b/java/com/google/gerrit/sshd/SshLog.java
index 12064c8..869c3bc 100644
--- a/java/com/google/gerrit/sshd/SshLog.java
+++ b/java/com/google/gerrit/sshd/SshLog.java
@@ -16,13 +16,13 @@
import com.google.common.collect.ListMultimap;
import com.google.common.collect.MultimapBuilder;
-import com.google.gerrit.audit.AuditService;
-import com.google.gerrit.audit.SshAuditEvent;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.PeerDaemonUser;
+import com.google.gerrit.server.audit.AuditService;
+import com.google.gerrit.server.audit.SshAuditEvent;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.util.IdGenerator;
import com.google.gerrit.server.util.SystemLog;
diff --git a/java/com/google/gerrit/testing/BUILD b/java/com/google/gerrit/testing/BUILD
index 6457770..e8d20d0 100644
--- a/java/com/google/gerrit/testing/BUILD
+++ b/java/com/google/gerrit/testing/BUILD
@@ -12,8 +12,6 @@
"//lib/powermock:powermock-module-junit4-common",
],
deps = [
- "//java/com/google/gerrit:module",
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@@ -23,6 +21,8 @@
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
+ "//java/com/google/gerrit/server:module",
"//java/com/google/gerrit/server/cache/h2",
"//lib:gwtorm",
"//lib:h2",
diff --git a/java/gerrit/BUILD b/java/gerrit/BUILD
index be41406..980ad23 100644
--- a/java/gerrit/BUILD
+++ b/java/gerrit/BUILD
@@ -3,10 +3,10 @@
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//lib:gwtorm",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/log:api",
diff --git a/java/gerrit/PRED__load_commit_labels_1.java b/java/gerrit/PRED__load_commit_labels_1.java
index 5a3d656..1d0ba8a 100644
--- a/java/gerrit/PRED__load_commit_labels_1.java
+++ b/java/gerrit/PRED__load_commit_labels_1.java
@@ -5,8 +5,8 @@
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelTypes;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
-import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.query.change.ChangeData;
+import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
diff --git a/java/gerrit/PRED_change_branch_1.java b/java/gerrit/PRED_change_branch_1.java
index f050c7f..0a7bb74 100644
--- a/java/gerrit/PRED_change_branch_1.java
+++ b/java/gerrit/PRED_change_branch_1.java
@@ -15,7 +15,7 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Branch;
-import com.google.gerrit.rules.StoredValues;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Predicate;
diff --git a/java/gerrit/PRED_change_owner_1.java b/java/gerrit/PRED_change_owner_1.java
index b9dac68..937b761 100644
--- a/java/gerrit/PRED_change_owner_1.java
+++ b/java/gerrit/PRED_change_owner_1.java
@@ -15,7 +15,7 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.rules.StoredValues;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
import com.googlecode.prolog_cafe.lang.Operation;
diff --git a/java/gerrit/PRED_change_project_1.java b/java/gerrit/PRED_change_project_1.java
index 568ef2b..28e637a 100644
--- a/java/gerrit/PRED_change_project_1.java
+++ b/java/gerrit/PRED_change_project_1.java
@@ -15,7 +15,7 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.rules.StoredValues;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Predicate;
diff --git a/java/gerrit/PRED_change_topic_1.java b/java/gerrit/PRED_change_topic_1.java
index 534d097..564878f 100644
--- a/java/gerrit/PRED_change_topic_1.java
+++ b/java/gerrit/PRED_change_topic_1.java
@@ -15,7 +15,7 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.rules.StoredValues;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Predicate;
diff --git a/java/gerrit/PRED_commit_author_3.java b/java/gerrit/PRED_commit_author_3.java
index 51d0913..a876b5e 100644
--- a/java/gerrit/PRED_commit_author_3.java
+++ b/java/gerrit/PRED_commit_author_3.java
@@ -16,7 +16,7 @@
import com.google.gerrit.reviewdb.client.PatchSetInfo;
import com.google.gerrit.reviewdb.client.UserIdentity;
-import com.google.gerrit.rules.StoredValues;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Prolog;
diff --git a/java/gerrit/PRED_commit_committer_3.java b/java/gerrit/PRED_commit_committer_3.java
index 7fa9ff4..b24b004 100644
--- a/java/gerrit/PRED_commit_committer_3.java
+++ b/java/gerrit/PRED_commit_committer_3.java
@@ -16,7 +16,7 @@
import com.google.gerrit.reviewdb.client.PatchSetInfo;
import com.google.gerrit.reviewdb.client.UserIdentity;
-import com.google.gerrit.rules.StoredValues;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Prolog;
diff --git a/java/gerrit/PRED_commit_delta_4.java b/java/gerrit/PRED_commit_delta_4.java
index 97e5219..7c26632 100644
--- a/java/gerrit/PRED_commit_delta_4.java
+++ b/java/gerrit/PRED_commit_delta_4.java
@@ -15,9 +15,9 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Patch;
-import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.patch.PatchList;
import com.google.gerrit.server.patch.PatchListEntry;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.IllegalTypeException;
import com.googlecode.prolog_cafe.exceptions.PInstantiationException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
diff --git a/java/gerrit/PRED_commit_edits_2.java b/java/gerrit/PRED_commit_edits_2.java
index 95c4aaef..0490429 100644
--- a/java/gerrit/PRED_commit_edits_2.java
+++ b/java/gerrit/PRED_commit_edits_2.java
@@ -14,10 +14,10 @@
package gerrit;
-import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.patch.PatchList;
import com.google.gerrit.server.patch.PatchListEntry;
import com.google.gerrit.server.patch.Text;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.IllegalTypeException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PInstantiationException;
diff --git a/java/gerrit/PRED_commit_message_1.java b/java/gerrit/PRED_commit_message_1.java
index 16a5b13..c5aa367 100644
--- a/java/gerrit/PRED_commit_message_1.java
+++ b/java/gerrit/PRED_commit_message_1.java
@@ -15,7 +15,7 @@
package gerrit;
import com.google.gerrit.reviewdb.client.PatchSetInfo;
-import com.google.gerrit.rules.StoredValues;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Predicate;
diff --git a/java/gerrit/PRED_commit_stats_3.java b/java/gerrit/PRED_commit_stats_3.java
index 6ed82e5..c1666d8 100644
--- a/java/gerrit/PRED_commit_stats_3.java
+++ b/java/gerrit/PRED_commit_stats_3.java
@@ -15,9 +15,9 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Patch;
-import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.patch.PatchList;
import com.google.gerrit.server.patch.PatchListEntry;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
import com.googlecode.prolog_cafe.lang.Operation;
diff --git a/java/gerrit/PRED_current_user_1.java b/java/gerrit/PRED_current_user_1.java
index 6dc1e52..c7d381d 100644
--- a/java/gerrit/PRED_current_user_1.java
+++ b/java/gerrit/PRED_current_user_1.java
@@ -15,10 +15,10 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.AnonymousUser;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.PeerDaemonUser;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.EvaluationException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
diff --git a/java/gerrit/PRED_current_user_2.java b/java/gerrit/PRED_current_user_2.java
index 7da1ce8..4815b9f 100644
--- a/java/gerrit/PRED_current_user_2.java
+++ b/java/gerrit/PRED_current_user_2.java
@@ -17,10 +17,10 @@
import static com.googlecode.prolog_cafe.lang.SymbolTerm.intern;
import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.rules.PrologEnvironment;
-import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
+import com.google.gerrit.server.rules.PrologEnvironment;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.IllegalTypeException;
import com.googlecode.prolog_cafe.exceptions.PInstantiationException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
diff --git a/java/gerrit/PRED_get_legacy_label_types_1.java b/java/gerrit/PRED_get_legacy_label_types_1.java
index 2c76999..ef79e05 100644
--- a/java/gerrit/PRED_get_legacy_label_types_1.java
+++ b/java/gerrit/PRED_get_legacy_label_types_1.java
@@ -16,7 +16,7 @@
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelValue;
-import com.google.gerrit.rules.StoredValues;
+import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
diff --git a/java/gerrit/PRED_project_default_submit_type_1.java b/java/gerrit/PRED_project_default_submit_type_1.java
index 1d96433..91db57e 100644
--- a/java/gerrit/PRED_project_default_submit_type_1.java
+++ b/java/gerrit/PRED_project_default_submit_type_1.java
@@ -15,8 +15,8 @@
package gerrit;
import com.google.gerrit.extensions.client.SubmitType;
-import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.project.ProjectState;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Predicate;
diff --git a/java/gerrit/PRED_pure_revert_1.java b/java/gerrit/PRED_pure_revert_1.java
index f3721fb..95a0729 100644
--- a/java/gerrit/PRED_pure_revert_1.java
+++ b/java/gerrit/PRED_pure_revert_1.java
@@ -14,7 +14,7 @@
package gerrit;
-import com.google.gerrit.rules.StoredValues;
+import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
diff --git a/java/gerrit/PRED_unresolved_comments_count_1.java b/java/gerrit/PRED_unresolved_comments_count_1.java
index 10d5520..5ed1525 100644
--- a/java/gerrit/PRED_unresolved_comments_count_1.java
+++ b/java/gerrit/PRED_unresolved_comments_count_1.java
@@ -14,7 +14,7 @@
package gerrit;
-import com.google.gerrit.rules.StoredValues;
+import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
diff --git a/java/gerrit/PRED_uploader_1.java b/java/gerrit/PRED_uploader_1.java
index 77d31d9..bf1bf27 100644
--- a/java/gerrit/PRED_uploader_1.java
+++ b/java/gerrit/PRED_uploader_1.java
@@ -16,7 +16,7 @@
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.PatchSet;
-import com.google.gerrit.rules.StoredValues;
+import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
import com.googlecode.prolog_cafe.lang.Operation;
diff --git a/javatests/com/google/gerrit/acceptance/api/group/BUILD b/javatests/com/google/gerrit/acceptance/api/group/BUILD
index 67412e8..32a74d9 100644
--- a/javatests/com/google/gerrit/acceptance/api/group/BUILD
+++ b/javatests/com/google/gerrit/acceptance/api/group/BUILD
@@ -14,9 +14,9 @@
name = "util",
srcs = ["GroupAssert.java"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//lib:gwtorm",
"//lib:truth",
],
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/BUILD b/javatests/com/google/gerrit/acceptance/rest/project/BUILD
index 7d43a60..0720fb3 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/BUILD
+++ b/javatests/com/google/gerrit/acceptance/rest/project/BUILD
@@ -17,7 +17,6 @@
"RefAssert.java",
],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/extensions:api",
"//lib:truth",
],
@@ -29,9 +28,9 @@
"ProjectAssert.java",
],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//lib:gwtorm",
"//lib:truth",
],
diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD
index 546d464..539e9fb 100644
--- a/javatests/com/google/gerrit/elasticsearch/BUILD
+++ b/javatests/com/google/gerrit/elasticsearch/BUILD
@@ -5,11 +5,11 @@
testonly = 1,
srcs = ["ElasticTestUtils.java"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/elasticsearch",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/index",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//lib:gson",
"//lib:guava",
"//lib:junit",
@@ -29,11 +29,11 @@
],
deps = [
":elasticsearch_test_utils",
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/elasticsearch",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/project/testing:project-test-util",
"//java/com/google/gerrit/testing:gerrit-test-util",
- "//javatests/com/google/gerrit:query_tests_code",
+ "//javatests/com/google/gerrit/server:query_tests_code",
"//lib/guice",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/jgit/org.eclipse.jgit.junit:junit",
diff --git a/javatests/com/google/gerrit/gpg/BUILD b/javatests/com/google/gerrit/gpg/BUILD
index 1c5c5a9..0c82c09 100644
--- a/javatests/com/google/gerrit/gpg/BUILD
+++ b/javatests/com/google/gerrit/gpg/BUILD
@@ -5,7 +5,6 @@
srcs = glob(["**/*.java"]),
visibility = ["//visibility:public"],
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/gpg",
@@ -13,6 +12,7 @@
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/lucene",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/cache/h2",
"//java/com/google/gerrit/server/project/testing:project-test-util",
"//java/com/google/gerrit/testing:gerrit-test-util",
diff --git a/javatests/com/google/gerrit/httpd/BUILD b/javatests/com/google/gerrit/httpd/BUILD
index e6dc71c..e2f2a45 100644
--- a/javatests/com/google/gerrit/httpd/BUILD
+++ b/javatests/com/google/gerrit/httpd/BUILD
@@ -4,12 +4,12 @@
name = "httpd_tests",
srcs = glob(["**/*.java"]),
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/httpd",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/util/http",
"//javatests/com/google/gerrit/util/http/testutil",
"//lib:gson",
diff --git a/javatests/com/google/gerrit/pgm/BUILD b/javatests/com/google/gerrit/pgm/BUILD
index aad8b14..af0bea6 100644
--- a/javatests/com/google/gerrit/pgm/BUILD
+++ b/javatests/com/google/gerrit/pgm/BUILD
@@ -5,12 +5,12 @@
name = "pgm_tests",
srcs = glob(["**/*.java"]),
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/pgm",
"//java/com/google/gerrit/pgm/http",
"//java/com/google/gerrit/pgm/init",
"//java/com/google/gerrit/pgm/init/api",
+ "//java/com/google/gerrit/server",
"//lib:guava",
"//lib:junit",
"//lib:truth",
diff --git a/javatests/com/google/gerrit/BUILD b/javatests/com/google/gerrit/server/BUILD
similarity index 92%
rename from javatests/com/google/gerrit/BUILD
rename to javatests/com/google/gerrit/server/BUILD
index 115ada8..e51a330 100644
--- a/javatests/com/google/gerrit/BUILD
+++ b/javatests/com/google/gerrit/server/BUILD
@@ -1,8 +1,6 @@
load("//tools/bzl:junit.bzl", "junit_tests")
TESTUTIL_DEPS = [
- "//java/com/google/gerrit:module",
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:annotations",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
@@ -10,6 +8,8 @@
"//java/com/google/gerrit/lifecycle",
"//java/com/google/gerrit/metrics",
"//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/server",
+ "//java/com/google/gerrit/server:module",
"//java/com/google/gerrit/server/cache/h2",
"//java/com/google/gerrit/index",
"//java/com/google/gerrit/lucene",
@@ -26,7 +26,7 @@
]
CUSTOM_TRUTH_SUBJECTS = glob([
- "server/**/*Subject.java",
+ "**/*Subject.java",
])
java_library(
@@ -34,8 +34,8 @@
testonly = 1,
srcs = CUSTOM_TRUTH_SUBJECTS,
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/extensions:api",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/truth",
"//lib:truth",
],
@@ -55,9 +55,9 @@
testonly = 1,
srcs = PROLOG_TEST_CASE,
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/extensions:api",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:guava",
"//lib:junit",
@@ -82,7 +82,7 @@
)
QUERY_TESTS = glob(
- ["server/query/**/*.java"],
+ ["query/**/*.java"],
)
java_library(
@@ -115,7 +115,7 @@
exclude = CUSTOM_TRUTH_SUBJECTS + PROLOG_TESTS + PROLOG_TEST_CASE + QUERY_TESTS,
),
resource_strip_prefix = "resources",
- resources = ["//resources/com/google/gerrit:server"],
+ resources = ["//resources/com/google/gerrit/server"],
visibility = ["//visibility:public"],
deps = TESTUTIL_DEPS + [
":custom-truth-subjects",
diff --git a/javatests/com/google/gerrit/server/cache/h2/BUILD b/javatests/com/google/gerrit/server/cache/h2/BUILD
index 117e8fa..0ac4aef 100644
--- a/javatests/com/google/gerrit/server/cache/h2/BUILD
+++ b/javatests/com/google/gerrit/server/cache/h2/BUILD
@@ -4,7 +4,7 @@
name = "tests",
srcs = glob(["**/*.java"]),
deps = [
- "//java/com/google/gerrit:server",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/server/cache/h2",
"//lib:guava",
"//lib:h2",
diff --git a/javatests/com/google/gerrit/server/project/RefControlTest.java b/javatests/com/google/gerrit/server/project/RefControlTest.java
index 9eca5250..9f70e3d 100644
--- a/javatests/com/google/gerrit/server/project/RefControlTest.java
+++ b/javatests/com/google/gerrit/server/project/RefControlTest.java
@@ -43,8 +43,6 @@
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.rules.PrologEnvironment;
-import com.google.gerrit.rules.RulesCache;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.CapabilityCollection;
import com.google.gerrit.server.account.GroupMembership;
@@ -60,6 +58,8 @@
import com.google.gerrit.server.permissions.ProjectPermission;
import com.google.gerrit.server.permissions.RefPermission;
import com.google.gerrit.server.project.testing.Util;
+import com.google.gerrit.server.rules.PrologEnvironment;
+import com.google.gerrit.server.rules.RulesCache;
import com.google.gerrit.server.schema.SchemaCreator;
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
diff --git a/javatests/com/google/gerrit/rules/GerritCommonTest.java b/javatests/com/google/gerrit/server/rules/GerritCommonTest.java
similarity index 98%
rename from javatests/com/google/gerrit/rules/GerritCommonTest.java
rename to javatests/com/google/gerrit/server/rules/GerritCommonTest.java
index 67c646a..152b057 100644
--- a/javatests/com/google/gerrit/rules/GerritCommonTest.java
+++ b/javatests/com/google/gerrit/server/rules/GerritCommonTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.rules;
+package com.google.gerrit.server.rules;
import static org.easymock.EasyMock.expect;
diff --git a/javatests/com/google/gerrit/rules/PrologTestCase.java b/javatests/com/google/gerrit/server/rules/PrologTestCase.java
similarity index 99%
rename from javatests/com/google/gerrit/rules/PrologTestCase.java
rename to javatests/com/google/gerrit/server/rules/PrologTestCase.java
index 5908127..5fc6ce7 100644
--- a/javatests/com/google/gerrit/rules/PrologTestCase.java
+++ b/javatests/com/google/gerrit/server/rules/PrologTestCase.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.gerrit.rules;
+package com.google.gerrit.server.rules;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
diff --git a/javatests/com/google/gerrit/sshd/BUILD b/javatests/com/google/gerrit/sshd/BUILD
index ee757e1..c0eaedf 100644
--- a/javatests/com/google/gerrit/sshd/BUILD
+++ b/javatests/com/google/gerrit/sshd/BUILD
@@ -4,8 +4,8 @@
name = "sshd_tests",
srcs = glob(["**/*.java"]),
deps = [
- "//java/com/google/gerrit:server",
"//java/com/google/gerrit/extensions:api",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/sshd",
"//lib:truth",
"//lib/mina:sshd",
diff --git a/javatests/com/google/gerrit/testing/BUILD b/javatests/com/google/gerrit/testing/BUILD
index 9c3d6a2..191e98f 100644
--- a/javatests/com/google/gerrit/testing/BUILD
+++ b/javatests/com/google/gerrit/testing/BUILD
@@ -5,7 +5,7 @@
size = "small",
srcs = glob(["*.java"]),
deps = [
- "//java/com/google/gerrit:server",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/testing:gerrit-test-util",
"//lib:truth",
],
diff --git a/lib/asciidoctor/BUILD b/lib/asciidoctor/BUILD
index 611a40c..da05dd1 100644
--- a/lib/asciidoctor/BUILD
+++ b/lib/asciidoctor/BUILD
@@ -31,7 +31,7 @@
visibility = ["//visibility:public"],
deps = [
":asciidoc_lib",
- "//java/com/google/gerrit:constants",
+ "//java/com/google/gerrit/server:constants",
"//lib:args4j",
"//lib:guava",
"//lib/lucene:lucene-analyzers-common",
diff --git a/plugins/BUILD b/plugins/BUILD
index 14de69a..92a4c10 100644
--- a/plugins/BUILD
+++ b/plugins/BUILD
@@ -18,7 +18,7 @@
)
PLUGIN_API = [
- "//java/com/google/gerrit:server",
+ "//java/com/google/gerrit/server",
"//java/com/google/gerrit/pgm/init/api",
"//java/com/google/gerrit/httpd",
"//java/com/google/gerrit/sshd",
@@ -96,7 +96,6 @@
main_class = "Dummy",
visibility = ["//visibility:public"],
runtime_deps = [
- "//java/com/google/gerrit:libserver-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",
@@ -106,6 +105,7 @@
"//java/com/google/gerrit/index:libquery_parser-src.jar",
"//java/com/google/gerrit/pgm/init/api:libapi-src.jar",
"//java/com/google/gerrit/reviewdb:libserver-src.jar",
+ "//java/com/google/gerrit/server:libserver-src.jar",
"//java/com/google/gerrit/sshd:libsshd-src.jar",
"//java/com/google/gwtexpui/server:libserver-src.jar",
],
diff --git a/prologtests/BUILD b/prologtests/BUILD
index 89f83cc..279dbb7 100644
--- a/prologtests/BUILD
+++ b/prologtests/BUILD
@@ -1,5 +1,5 @@
filegroup(
name = "gerrit_common_test",
- srcs = ["com/google/gerrit/rules/gerrit_common_test.pl"],
+ srcs = ["com/google/gerrit/server/rules/gerrit_common_test.pl"],
visibility = ["//visibility:public"],
)
diff --git a/prologtests/com/google/gerrit/rules/gerrit_common_test.pl b/prologtests/com/google/gerrit/server/rules/gerrit_common_test.pl
similarity index 100%
rename from prologtests/com/google/gerrit/rules/gerrit_common_test.pl
rename to prologtests/com/google/gerrit/server/rules/gerrit_common_test.pl
diff --git a/resources/com/google/gerrit/BUILD b/resources/com/google/gerrit/server/BUILD
similarity index 100%
rename from resources/com/google/gerrit/BUILD
rename to resources/com/google/gerrit/server/BUILD
diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD
index 7ad0323..990d604 100644
--- a/tools/eclipse/BUILD
+++ b/tools/eclipse/BUILD
@@ -17,7 +17,7 @@
"//gerrit-gwtui:ui_module",
"//gerrit-plugin-gwtui:gwtui-api-lib",
"//java/com/google/gerrit/acceptance:lib",
- "//java/com/google/gerrit:server",
+ "//java/com/google/gerrit/server",
"//lib/asciidoctor:asciidoc_lib",
"//lib/asciidoctor:doc_indexer_lib",
"//lib/auto:auto-value",
