Skip to content

Commit 32f2672

Browse files
shs96cshs96c
committed
Move java sources and tests into a single tree
This emphasizes that all the java code is inter-related. We make use of bazel to avoid introducing Java 8 incompatible changes, and bazel's visibility rules to ensure that generated jars only contain what they should.
1 parent 6665715 commit 32f2672

File tree

1,888 files changed

+2573
-2594
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,888 files changed

+2573
-2594
lines changed

‎.idea/encodings.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/libcdp.xml

+13-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/maven.xml

+1-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/tools.xml

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/sonarSettings.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BUILD.bazel

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ filegroup(
1313

1414
alias(
1515
name = "grid",
16-
actual = "//java/server/src/org/openqa/selenium/grid:executable-grid",
16+
actual = "//java/src/org/openqa/selenium/grid:executable-grid",
1717
)
1818

1919
alias(
2020
name = "pinned-grid",
21-
actual = "//java/server/src/org/openqa/selenium/grid:pinned-grid",
21+
actual = "//java/src/org/openqa/selenium/grid:pinned-grid",
2222
)
2323

2424
alias(
2525
name = "debug-server",
26-
actual = "//java/client/test/org/openqa/selenium/environment:appserver",
26+
actual = "//java/test/org/openqa/selenium/environment:appserver",
2727
)
2828

2929
alias(
@@ -33,7 +33,7 @@ alias(
3333

3434
alias(
3535
name = "selenium-server-standalone",
36-
actual = "//java/server/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
36+
actual = "//java/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
3737
)
3838

3939
java_binary(
@@ -47,7 +47,7 @@ java_binary(
4747
jvm_flags = chrome_jvm_flags + firefox_jvm_flags,
4848
main_class = "org.openqa.selenium.grid.Bootstrap",
4949
runtime_deps = [
50-
"//java/server/src/org/openqa/selenium/grid",
50+
"//java/src/org/openqa/selenium/grid",
5151
artifact("org.slf4j:slf4j-jdk14"),
5252
],
5353
)

‎common/devtools/chromium/v85/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package(
22
default_visibility = [
33
"//dotnet/src/webdriver:__subpackages__",
4-
"//java/client/src/org/openqa/selenium/devtools:__subpackages__",
4+
"//java/src/org/openqa/selenium/devtools:__subpackages__",
55
"//javascript/node/selenium-webdriver:__pkg__",
66
"//py:__pkg__",
77
"//rb:__pkg__",

‎common/devtools/chromium/v88/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package(
22
default_visibility = [
33
"//dotnet/src/webdriver:__subpackages__",
4-
"//java/client/src/org/openqa/selenium/devtools:__subpackages__",
4+
"//java/src/org/openqa/selenium/devtools:__subpackages__",
55
"//javascript/node/selenium-webdriver:__pkg__",
66
"//py:__pkg__",
77
"//rb:__pkg__",

‎common/devtools/chromium/v89/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package(
22
default_visibility = [
33
"//dotnet/src/webdriver:__subpackages__",
4-
"//java/client/src/org/openqa/selenium/devtools:__subpackages__",
4+
"//java/src/org/openqa/selenium/devtools:__subpackages__",
55
"//javascript/node/selenium-webdriver:__pkg__",
66
"//py:__pkg__",
77
"//rb:__pkg__",

‎common/devtools/chromium/v90/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package(
22
default_visibility = [
33
"//dotnet/src/webdriver:__subpackages__",
4-
"//java/client/src/org/openqa/selenium/devtools:__subpackages__",
4+
"//java/src/org/openqa/selenium/devtools:__subpackages__",
55
"//javascript/node/selenium-webdriver:__pkg__",
66
"//py:__pkg__",
77
"//rb:__pkg__",

‎common/devtools/chromium/v91/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package(
22
default_visibility = [
33
"//dotnet/src/webdriver:__subpackages__",
4-
"//java/client/src/org/openqa/selenium/devtools:__subpackages__",
4+
"//java/src/org/openqa/selenium/devtools:__subpackages__",
55
"//javascript/node/selenium-webdriver:__pkg__",
66
"//py:__pkg__",
77
"//rb:__pkg__",

‎common/devtools/chromium/v92/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package(
22
default_visibility = [
33
"//dotnet/src/webdriver:__subpackages__",
4-
"//java/client/src/org/openqa/selenium/devtools:__subpackages__",
4+
"//java/src/org/openqa/selenium/devtools:__subpackages__",
55
"//javascript/node/selenium-webdriver:__pkg__",
66
"//py:__pkg__",
77
"//rb:__pkg__",

‎common/src/web/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ filegroup(
66
]),
77
visibility = [
88
"//dotnet/test:__subpackages__",
9-
"//java/client/test/org/openqa/selenium/environment:__pkg__",
9+
"//java/test/org/openqa/selenium/environment:__pkg__",
1010
"//javascript/node/selenium-webdriver:__pkg__",
1111
"//py:__pkg__",
1212
],

‎cpp/prebuilt/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ copy_file(
66
out = "i386/x_ignore_nofocus.so",
77
visibility = [
88
"//dotnet/src/webdriver:__pkg__",
9-
"//java/client/src/org/openqa/selenium/firefox/xpi:__pkg__",
9+
"//java/src/org/openqa/selenium/firefox/xpi:__pkg__",
1010
],
1111
)
1212

@@ -16,6 +16,6 @@ copy_file(
1616
out = "amd64/x_ignore_nofocus.so",
1717
visibility = [
1818
"//dotnet/src/webdriver:__pkg__",
19-
"//java/client/src/org/openqa/selenium/firefox/xpi:__pkg__",
19+
"//java/src/org/openqa/selenium/firefox/xpi:__pkg__",
2020
],
2121
)

‎dotnet/src/webdriverbackedselenium/BUILD.bazel

+8-8
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ generated_assembly_info(
3737
]) + [":assembly-info"],
3838
out = "Selenium.WebDriverBackedSelenium",
3939
resources = [
40-
"//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
41-
"//java/client/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
40+
"//java/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
41+
"//java/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
4242
"//javascript/selenium-atoms:findElement.js",
4343
"//javascript/selenium-atoms:findOption.js",
4444
"//javascript/selenium-atoms:fireEvent.js",
@@ -77,8 +77,8 @@ generated_assembly_info(
7777
]) + [":assembly-info"],
7878
out = "Selenium.WebDriverBackedSelenium",
7979
resources = [
80-
"//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
81-
"//java/client/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
80+
"//java/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
81+
"//java/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
8282
"//javascript/selenium-atoms:findElement.js",
8383
"//javascript/selenium-atoms:findOption.js",
8484
"//javascript/selenium-atoms:fireEvent.js",
@@ -109,8 +109,8 @@ generated_assembly_info(
109109
out = "strongnamed/Selenium.WebDriverBackedSelenium",
110110
keyfile = "//dotnet:WebDriver.snk",
111111
resources = [
112-
"//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
113-
"//java/client/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
112+
"//java/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
113+
"//java/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
114114
"//javascript/selenium-atoms:findElement.js",
115115
"//javascript/selenium-atoms:findOption.js",
116116
"//javascript/selenium-atoms:fireEvent.js",
@@ -150,8 +150,8 @@ generated_assembly_info(
150150
out = "strongnamed/Selenium.WebDriverBackedSelenium",
151151
keyfile = "//dotnet:WebDriver.snk",
152152
resources = [
153-
"//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
154-
"//java/client/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
153+
"//java/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
154+
"//java/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
155155
"//javascript/selenium-atoms:findElement.js",
156156
"//javascript/selenium-atoms:findOption.js",
157157
"//javascript/selenium-atoms:fireEvent.js",

‎dotnet/test/common/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ config_setting(
4545
data = [
4646
"appconfig.json",
4747
"//common/src/web",
48-
"//java/client/test/org/openqa/selenium/environment:appserver_deploy.jar",
49-
"//java/client/test/org/openqa/selenium/environment:keystore",
48+
"//java/test/org/openqa/selenium/environment:appserver_deploy.jar",
49+
"//java/test/org/openqa/selenium/environment:keystore",
5050
"//javascript/atoms",
5151
"//third_party/closure/goog",
5252
"//third_party/js/selenium:webdriver_json",

‎dotnet/test/support/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ nunit_test(
1919
data = [
2020
"//common/src/web",
2121
"//dotnet/test/common:appconfig.json",
22-
"//java/client/test/org/openqa/selenium/environment:appserver_deploy.jar",
22+
"//java/test/org/openqa/selenium/environment:appserver_deploy.jar",
2323
],
2424
is_windows = select({
2525
"@bazel_tools//src/conditions:host_windows": True,

‎java/buildtools/buildtools.iml

-13
This file was deleted.

‎java/client/src/com/thoughtworks/selenium/webdriven/commands/BUILD.bazel

-16
This file was deleted.

‎java/client/src/org/openqa/selenium/chrome/BUILD.bazel

-24
This file was deleted.

‎java/client/src/org/openqa/selenium/devtools/versions.bzl

-8
This file was deleted.

‎java/client/src/org/openqa/selenium/io/BUILD.bazel

-14
This file was deleted.

‎java/client/src/org/openqa/selenium/os/BUILD.bazel

-20
This file was deleted.

‎java/client/src/org/openqa/selenium/remote/locators/BUILD.bazel

-13
This file was deleted.

0 commit comments

Comments
 (0)