Move the 'security' package to be within the RC server.

This package is used by RC to allow tests of sites secured by HTTPS.
As such, it's not part of the webdriver-specific server.

Author: shs96c

java/server/src/cybervillains/build.desc

@@ -4,7 +4,7 @@ java_library(name = "cybervillains",
     "**/*.java",
   ],
   deps = [
-    "//java/server/src/org/openqa/selenium/security",
+    "//java/server/src/org/openqa/selenium/server/security",
     "//third_party/java/bouncycastle",
     "//third_party/java/jetty:jetty-for-rc",
   ])

java/server/src/cybervillains/ca/KeyStoreManager.java

@@ -2,8 +2,8 @@
 
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.openqa.selenium.security.CertificateGenerator;
-import org.openqa.selenium.security.KeyAndCert;
+import org.openqa.selenium.server.security.CertificateGenerator;
+import org.openqa.selenium.server.security.KeyAndCert;
 
 import java.io.File;
 import java.io.FileInputStream;

java/server/src/org/openqa/selenium/security/CertificateGenerator.java renamed to java/server/src/org/openqa/selenium/server/security/CertificateGenerator.java

@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.security;
+package org.openqa.selenium.server.security;
 
 import com.google.common.base.Throwables;
 

java/server/src/org/openqa/selenium/security/KeyAndCert.java renamed to java/server/src/org/openqa/selenium/server/security/KeyAndCert.java

@@ -15,7 +15,7 @@
 limitations under the License.
 */
 
-package org.openqa.selenium.security;
+package org.openqa.selenium.server.security;
 
 import com.google.common.base.Preconditions;