Server: Moving shared classes to a more appropriate place out of the …

…legacy server namespace
SeleniumHQ · Oct 15, 2015 · 76363f3 · 76363f3
1 parent ac509dd
commit 76363f3
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 28 deletions.
diff --git a/java/server/src/org/openqa/grid/BUCK b/java/server/src/org/openqa/grid/BUCK
@@ -17,7 +17,7 @@ java_library(name = 'grid',
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/server/src/org/openqa/grid/common:common',
     '//java/server/src/org/openqa/selenium/remote/server/log:log',
-    "//java/server/src/org/openqa/selenium/server:shared",
+    "//java/server/src/org/openqa/grid/shared:interfaces",
     '//third_party/java/gson:gson',
     '//third_party/java/guava-libraries:guava-libraries',
     '//third_party/java/httpcomponents:httpclient',

diff --git a/java/server/src/org/openqa/grid/build.desc b/java/server/src/org/openqa/grid/build.desc
@@ -12,6 +12,7 @@ java_library(name = "grid",
     "//java/client/src/org/openqa/selenium:webdriver-api",
     "//java/client/src/org/openqa/selenium/chrome",
     "//java/server/src/org/openqa/grid/common",
+    "//java/server/src/org/openqa/grid/shared:interfaces",
     "//java/server/src/org/openqa/selenium/remote/server",
     "//third_party/java/httpcomponents:httpclient",
     "//third_party/java/guava-libraries",

diff --git a/java/server/src/org/openqa/grid/common/BUCK b/java/server/src/org/openqa/grid/common/BUCK
@@ -5,7 +5,7 @@ java_library(name = 'common',
     '//java/client/src/org/openqa/selenium:platform',
     '//java/client/src/org/openqa/selenium/net:net',
     '//java/client/src/org/openqa/selenium/remote:remote',
-    '//java/server/src/org/openqa/selenium/server:shared',
+    '//java/server/src/org/openqa/grid/shared:cli',
     '//third_party/java/gson:gson',
     '//third_party/java/guava-libraries:guava-libraries',
   ],

diff --git a/java/server/src/org/openqa/grid/common/GridDocHelper.java b/java/server/src/org/openqa/grid/common/GridDocHelper.java
@@ -22,7 +22,7 @@
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonParser;
 
-import org.openqa.selenium.server.shared.CliUtils;
+import org.openqa.grid.shared.CliUtils;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;

diff --git a/java/server/src/org/openqa/grid/common/build.desc b/java/server/src/org/openqa/grid/common/build.desc
@@ -7,6 +7,6 @@ java_library(name = "common",
   deps = [
     "//java/client/src/org/openqa/selenium/net",
     "//java/client/src/org/openqa/selenium/remote:common",
-    "//java/server/src/org/openqa/selenium/server:shared",
+    "//java/server/src/org/openqa/grid/shared:cli",
     "//third_party/java/guava-libraries",
   ])
diff --git a/java/server/src/org/openqa/grid/internal/utils/SelfRegisteringRemote.java b/java/server/src/org/openqa/grid/internal/utils/SelfRegisteringRemote.java
@@ -19,7 +19,6 @@
 
 import static org.openqa.grid.common.RegistrationRequest.AUTO_REGISTER;
 
-import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
@@ -36,16 +35,14 @@
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.internal.HttpClientFactory;
 import org.openqa.selenium.remote.server.log.LoggingManager;
-import org.openqa.selenium.server.shared.IServer;
+import org.openqa.grid.shared.IServer;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.InvalidParameterException;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 

diff --git a/java/server/src/org/openqa/grid/selenium/BUCK b/java/server/src/org/openqa/grid/selenium/BUCK
@@ -15,6 +15,8 @@ java_library(name = 'classes',
     '//java/client/src/org/openqa/selenium/remote:capabilities',
     '//java/server/src/org/openqa/grid/common:common',
     '//java/server/src/org/openqa/grid:grid',
+    '//java/server/src/org/openqa/grid/shared:cli',
+    '//java/server/src/org/openqa/grid/shared:interfaces',
     '//java/server/src/org/openqa/selenium/remote/server/log:log',
     '//java/server/src/org/openqa/selenium/server:server',
     '//third_party/java/gson:gson',

diff --git a/java/server/src/org/openqa/grid/selenium/GridLauncher.java b/java/server/src/org/openqa/grid/selenium/GridLauncher.java
@@ -30,7 +30,7 @@
 import org.openqa.selenium.remote.server.log.LoggingOptions;
 import org.openqa.selenium.remote.server.log.TerseFormatter;
 import org.openqa.selenium.server.SeleniumServer;
-import org.openqa.selenium.server.shared.CliUtils;
+import org.openqa.grid.shared.CliUtils;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/java/server/src/org/openqa/grid/shared/BUCK b/java/server/src/org/openqa/grid/shared/BUCK
@@ -0,0 +1,19 @@
+java_library(name = 'cli',
+  srcs = glob(['CliUtils.java']),
+  visibility = [
+    '//java/server/src/org/openqa/grid:grid',
+    '//java/server/src/org/openqa/grid/common:common',
+    '//java/server/src/org/openqa/grid/selenium:classes',
+    '//java/server/src/org/openqa/selenium/server:server',
+  ],
+)
+
+java_library(name = 'interfaces',
+  srcs = glob(['IServer.java']),
+  visibility = [
+    '//java/server/src/org/openqa/grid:grid',
+    '//java/server/src/org/openqa/grid/common:common',
+    '//java/server/src/org/openqa/grid/selenium:classes',
+    '//java/server/src/org/openqa/selenium/server:server',
+  ],
+)
diff --git a/...enqa/selenium/server/shared/CliUtils.java → .../src/org/openqa/grid/shared/CliUtils.java b/...enqa/selenium/server/shared/CliUtils.java → .../src/org/openqa/grid/shared/CliUtils.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.server.shared;
+package org.openqa.grid.shared;
 
 import java.io.File;
 import java.io.PrintStream;

diff --git a/...penqa/selenium/server/shared/IServer.java → ...r/src/org/openqa/grid/shared/IServer.java b/...penqa/selenium/server/shared/IServer.java → ...r/src/org/openqa/grid/shared/IServer.java
@@ -1,4 +1,4 @@
-package org.openqa.selenium.server.shared;
+package org.openqa.grid.shared;
 
 public interface IServer {
   void boot() throws Exception;

diff --git a/java/server/src/org/openqa/grid/shared/build.desc b/java/server/src/org/openqa/grid/shared/build.desc
@@ -0,0 +1,11 @@
+
+java_library(name = "cli",
+  srcs = [
+    "CliUtils.java",
+  ])
+
+java_library(name = "interfaces",
+  srcs = [
+    "IServer.java",
+  ])
+
diff --git a/java/server/src/org/openqa/selenium/server/BUCK b/java/server/src/org/openqa/selenium/server/BUCK
@@ -24,6 +24,8 @@ java_library(name = 'server',
     '//java/server/src/org/openqa/selenium/remote/server:server',
     '//java/server/src/org/openqa/selenium/remote/server:sessions',
     '//java/server/src/org/openqa/selenium/remote/server/log:log',
+    '//java/server/src/org/openqa/grid/shared:cli',
+    '//java/server/src/org/openqa/grid/shared:interfaces',
     ':selenium-core',
     '//third_party/java/commons-logging:commons-logging',
     '//third_party/java/guava-libraries:guava-libraries',
@@ -38,14 +40,6 @@ java_library(name = 'server',
   ],
 )
 
-java_library(name = 'shared',
-  srcs = glob(['shared/*.java']),
-  visibility = [
-    '//java/server/src/org/openqa/grid:grid',
-    '//java/server/src/org/openqa/grid/common:common',
-  ],
-)
-
 prebuilt_jar(name = 'selenium-core',
   binary_jar = '//javascript/selenium-core:selenium-core',
 )

diff --git a/java/server/src/org/openqa/selenium/server/SeleniumServer.java b/java/server/src/org/openqa/selenium/server/SeleniumServer.java
@@ -18,7 +18,7 @@
 package org.openqa.selenium.server;
 
 import static java.lang.String.format;
-import static org.openqa.selenium.server.shared.CliUtils.printWrappedLine;
+import static org.openqa.grid.shared.CliUtils.printWrappedLine;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -43,7 +43,7 @@
 import org.openqa.selenium.server.htmlrunner.HTMLResultsListener;
 import org.openqa.selenium.server.htmlrunner.SeleniumHTMLRunnerResultsHandler;
 import org.openqa.selenium.server.htmlrunner.SingleTestSuiteResourceHandler;
-import org.openqa.selenium.server.shared.IServer;
+import org.openqa.grid.shared.IServer;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -806,7 +806,7 @@ protected static void checkArgsSanity(RemoteControlConfiguration configuration)
         (InjectionHelper.userContentTransformationsExist() ||
         InjectionHelper.userJsInjectionsExist())) {
       usage("-userJsInjection and -userContentTransformation are only " +
-          "valid in combination with -proxyInjectionMode");
+            "valid in combination with -proxyInjectionMode");
       System.exit(1);
     }
   }

diff --git a/java/server/src/org/openqa/selenium/server/build.desc b/java/server/src/org/openqa/selenium/server/build.desc
@@ -55,14 +55,10 @@ java_library(name = "base",
     "//java/client/src/org/openqa/selenium/browserlaunchers/locators",
     "//java/client/src/org/openqa/selenium/net",
     "//java/client/src/org/openqa/selenium/support",
+    "//java/server/src/org/openqa/grid/shared:cli",
+    "//java/server/src/org/openqa/grid/shared:interfaces",
     "//java/server/src/cybervillains",
     "//java/server/src/org/openqa/selenium/remote/server",
     "//third_party/java/jetty:jetty-for-rc",
     "//third_party/java/servlet:servlet-api"
   ])
-
-java_library(name = "shared",
-  srcs = [
-    "shared/*.java",
-  ])
-