Skip to content

Commit d1cf684

Browse files
barancevbarancev
committed
[java] Merging IDEA modules 'client' and 'server' into a single 'java' module
1 parent 5d0099d commit d1cf684

File tree

6 files changed

+13
-59
lines changed

6 files changed

+13
-59
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ maven-metadata-.xml
4747
maven-metadata-.xml.sha1
4848
node_modules/
4949
resolver-status.properties
50+
java/build/
5051
java/client/build/
5152
java/client/log.txt
5253
java/client/iedriver.log

‎.idea/modules.xml

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎java/client/test/org/openqa/selenium/testing/StaticResources.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static void ensureAvailable() {
5656
private static void copy(String copyFrom, String copyTo) {
5757
try {
5858
Path source = InProject.locate("bazel-bin").resolve(copyFrom);
59-
Path dest = InProject.locate("java/client/build/test").resolve(copyTo);
59+
Path dest = InProject.locate("java/build/test").resolve(copyTo);
6060

6161
if (Files.exists(dest)) {
6262
// Assume we're good.

‎java/client/client.iml renamed to ‎java/java.iml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@
44
<output url="file://$MODULE_DIR$/build/production" />
55
<output-test url="file://$MODULE_DIR$/build/test" />
66
<exclude-output />
7-
<content url="file://$MODULE_DIR$">
8-
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
9-
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
7+
<content url="file://$MODULE_DIR$/client">
8+
<sourceFolder url="file://$MODULE_DIR$/client/src" isTestSource="false" />
9+
<sourceFolder url="file://$MODULE_DIR$/client/test" isTestSource="true" />
1010
</content>
11-
<content url="file://$MODULE_DIR$/../../third_party/js/sizzle">
12-
<sourceFolder url="file://$MODULE_DIR$/../../third_party/js/sizzle" type="java-resource" />
11+
<content url="file://$MODULE_DIR$/server">
12+
<sourceFolder url="file://$MODULE_DIR$/server/src" isTestSource="false" />
13+
<sourceFolder url="file://$MODULE_DIR$/server/test" isTestSource="true" />
14+
</content>
15+
<content url="file://$MODULE_DIR$/../third_party/js/sizzle">
16+
<sourceFolder url="file://$MODULE_DIR$/../third_party/js/sizzle" type="java-resource" />
1317
</content>
1418
<orderEntry type="inheritedJdk" />
1519
<orderEntry type="sourceFolder" forTests="false" />

‎java/server/server.iml

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎rb/ruby.iml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,6 @@
88
</content>
99
<orderEntry type="jdk" jdkName="ruby-2.5.1-p57" jdkType="RUBY_SDK" />
1010
<orderEntry type="sourceFolder" forTests="false" />
11-
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.5.2, ruby-2.5.1-p57) [gem]" level="application" />
12-
<orderEntry type="library" scope="PROVIDED" name="ast (v2.3.0, ruby-2.5.1-p57) [gem]" level="application" />
13-
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.4, ruby-2.5.1-p57) [gem]" level="application" />
14-
<orderEntry type="library" scope="PROVIDED" name="childprocess (v0.9.0, ruby-2.5.1-p57) [gem]" level="application" />
15-
<orderEntry type="library" scope="PROVIDED" name="crack (v0.4.3, ruby-2.5.1-p57) [gem]" level="application" />
16-
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, ruby-2.5.1-p57) [gem]" level="application" />
17-
<orderEntry type="library" scope="PROVIDED" name="ffi (v1.9.25, ruby-2.5.1-p57) [gem]" level="application" />
18-
<orderEntry type="library" scope="PROVIDED" name="hashdiff (v0.3.7, ruby-2.5.1-p57) [gem]" level="application" />
19-
<orderEntry type="library" scope="PROVIDED" name="parallel (v1.12.0, ruby-2.5.1-p57) [gem]" level="application" />
20-
<orderEntry type="library" scope="PROVIDED" name="parser (v2.4.0.0, ruby-2.5.1-p57) [gem]" level="application" />
21-
<orderEntry type="library" scope="PROVIDED" name="powerpack (v0.1.1, ruby-2.5.1-p57) [gem]" level="application" />
22-
<orderEntry type="library" scope="PROVIDED" name="public_suffix (v2.0.5, ruby-2.5.1-p57) [gem]" level="application" />
23-
<orderEntry type="library" scope="PROVIDED" name="rack (v1.6.11, ruby-2.5.1-p57) [gem]" level="application" />
24-
<orderEntry type="library" scope="PROVIDED" name="rainbow (v2.2.2, ruby-2.5.1-p57) [gem]" level="application" />
25-
<orderEntry type="library" scope="PROVIDED" name="rake (v12.1.0, ruby-2.5.1-p57) [gem]" level="application" />
26-
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.6.0, ruby-2.5.1-p57) [gem]" level="application" />
27-
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.6.0, ruby-2.5.1-p57) [gem]" level="application" />
28-
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.6.0, ruby-2.5.1-p57) [gem]" level="application" />
29-
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.6.0, ruby-2.5.1-p57) [gem]" level="application" />
30-
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.6.0, ruby-2.5.1-p57) [gem]" level="application" />
31-
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.50.0, ruby-2.5.1-p57) [gem]" level="application" />
32-
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.9.0, ruby-2.5.1-p57) [gem]" level="application" />
33-
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.2.2, ruby-2.5.1-p57) [gem]" level="application" />
34-
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.4, ruby-2.5.1-p57) [gem]" level="application" />
35-
<orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.3.0, ruby-2.5.1-p57) [gem]" level="application" />
36-
<orderEntry type="library" scope="PROVIDED" name="webmock (v2.3.2, ruby-2.5.1-p57) [gem]" level="application" />
37-
<orderEntry type="library" scope="PROVIDED" name="yard (v0.9.12, ruby-2.5.1-p57) [gem]" level="application" />
3811
</component>
3912
<component name="sonarModuleSettings">
4013
<option name="alternativeWorkingDirPath" value="" />

0 commit comments

Comments
 (0)