diff --git a/BUILD b/BUILD index a104dd5bb0..5ddf8b1ce3 100644 --- a/BUILD +++ b/BUILD @@ -44,16 +44,10 @@ pkg_war( ui = None, ) -pkg_war( - name = "polygerrit", - ui = "polygerrit", -) - pkg_war( name = "release", context = ["//plugins:core"], doc = True, - ui = "ui_optdbg_r", ) pkg_war( @@ -71,9 +65,6 @@ API_DEPS = [ "//plugins:plugin-api_deploy.jar", "//plugins:plugin-api-sources_deploy.jar", "//plugins:plugin-api-javadoc", - "//gerrit-plugin-gwtui:gwtui-api_deploy.jar", - "//gerrit-plugin-gwtui:gwtui-api-source_deploy.jar", - "//gerrit-plugin-gwtui:gwtui-api-javadoc", ] genrule2( diff --git a/Documentation/BUILD b/Documentation/BUILD index 4177f5101d..b322fef81a 100644 --- a/Documentation/BUILD +++ b/Documentation/BUILD @@ -47,7 +47,6 @@ license_map( name = "licenses", opts = ["--asciidoctor"], targets = [ - "//gerrit-gwtui:ui_module", "//polygerrit-ui/app:polygerrit_ui", "//java/com/google/gerrit/pgm", ], @@ -57,7 +56,6 @@ license_map( license_map( name = "js_licenses", targets = [ - "//gerrit-gwtui:ui_module", "//polygerrit-ui/app:polygerrit_ui", ], visibility = ["//visibility:public"], diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index be50d3bc79..765e56ef3c 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt @@ -273,10 +273,7 @@ When this is the configured authentication method a hyperlink titled `Become` appears in the top right corner of the page, taking the user to a form where they can enter the username of any existing user account, and immediately login as that account, without any -authentication taking place. This form of authentication is only -useful for the GWT hosted mode shell, where OpenID authentication -redirects might be risky to the developer's host computer, and HTTP -authentication is not possible. +authentication taking place. + By default, OpenID. @@ -485,13 +482,12 @@ the "Switch Account" link is displayed next to "Sign Out". + When `auth.type` does not normally enable this URL administrators may set this to `login/`, allowing users to begin a new web session. This value -is used as an href in PolyGerrit and the GWT UI, so absolute URLs like +is used as an href in PolyGerrit, so absolute URLs like `https://someotherhost/login` work as well. + If a ${path} parameter is included, then PolyGerrit will substitute the currently viewed path in the link. Be aware that this path will include a leading slash, so a value like this might be appropriate: `/login${path}`. -Note: in the GWT UI this substitution for ${path} is *always* `/`. [[auth.cookiePath]]auth.cookiePath:: + @@ -1175,8 +1171,7 @@ Default is 5 minutes. [[change.allowBlame]]change.allowBlame:: + -Allow blame on side by side diff in the GWT UI. If set to false, blame cannot be -used. +Allow blame on side by side diff. If set to false, blame cannot be used. + Default is true. @@ -1433,13 +1428,10 @@ upper and lower case character for each position must be used. For example, to match the string `bug` in a case insensitive way the match pattern `[bB][uU][gG]` needs to be used. + -Between the GWT UI and PolyGerrit, the commentlink.name.match regular -expressions are applied differently. Whereas in the GWT UI the -expressions are applied to the formatted and escaped HTML result, the -PolyGerrit UI applies them only to the raw, unformatted and unescaped -text form. PolyGerrit does not support regex matching against HTML. -Comment link patterns that are written in this style should be updated -to match text formats. +The commentlink.name.match regular expressions are applied to the raw, +unformatted and unescaped text form. Regex matching against HTML is not +supported. Comment link patterns that are written in this style should +be updated to match text formats. + A common pattern to match is `bug\\s+(\\d+)`. @@ -5100,10 +5092,6 @@ The contents of the `system_config` table are cached at startup by Gerrit. If you modify any columns in this table, Gerrit needs to be restarted before it will use the new values. -== Configuring the Polygerrit UI - -Please see link:dev-polygerrit.html[UI] on configuring the Polygerrit UI. - === Configurable Parameters site_path:: diff --git a/Documentation/config-plugins.txt b/Documentation/config-plugins.txt index b9c51722ba..a138b14dc5 100644 --- a/Documentation/config-plugins.txt +++ b/Documentation/config-plugins.txt @@ -199,8 +199,7 @@ Project] This plugin allows the rendering of Git repository branch network in a graphical HTML5 Canvas. It is mainly intended to be used as a -"project link" in a gitweb configuration or by other Gerrit GWT UI -plugins to be plugged elsewhere in Gerrit. +"project link" in a gitweb configuration. link:https://gerrit-review.googlesource.com/admin/repos/plugins/branch-network[ Project] | diff --git a/Documentation/config-themes.txt b/Documentation/config-themes.txt index dcfd7114f5..38bfc46e3b 100644 --- a/Documentation/config-themes.txt +++ b/Documentation/config-themes.txt @@ -129,9 +129,7 @@ instead of '#' because Analytics won't track anchors. The `window.onload` callback is necessary to ensure that the `Gerrit.on()` function has actually been defined by the -page. Because GWT loads the module asynchronously any ` diff --git a/polygerrit-ui/app/behaviors/base-url-behavior/base-url-behavior_test.html b/polygerrit-ui/app/behaviors/base-url-behavior/base-url-behavior_test.html index 429abe1d1c..4b670daaf6 100644 --- a/polygerrit-ui/app/behaviors/base-url-behavior/base-url-behavior_test.html +++ b/polygerrit-ui/app/behaviors/base-url-behavior/base-url-behavior_test.html @@ -66,24 +66,5 @@ limitations under the License. test('getBaseUrl', () => { assert.deepEqual(element.getBaseUrl(), '/r'); }); - - test('computeGwtUrl', () => { - assert.deepEqual( - element.computeGwtUrl('/r/c/1/'), - '/r/?polygerrit=0#/c/1/' - ); - }); - - test('computeGwtUrl for project dashboard', () => { - assert.deepEqual( - element.computeGwtUrl('/r/p/gerrit/proj/+/dashboard/main:default'), - '/r/?polygerrit=0#/projects/gerrit/proj,dashboards/main:default'); - }); - - test('computeGwtUrl for project access', () => { - assert.deepEqual( - element.computeGwtUrl('/r/admin/repos/demo-project,access'), - '/r/?polygerrit=0#/admin/projects/demo-project,access'); - }); }); diff --git a/polygerrit-ui/app/elements/gr-app-it_test.html b/polygerrit-ui/app/elements/gr-app-it_test.html index 929156eb46..2601aebe14 100644 --- a/polygerrit-ui/app/elements/gr-app-it_test.html +++ b/polygerrit-ui/app/elements/gr-app-it_test.html @@ -50,7 +50,6 @@ limitations under the License. getAccountCapabilities() { return Promise.resolve({}); }, getConfig() { return Promise.resolve({ - gerrit: {web_uis: ['GWT', 'POLYGERRIT']}, plugin: { js_resource_paths: [], html_resource_paths: [ diff --git a/polygerrit-ui/app/elements/gr-app.html b/polygerrit-ui/app/elements/gr-app.html index b34cd0a498..533136cd72 100644 --- a/polygerrit-ui/app/elements/gr-app.html +++ b/polygerrit-ui/app/elements/gr-app.html @@ -220,10 +220,6 @@ limitations under the License. Send feedback - | Press “?” for keyboard shortcuts diff --git a/polygerrit-ui/app/elements/gr-app.js b/polygerrit-ui/app/elements/gr-app.js index 321dc580a0..f2f06d1e25 100644 --- a/polygerrit-ui/app/elements/gr-app.js +++ b/polygerrit-ui/app/elements/gr-app.js @@ -331,11 +331,6 @@ this.$.header.unfloat(); }, - _computeShowGwtUiLink(config) { - return !window.DEPRECATE_GWT_UI && - config.gerrit.web_uis && config.gerrit.web_uis.includes('GWT'); - }, - _handlePageError(e) { const props = [ '_showChangeListView', diff --git a/polygerrit-ui/app/elements/gr-app_test.html b/polygerrit-ui/app/elements/gr-app_test.html index 734d2fe96c..71ceab4750 100644 --- a/polygerrit-ui/app/elements/gr-app_test.html +++ b/polygerrit-ui/app/elements/gr-app_test.html @@ -50,7 +50,6 @@ limitations under the License. getAccountCapabilities() { return Promise.resolve({}); }, getConfig() { return Promise.resolve({ - gerrit: {web_uis: ['GWT', 'POLYGERRIT']}, plugin: {}, }); }, @@ -73,35 +72,6 @@ limitations under the License. assert.isTrue(element.$.reporting.appStarted.calledOnce); }); - test('location change updates gwt footer', done => { - element._path = '/test/path'; - flush(() => { - const gwtLink = element.$$('#gwtLink'); - assert.equal(gwtLink.href, 'http://' + location.host + - element.getBaseUrl() + '/?polygerrit=0#/test/path'); - done(); - }); - }); - - test('_handleLocationChange handles hashes', done => { - const curLocation = { - pathname: '/c/1/1/testfile.txt', - hash: '#2', - host: location.host, - }; - element._handleLocationChange({detail: curLocation}); - - flush(() => { - const gwtLink = element.$$('#gwtLink'); - assert.equal( - gwtLink.href, - 'http://' + location.host + element.getBaseUrl() + - '/?polygerrit=0#/c/1/1/testfile.txt@2' - ); - done(); - }); - }); - test('passes config to gr-plugin-host', () => { return element.$.restAPI.getConfig.lastCall.returnValue.then(config => { assert.deepEqual(element.$.plugins.config, config); diff --git a/resources/com/google/gerrit/server/change/ChangeMessages.properties b/resources/com/google/gerrit/server/change/ChangeMessages.properties index b2bcde3f01..7c1dce3010 100644 --- a/resources/com/google/gerrit/server/change/ChangeMessages.properties +++ b/resources/com/google/gerrit/server/change/ChangeMessages.properties @@ -1,5 +1,3 @@ -# Changes to this file should also be made in -# gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties revertChangeDefaultMessage = Revert \"{0}\"\n\nThis reverts commit {1}. reviewerCantSeeChange = {0} does not have permission to see this change diff --git a/tools/bzl/gwt.bzl b/tools/bzl/gwt.bzl deleted file mode 100644 index b1852141f3..0000000000 --- a/tools/bzl/gwt.bzl +++ /dev/null @@ -1,312 +0,0 @@ -# Copyright (C) 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# 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. - -load("//tools/bzl:genrule2.bzl", "genrule2") -load("//tools/bzl:java.bzl", "java_library2") - -jar_filetype = [".jar"] - -BROWSERS = [ - "chrome", - "firefox", - "gecko1_8", - "safari", - "msie", - "ie8", - "ie9", - "ie10", - "edge", -] - -ALIASES = { - "chrome": "safari", - "firefox": "gecko1_8", - "msie": "ie10", - "edge": "gecko1_8", -} - -MODULE = "com.google.gerrit.GerritGwtUI" - -GWT_COMPILER = "com.google.gwt.dev.Compiler" - -GWT_JVM_ARGS = ["-Xmx512m"] - -GWT_COMPILER_ARGS = [ - "-XdisableClassMetadata", -] - -GWT_COMPILER_ARGS_RELEASE_MODE = GWT_COMPILER_ARGS + [ - "-XdisableCastChecking", -] - -GWT_PLUGIN_DEPS_NEVERLINK = [ - "//gerrit-plugin-gwtui:gwtui-api-lib-neverlink", - "//lib/gwt:user-neverlink", -] - -GWT_PLUGIN_DEPS = [ - "//gerrit-plugin-gwtui:gwtui-api-lib", -] - -GWT_TRANSITIVE_DEPS = [ - "//lib:jsr305", - "//lib/gwt:ant", - "//lib/gwt:colt", - "//lib/gwt:javax-validation", - "//lib/gwt:javax-validation_src", - "//lib/gwt:jsinterop-annotations", - "//lib/gwt:jsinterop-annotations_src", - "//lib/gwt:tapestry", - "//lib/gwt:w3c-css-sac", - "//lib/ow2:ow2-asm", - "//lib/ow2:ow2-asm-analysis", - "//lib/ow2:ow2-asm-commons", - "//lib/ow2:ow2-asm-tree", - "//lib/ow2:ow2-asm-util", -] - -DEPS = GWT_TRANSITIVE_DEPS + [ - "//java/com/google/gwtexpui/css", - "//lib:gwtjsonrpc", - "//lib/gwt:dev", - "//lib/jgit/org.eclipse.jgit:jgit-source", -] - -USER_AGENT_XML = """ - - - - -""" - -def gwt_module(gwt_xml = None, resources = [], srcs = [], **kwargs): - if gwt_xml: - resources = resources + [gwt_xml] - - java_library2( - srcs = srcs, - resources = resources, - **kwargs - ) - -def _gwt_user_agent_module(ctx): - """Generate user agent specific GWT module.""" - if not ctx.attr.user_agent: - return None - - ua = ctx.attr.user_agent - impl = ua - if ua in ALIASES: - impl = ALIASES[ua] - - # intermediate artifact: user agent speific GWT xml file - gwt_user_agent_xml = ctx.new_file(ctx.label.name + "_gwt.xml") - ctx.file_action( - output = gwt_user_agent_xml, - content = USER_AGENT_XML % (MODULE, impl), - ) - - # intermediate artifact: user agent specific zip with GWT module - gwt_user_agent_zip = ctx.new_file(ctx.label.name + "_gwt.zip") - gwt = "%s_%s.gwt.xml" % (MODULE.replace(".", "/"), ua) - dir = gwt_user_agent_zip.path + ".dir" - cmd = " && ".join([ - "p=$PWD", - "mkdir -p %s" % dir, - "cd %s" % dir, - "mkdir -p $(dirname %s)" % gwt, - "cp $p/%s %s" % (gwt_user_agent_xml.path, gwt), - "$p/%s cC $p/%s $(find . | sed 's|^./||')" % (ctx.executable._zip.path, gwt_user_agent_zip.path), - ]) - ctx.actions.run_shell( - inputs = [gwt_user_agent_xml] + ctx.files._zip, - outputs = [gwt_user_agent_zip], - command = cmd, - mnemonic = "GenerateUserAgentGWTModule", - ) - - return struct( - zip = gwt_user_agent_zip, - module = MODULE + "_" + ua, - ) - -def _gwt_binary_impl(ctx): - module = ctx.attr.module[0] - output_zip = ctx.outputs.output - output_dir = output_zip.path + ".gwt_output" - deploy_dir = output_zip.path + ".gwt_deploy" - - deps = _get_transitive_closure(ctx) - - paths = [] - for dep in deps: - paths.append(dep.path) - - gwt_user_agent_modules = [] - ua = _gwt_user_agent_module(ctx) - if ua: - paths.append(ua.zip.path) - gwt_user_agent_modules.append(ua.zip) - module = ua.module - - cmd = "%s %s -Dgwt.normalizeTimestamps=true -cp %s %s -war %s -deploy %s " % ( - ctx.attr._jdk[java_common.JavaRuntimeInfo].java_executable_exec_path, - " ".join(ctx.attr.jvm_args), - ":".join(paths), - GWT_COMPILER, - output_dir, - deploy_dir, - ) - - # TODO(davido): clean up command concatenation - cmd += " ".join([ - "-style %s" % ctx.attr.style, - "-optimize %s" % ctx.attr.optimize, - "-strict", - " ".join(ctx.attr.compiler_args), - module + "\n", - "rm -rf %s/gwt-unitCache\n" % output_dir, - "root=`pwd`\n", - "cd %s; $root/%s Cc ../%s $(find .)\n" % ( - output_dir, - ctx.executable._zip.path, - output_zip.basename, - ), - ]) - - ctx.actions.run_shell( - inputs = list(deps) + gwt_user_agent_modules, - outputs = [output_zip], - tools = ctx.files._jdk + ctx.files._zip, - mnemonic = "GwtBinary", - progress_message = "GWT compiling " + output_zip.short_path, - command = "set -e\n" + cmd, - ) - -def _get_transitive_closure(ctx): - deps = depset() - for dep in ctx.attr.module_deps: - deps += dep.java.transitive_runtime_deps - deps += dep.java.transitive_source_jars - for dep in ctx.attr.deps: - if hasattr(dep, "java"): - deps += dep.java.transitive_runtime_deps - elif hasattr(dep, "files"): - deps += dep.files - - return deps - -gwt_binary = rule( - attrs = { - "user_agent": attr.string(), - "style": attr.string(default = "OBF"), - "optimize": attr.string(default = "9"), - "deps": attr.label_list(allow_files = jar_filetype), - "module": attr.string_list(default = [MODULE]), - "module_deps": attr.label_list(allow_files = jar_filetype), - "compiler_args": attr.string_list(), - "jvm_args": attr.string_list(), - "_jdk": attr.label( - default = Label("@bazel_tools//tools/jdk:current_java_runtime"), - cfg = "host", - ), - "_zip": attr.label( - default = Label("@bazel_tools//tools/zip:zipper"), - cfg = "host", - executable = True, - allow_single_file = True, - ), - }, - outputs = { - "output": "%{name}.zip", - }, - implementation = _gwt_binary_impl, -) - -def gwt_genrule(suffix = ""): - dbg = "ui_dbg" + suffix - opt = "ui_opt" + suffix - module_dep = ":ui_module" + suffix - args = GWT_COMPILER_ARGS_RELEASE_MODE if suffix == "_r" else GWT_COMPILER_ARGS - - genrule2( - name = "ui_optdbg" + suffix, - srcs = [ - ":" + dbg, - ":" + opt, - ], - cmd = "cd $$TMP;" + - "unzip -q $$ROOT/$(location :%s);" % dbg + - "mv" + - " gerrit_ui/gerrit_ui.nocache.js" + - " gerrit_ui/dbg_gerrit_ui.nocache.js;" + - "unzip -qo $$ROOT/$(location :%s);" % opt + - "mkdir -p $$(dirname $@);" + - "zip -qrD $$ROOT/$@ .", - outs = ["ui_optdbg" + suffix + ".zip"], - visibility = ["//visibility:public"], - ) - - gwt_binary( - name = opt, - module = [MODULE], - module_deps = [module_dep], - deps = DEPS, - compiler_args = args, - jvm_args = GWT_JVM_ARGS, - ) - - gwt_binary( - name = dbg, - style = "PRETTY", - optimize = "0", - module_deps = [module_dep], - deps = DEPS, - compiler_args = GWT_COMPILER_ARGS, - jvm_args = GWT_JVM_ARGS, - ) - -def gen_ui_module(name, suffix = ""): - gwt_module( - name = name + suffix, - srcs = native.glob(["src/main/java/**/*.java"]), - gwt_xml = "src/main/java/%s.gwt.xml" % MODULE.replace(".", "/"), - resources = native.glob( - ["src/main/java/**/*"], - exclude = ["src/main/java/**/*.java"] + - ["src/main/java/%s.gwt.xml" % MODULE.replace(".", "/")], - ), - deps = [ - "//gerrit-gwtui-common:diffy_logo", - "//gerrit-gwtui-common:client", - "//java/com/google/gwtexpui/css", - "//lib/codemirror:codemirror" + suffix, - "//lib/gwt:user", - ], - visibility = ["//visibility:public"], - ) - -def gwt_user_agent_permutations(): - for ua in BROWSERS: - gwt_binary( - name = "ui_%s" % ua, - user_agent = ua, - style = "PRETTY", - optimize = "0", - module = [MODULE], - module_deps = [":ui_module"], - deps = DEPS, - compiler_args = GWT_COMPILER_ARGS, - jvm_args = GWT_JVM_ARGS, - ) diff --git a/tools/bzl/pkg_war.bzl b/tools/bzl/pkg_war.bzl index 40dd769a4a..72de14b893 100644 --- a/tools/bzl/pkg_war.bzl +++ b/tools/bzl/pkg_war.bzl @@ -133,14 +133,12 @@ _pkg_war = rule( implementation = _war_impl, ) -def pkg_war(name, ui = "ui_optdbg", context = [], doc = False, **kwargs): +def pkg_war(name, ui = "polygerrit", context = [], doc = False, **kwargs): doc_ctx = [] doc_lib = [] ui_deps = [] - if ui == "polygerrit" or ui == "ui_optdbg" or ui == "ui_optdbg_r": + if ui == "polygerrit": ui_deps.append("//polygerrit-ui/app:polygerrit_ui") - if ui and ui != "polygerrit": - ui_deps.append("//gerrit-gwtui:%s" % ui) if doc: doc_ctx.append("//Documentation:html") doc_lib.append("//Documentation:index") diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl index 5ae7dd9d02..066fe43e67 100644 --- a/tools/bzl/plugin.bzl +++ b/tools/bzl/plugin.bzl @@ -1,13 +1,4 @@ load("//tools/bzl:genrule2.bzl", "genrule2") -load( - "//tools/bzl:gwt.bzl", - "GWT_COMPILER_ARGS", - "GWT_JVM_ARGS", - "GWT_PLUGIN_DEPS", - "GWT_PLUGIN_DEPS_NEVERLINK", - "GWT_TRANSITIVE_DEPS", - "gwt_binary", -) PLUGIN_DEPS = ["//plugins:plugin-lib"] @@ -25,7 +16,6 @@ def gerrit_plugin( deps = [], provided_deps = [], srcs = [], - gwt_module = [], resources = [], manifest_entries = [], dir_name = None, @@ -35,14 +25,12 @@ def gerrit_plugin( name = name + "__plugin", srcs = srcs, resources = resources, - deps = provided_deps + deps + GWT_PLUGIN_DEPS_NEVERLINK + PLUGIN_DEPS_NEVERLINK, + deps = provided_deps + deps + PLUGIN_DEPS_NEVERLINK, visibility = ["//visibility:public"], **kwargs ) static_jars = [] - if gwt_module: - static_jars = [":%s-static" % name] if not dir_name: dir_name = name @@ -58,34 +46,6 @@ def gerrit_plugin( **kwargs ) - if gwt_module: - native.java_library( - name = name + "__gwt_module", - resources = depset(srcs + resources).to_list(), - runtime_deps = deps + GWT_PLUGIN_DEPS, - visibility = ["//visibility:public"], - **kwargs - ) - genrule2( - name = "%s-static" % name, - cmd = " && ".join([ - "mkdir -p $$TMP/static", - "unzip -qd $$TMP/static $(location %s__gwt_application)" % name, - "cd $$TMP", - "zip -qr $$ROOT/$@ .", - ]), - tools = [":%s__gwt_application" % name], - outs = ["%s-static.jar" % name], - ) - gwt_binary( - name = name + "__gwt_application", - module = [gwt_module], - deps = GWT_PLUGIN_DEPS + GWT_TRANSITIVE_DEPS + ["//lib/gwt:dev"], - module_deps = [":%s__gwt_module" % name], - compiler_args = GWT_COMPILER_ARGS, - jvm_args = GWT_JVM_ARGS, - ) - # TODO(davido): Remove manual merge of manifest file when this feature # request is implemented: https://github.com/bazelbuild/bazel/issues/2009 genrule2( diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD index 0c9d023477..8b03b66b9a 100644 --- a/tools/eclipse/BUILD +++ b/tools/eclipse/BUILD @@ -8,28 +8,16 @@ load( ) TEST_DEPS = [ - "//gerrit-gwtui:ui_tests", "//javatests/com/google/gerrit/elasticsearch:elasticsearch_test_utils", "//javatests/com/google/gerrit/server:server_tests", ] DEPS = [ - "//gerrit-gwtdebug:gwtdebug", - "//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/asciidoctor:asciidoc_lib", "//java/com/google/gerrit/asciidoctor:doc_indexer_lib", "//lib/auto:auto-value", - "//lib/gwt:ant", - "//lib/gwt:colt", - "//lib/gwt:javax-validation", - "//lib/gwt:javax-validation_src", - "//lib/gwt:jsinterop-annotations", - "//lib/gwt:jsinterop-annotations_src", - "//lib/gwt:tapestry", - "//lib/gwt:w3c-css-sac", "//lib/jetty:servlets", "//lib/prolog:compiler-lib", "//proto:reviewdb_java_proto", @@ -49,11 +37,6 @@ classpath_collector( ["//plugins/%s:%s__plugin_test_deps" % (n, n) for n in CUSTOM_PLUGINS_TEST_DEPS], ) -classpath_collector( - name = "gwt_classpath_collect", - deps = ["//gerrit-gwtui:ui_module"], -) - classpath_collector( name = "autovalue_classpath_collect", deps = ["//lib/auto:auto-value"], diff --git a/tools/eclipse/gerrit_gwt_debug.launch b/tools/eclipse/gerrit_gwt_debug.launch deleted file mode 100644 index 593837a245..0000000000 --- a/tools/eclipse/gerrit_gwt_debug.launch +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py index ce4baf9b83..e9e249fdfc 100755 --- a/tools/eclipse/project.py +++ b/tools/eclipse/project.py @@ -27,7 +27,6 @@ import re import sys MAIN = '//tools/eclipse:classpath' -GWT = '//gerrit-gwtui:ui_module' AUTO = '//lib/auto:auto-value' JRE = '/'.join([ 'org.eclipse.jdt.launching.JRE_CONTAINER', @@ -37,7 +36,6 @@ JRE = '/'.join([ # Map of targets to corresponding classpath collector rules cp_targets = { AUTO: '//tools/eclipse:autovalue_classpath_collect', - GWT: '//tools/eclipse:gwt_classpath_collect', MAIN: '//tools/eclipse:main_classpath_collect', } @@ -176,8 +174,6 @@ def gen_classpath(ext): src = set() lib = set() proto = set() - gwt_src = set() - gwt_lib = set() plugins = set() # Classpath entries are absolute for cross-cell support @@ -185,10 +181,6 @@ def gen_classpath(ext): srcs = re.compile('(.*/external/[^/]+)/jar/(.*)[.]jar') for p in _query_classpath(MAIN): if p.endswith('-src.jar'): - # gwt_module() depends on -src.jar for Java to JavaScript compiles. - if p.startswith("external"): - p = path.join(ext, p) - gwt_lib.add(p) continue m = java_library.match(p) @@ -214,11 +206,6 @@ def gen_classpath(ext): p = path.join(ext, p) lib.add(p) - for p in _query_classpath(GWT): - m = java_library.match(p) - if m: - gwt_src.add(m.group(1)) - classpathentry('src', 'java') classpathentry('src', 'javatests', out='eclipse-out/test') classpathentry('src', 'resources') @@ -250,7 +237,7 @@ def gen_classpath(ext): if path.exists(p): classpathentry('src', p, out=o) - for libs in [lib, gwt_lib]: + for libs in [lib]: for j in sorted(libs): s = None m = srcs.match(j) @@ -263,16 +250,6 @@ def gen_classpath(ext): if args.plugins: classpathentry('lib', j, s, exported=True) else: - # Filter out the source JARs that we pull through transitive - # closure of GWT plugin API (we add source directories - # themselves). Exception is libEdit-src.jar, that is needed - # for GWT SDM to work. - m = java_library.match(j) - if m: - if m.group(1).startswith("gerrit-") and \ - j.endswith("-src.jar") and \ - not j.endswith("libEdit-src.jar"): - continue classpathentry('lib', j, s) for p in sorted(proto): @@ -280,11 +257,6 @@ def gen_classpath(ext): s = s.replace('.jar', '-src.jar') classpathentry('lib', p, s) - for s in sorted(gwt_src): - p = path.join(ROOT, s, 'src', 'main', 'java') - if path.exists(p): - classpathentry('lib', p, out='eclipse-out/gwtsrc') - classpathentry('con', JRE) classpathentry('output', 'eclipse-out/classes') @@ -326,14 +298,8 @@ try: gen_factorypath(ext_location) gen_bazel_path(ext_location) - # TODO(davido): Remove this when GWT gone - gwt_working_dir = ".gwt_work_dir" - if not path.isdir(gwt_working_dir): - makedirs(path.join(ROOT, gwt_working_dir)) - try: - check_call(_build_bazel_cmd('build', MAIN, GWT, - '//java/org/eclipse/jgit:libEdit-src.jar')) + check_call(_build_bazel_cmd('build', MAIN)) except CalledProcessError: exit(1) except KeyboardInterrupt: diff --git a/tools/maven/BUILD b/tools/maven/BUILD index 10ed27ddf2..6cbd21990c 100644 --- a/tools/maven/BUILD +++ b/tools/maven/BUILD @@ -10,19 +10,16 @@ maven_package( "gerrit-acceptance-framework": "//java/com/google/gerrit/acceptance:libframework-lib-src.jar", "gerrit-extension-api": "//java/com/google/gerrit/extensions:libapi-src.jar", "gerrit-plugin-api": "//plugins:plugin-api-sources_deploy.jar", - "gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api-source_deploy.jar", }, doc = { "gerrit-acceptance-framework": "//java/com/google/gerrit/acceptance:framework-javadoc", "gerrit-extension-api": "//java/com/google/gerrit/extensions:extension-api-javadoc", "gerrit-plugin-api": "//plugins:plugin-api-javadoc", - "gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api-javadoc", }, jar = { "gerrit-acceptance-framework": "//java/com/google/gerrit/acceptance:framework_deploy.jar", "gerrit-extension-api": "//java/com/google/gerrit/extensions:extension-api_deploy.jar", "gerrit-plugin-api": "//plugins:plugin-api_deploy.jar", - "gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api_deploy.jar", }, repository = MAVEN_REPOSITORY, url = URL, diff --git a/tools/maven/gerrit-plugin-gwtui_pom.xml b/tools/maven/gerrit-plugin-gwtui_pom.xml deleted file mode 100644 index e756352f1b..0000000000 --- a/tools/maven/gerrit-plugin-gwtui_pom.xml +++ /dev/null @@ -1,89 +0,0 @@ - - 4.0.0 - com.google.gerrit - gerrit-plugin-gwtui - 3.0-SNAPSHOT - jar - Gerrit Code Review - Plugin GWT UI - Common Classes for Gerrit GWT UI Plugins - https://www.gerritcodereview.com/ - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - https://gerrit.googlesource.com/gerrit - https://gerrit.googlesource.com/gerrit - - - - - Alice Kober-Sotzek - - - Andrew Bonventre - - - Becky Siegel - - - Dave Borowitz - - - David Ostrovsky - - - David Pursehouse - - - Edwin Kempin - - - Hugo Arès - - - Kasper Nilsson - - - Logan Hanks - - - Luca Milanesio - - - Martin Fick - - - Saša Živkov - - - Shawn Pearce - - - Viktar Donich - - - Wyatt Allen - - - - - - Repo and Gerrit Discussion - repo-discuss@googlegroups.com - https://groups.google.com/forum/#!forum/repo-discuss - https://groups.google.com/forum/#!forum/repo-discuss - https://groups.google.com/forum/#!forum/repo-discuss - - - - - https://bugs.chromium.org/p/gerrit/issues/list - Gerrit Issue Tracker - - diff --git a/tools/version.py b/tools/version.py index 4aafcb0c2b..bb3b56034a 100755 --- a/tools/version.py +++ b/tools/version.py @@ -46,8 +46,7 @@ def replace_in_file(filename, src_pattern): src_pattern = re.compile(r'^(\s*)([-.\w]+)(\s*)$', re.MULTILINE) for project in ['gerrit-acceptance-framework', 'gerrit-extension-api', - 'gerrit-plugin-api', 'gerrit-plugin-gwtui', - 'gerrit-war']: + 'gerrit-plugin-api', 'gerrit-war']: pom = os.path.join('tools', 'maven', '%s_pom.xml' % project) replace_in_file(pom, src_pattern)