From 3d6cf9b6ccf6bb36fb989b257171e6a0cea2fe70 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Tue, 22 Aug 2017 09:11:42 +0200 Subject: [PATCH] Extract prolog predicates from gerrit-server:server rule Change-Id: I52a22035f7b0189c6d1e21cf05c85901c5235853 --- .../AbstractCommitUserIdentityPredicate.java | 0 java/gerrit/BUILD | 15 +++++++++++++++ .../gerrit/PRED__load_commit_labels_1.java | 0 .../gerrit/PRED_change_branch_1.java | 0 .../java => java}/gerrit/PRED_change_owner_1.java | 0 .../gerrit/PRED_change_project_1.java | 0 .../java => java}/gerrit/PRED_change_topic_1.java | 0 .../gerrit/PRED_commit_author_3.java | 0 .../gerrit/PRED_commit_committer_3.java | 0 .../java => java}/gerrit/PRED_commit_delta_4.java | 0 .../java => java}/gerrit/PRED_commit_edits_2.java | 0 .../gerrit/PRED_commit_message_1.java | 0 .../java => java}/gerrit/PRED_commit_stats_3.java | 0 .../java => java}/gerrit/PRED_current_user_1.java | 0 .../java => java}/gerrit/PRED_current_user_2.java | 0 .../gerrit/PRED_get_legacy_label_types_1.java | 0 .../PRED_project_default_submit_type_1.java | 0 .../gerrit/PRED_unresolved_comments_count_1.java | 0 .../java => java}/gerrit/PRED_uploader_1.java | 0 prolog/BUILD | 2 +- 20 files changed, 16 insertions(+), 1 deletion(-) rename {gerrit-server/src/main/java => java}/gerrit/AbstractCommitUserIdentityPredicate.java (100%) create mode 100644 java/gerrit/BUILD rename {gerrit-server/src/main/java => java}/gerrit/PRED__load_commit_labels_1.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_change_branch_1.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_change_owner_1.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_change_project_1.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_change_topic_1.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_commit_author_3.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_commit_committer_3.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_commit_delta_4.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_commit_edits_2.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_commit_message_1.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_commit_stats_3.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_current_user_1.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_current_user_2.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_get_legacy_label_types_1.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_project_default_submit_type_1.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_unresolved_comments_count_1.java (100%) rename {gerrit-server/src/main/java => java}/gerrit/PRED_uploader_1.java (100%) diff --git a/gerrit-server/src/main/java/gerrit/AbstractCommitUserIdentityPredicate.java b/java/gerrit/AbstractCommitUserIdentityPredicate.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/AbstractCommitUserIdentityPredicate.java rename to java/gerrit/AbstractCommitUserIdentityPredicate.java diff --git a/java/gerrit/BUILD b/java/gerrit/BUILD new file mode 100644 index 0000000000..a9c1012915 --- /dev/null +++ b/java/gerrit/BUILD @@ -0,0 +1,15 @@ +java_library( + name = "prolog-predicates", + srcs = glob(["**/*.java"]), + visibility = ["//visibility:public"], + deps = [ + "//gerrit-server:server", + "//java/com/google/gerrit/common:server", + "//java/com/google/gerrit/extensions:api", + "//java/com/google/gerrit/reviewdb:server", + "//lib:gwtorm", + "//lib/jgit/org.eclipse.jgit:jgit", + "//lib/log:api", + "//lib/prolog:runtime", + ], +) diff --git a/gerrit-server/src/main/java/gerrit/PRED__load_commit_labels_1.java b/java/gerrit/PRED__load_commit_labels_1.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED__load_commit_labels_1.java rename to java/gerrit/PRED__load_commit_labels_1.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_change_branch_1.java b/java/gerrit/PRED_change_branch_1.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_change_branch_1.java rename to java/gerrit/PRED_change_branch_1.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_change_owner_1.java b/java/gerrit/PRED_change_owner_1.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_change_owner_1.java rename to java/gerrit/PRED_change_owner_1.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_change_project_1.java b/java/gerrit/PRED_change_project_1.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_change_project_1.java rename to java/gerrit/PRED_change_project_1.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_change_topic_1.java b/java/gerrit/PRED_change_topic_1.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_change_topic_1.java rename to java/gerrit/PRED_change_topic_1.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_commit_author_3.java b/java/gerrit/PRED_commit_author_3.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_commit_author_3.java rename to java/gerrit/PRED_commit_author_3.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_commit_committer_3.java b/java/gerrit/PRED_commit_committer_3.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_commit_committer_3.java rename to java/gerrit/PRED_commit_committer_3.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_commit_delta_4.java b/java/gerrit/PRED_commit_delta_4.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_commit_delta_4.java rename to java/gerrit/PRED_commit_delta_4.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java b/java/gerrit/PRED_commit_edits_2.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_commit_edits_2.java rename to java/gerrit/PRED_commit_edits_2.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_commit_message_1.java b/java/gerrit/PRED_commit_message_1.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_commit_message_1.java rename to java/gerrit/PRED_commit_message_1.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_commit_stats_3.java b/java/gerrit/PRED_commit_stats_3.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_commit_stats_3.java rename to java/gerrit/PRED_commit_stats_3.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_current_user_1.java b/java/gerrit/PRED_current_user_1.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_current_user_1.java rename to java/gerrit/PRED_current_user_1.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_current_user_2.java b/java/gerrit/PRED_current_user_2.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_current_user_2.java rename to java/gerrit/PRED_current_user_2.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_get_legacy_label_types_1.java b/java/gerrit/PRED_get_legacy_label_types_1.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_get_legacy_label_types_1.java rename to java/gerrit/PRED_get_legacy_label_types_1.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_project_default_submit_type_1.java b/java/gerrit/PRED_project_default_submit_type_1.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_project_default_submit_type_1.java rename to java/gerrit/PRED_project_default_submit_type_1.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_unresolved_comments_count_1.java b/java/gerrit/PRED_unresolved_comments_count_1.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_unresolved_comments_count_1.java rename to java/gerrit/PRED_unresolved_comments_count_1.java diff --git a/gerrit-server/src/main/java/gerrit/PRED_uploader_1.java b/java/gerrit/PRED_uploader_1.java similarity index 100% rename from gerrit-server/src/main/java/gerrit/PRED_uploader_1.java rename to java/gerrit/PRED_uploader_1.java diff --git a/prolog/BUILD b/prolog/BUILD index 622167ad06..5de443d5b8 100644 --- a/prolog/BUILD +++ b/prolog/BUILD @@ -4,5 +4,5 @@ prolog_cafe_library( name = "gerrit-prolog-common", srcs = ["gerrit_common.pl"], visibility = ["//visibility:public"], - deps = ["//gerrit-server:server"], + deps = ["//java/gerrit:prolog-predicates"], )