Skip to content

Commit

Permalink
java: update links to new canonical repo
Browse files Browse the repository at this point in the history
  • Loading branch information
andreastt committed Mar 13, 2015
1 parent 51c6b1d commit 5ef36d8
Show file tree
Hide file tree
Showing 14 changed files with 70 additions and 48 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Copyright 2011-2012 Selenium committers
Copyright 2011-2012 Software Freedom Conservancy
Copyright 2011-2015 Software Freedom Conservancy
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -116,8 +116,8 @@ public Builder withSilent(boolean silent) {
@Override
protected File findDefaultExecutable() {
return findExecutable("chromedriver", CHROME_DRIVER_EXE_PROPERTY,
"http://code.google.com/p/selenium/wiki/ChromeDriver",
"http://chromedriver.storage.googleapis.com/index.html");
"https://github.com/SeleniumHQ/selenium/wiki/ChromeDriver",
"http://chromedriver.storage.googleapis.com/index.html");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Copyright 2011-2012 Selenium committers
Copyright 2011-2012 Software Freedom Conservancy
Copyright 2011-2015 Software Freedom Conservancy
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -165,8 +165,8 @@ public Builder withSilent(Boolean silent) {
@Override
protected File findDefaultExecutable() {
return findExecutable("IEDriverServer", IE_DRIVER_EXE_PROPERTY,
"http://code.google.com/p/selenium/wiki/InternetExplorerDriver",
"http://selenium-release.storage.googleapis.com/index.html");
"https://github.com/SeleniumHQ/selenium/wiki/InternetExplorerDriver",
"http://selenium-release.storage.googleapis.com/index.html");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
Copyright 2015 Software Freedom Conservancy
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.
*/

package org.openqa.selenium.remote.http;

import static com.google.common.base.Charsets.UTF_8;
Expand Down Expand Up @@ -35,11 +51,10 @@
/**
* A command codec that adheres to the Selenium project's JSON/HTTP wire protocol.
*
* @see <a href="https://code.google.com/p/selenium/wiki/JsonWireProtocol">
* @see <a href="https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol">
* JSON wire protocol</a>
*/
public class JsonHttpCommandCodec implements CommandCodec<HttpRequest> {

private static final Splitter PATH_SPLITTER = Splitter.on('/').omitEmptyStrings();
private static final String SESSION_ID_PARAM = "sessionId";

Expand Down Expand Up @@ -171,7 +186,6 @@ public JsonHttpCommandCodec() {
defineCommand(IME_ACTIVATE_ENGINE, post("/session/:sessionId/ime/activate"));

// Mobile Spec
// https://code.google.com/p/selenium/source/browse/spec-draft.md?repo=mobile
defineCommand(GET_NETWORK_CONNECTION, get("/session/:sessionId/network_connection"));
defineCommand(SET_NETWORK_CONNECTION, post("/session/:sessionId/network_connection"));
defineCommand(SWITCH_TO_CONTEXT, post("/session/:sessionId/context"));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
Copyright 2015 Software Freedom Conservancy
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.
*/

package org.openqa.selenium.remote.http;

import static com.google.common.base.Charsets.UTF_8;
Expand All @@ -20,11 +36,10 @@
/**
* A response codec that adheres to the Selenium project's JSON/HTTP wire protocol.
*
* @see <a href="https://code.google.com/p/selenium/wiki/JsonWireProtocol">
* @see <a href="https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol">
* JSON wire protocol</a>
*/
public class JsonHttpResponseCodec implements ResponseCodec<HttpResponse> {

private final ErrorCodes errorCodes = new ErrorCodes();
private final BeanToJsonConverter beanToJsonConverter = new BeanToJsonConverter();
private final JsonToBeanConverter jsonToBeanConverter = new JsonToBeanConverter();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
Copyright 2015 Software Freedom Conservancy
Copyright 2007-2010 Selenium committers
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -34,7 +35,7 @@
* the WebDriver wire protocol. This class will recursively convert Lists and
* Maps to catch nested references.
*
* @see <a href="http://code.google.com/p/selenium/wiki/JsonWireProtocol#WebElement_JSON_Object">
* @see <a href="https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#webelement-json-object">
* WebDriver JSON Wire Protocol</a>
*/
public class WebElementToJsonConverter implements Function<Object, Object> {
Expand Down Expand Up @@ -76,7 +77,7 @@ public Object apply(Object arg) {
return converted;
}

throw new IllegalArgumentException("Argument is of an illegal type: "
+ arg.getClass().getName());
throw new IllegalArgumentException("Argument is of an illegal type: " +
arg.getClass().getName());
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Copyright 2011-2012 Selenium committers
Copyright 2011-2012 Software Freedom Conservancy
Copyright 2011-2015 Software Freedom Conservancy
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -43,13 +43,12 @@
* Manages the life and death of a native executable driver server.
*
* It is expected that the driver server implements the
* <a href="http://code.google.com/p/selenium/wiki/JsonWireProtocol">WebDriver Wire Protocol</a>.
* <a href="https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol">WebDriver Wire Protocol</a>.
* In particular, it should implement /status command that is used to check if the server is alive.
* In addition to this, it is supposed that the driver server implements /shutdown hook that is
* used to stop the server.
*/
public class DriverService {

/**
* The base URL for the managed server.
*/
Expand Down Expand Up @@ -301,8 +300,6 @@ public DS build() {
protected abstract ImmutableList<String> createArgs();

protected abstract DS createDriverService(File exe, int port, ImmutableList<String> args,
ImmutableMap<String, String> environment);

ImmutableMap<String, String> environment);
}

}
4 changes: 2 additions & 2 deletions java/client/src/org/openqa/selenium/support/PageFactory.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
Copyright 2015 Software Freedom Conservancy
Copyright 2007-2009 Selenium committers
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -30,10 +31,9 @@
/**
* Factory class to make using Page Objects simpler and easier.
*
* @see <a href="http://code.google.com/p/webdriver/wiki/PageObjects">Page Objects Wiki</a>
* @see <a href="https://github.com/SeleniumHQ/selenium/wiki/PageObjects">Page Objects Wiki</a>
*/
public class PageFactory {

/**
* Instantiate an instance of the given class, and set a lazy proxy for each of the WebElement and
* List&lt;WebElement&gt; fields that have been declared, assuming that the field
Expand Down
3 changes: 1 addition & 2 deletions java/client/test/org/openqa/selenium/ErrorsTest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Copyright 2012 Selenium committers
Copyright 2012 Software Freedom Conservancy
Copyright 2012-2015 Software Freedom Conservancy
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -15,7 +15,6 @@
limitations under the License.
*/


package org.openqa.selenium;

import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
Copyright 2015 Software Freedom Conservancy
Copyright 2013 Selenium committers
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -43,7 +44,7 @@
* <dt>selenium.external.serverUrl</dt>
* <dd>Defines the fully qualified URL of an external WebDriver server to send commands to.
* This server <i>must</i> be compliant with the
* <a href="http://code.google.com/p/selenium/wiki/JsonWireProtocol">JSON wire protocol</a>.
* <a href="https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol">JSON wire protocol</a>.
* If only this property is provided, then this supplier will provide a new
* {@link RemoteWebDriver} instance pointed at the designated server. Otherwise, if a
* custom supplier is also defined (see below), this supplier will wait for the server to
Expand All @@ -59,7 +60,6 @@
* </dl>
*/
class ExternalDriverSupplier implements Supplier<WebDriver> {

private static final Logger logger = Logger.getLogger(ExternalDriverSupplier.class.getName());

private static final String DELEGATE_SUPPLIER_CLASS_PROPERTY = "selenium.external.supplierClass";
Expand Down Expand Up @@ -192,6 +192,4 @@ public WebDriver get() {
return driver;
}
}

}

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Copyright 2011 Selenium committers
Copyright 2011 Software Freedom Conservancy
Copyright 2015 Software Freedom Conservancy
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -31,7 +31,6 @@
import javax.servlet.http.HttpServletResponse;

public class DisplayHelpServlet extends HttpServlet {

private static final long serialVersionUID = 8484071790930378855L;
private static final Logger log = Logger.getLogger(ConsoleServlet.class.getName());
private static String coreVersion;
Expand Down Expand Up @@ -73,7 +72,7 @@ protected void process(HttpServletRequest request, HttpServletResponse response)
builder.append("<body>");
builder.append("You are using grid ").append(coreVersion).append(coreRevision);
builder
.append("<br>Find help on the official selenium wiki : <a href='http://code.google.com/p/selenium/wiki/Grid2' >more help here</a>");
.append("<br>Find help on the official selenium wiki : <a href='https://github.com/SeleniumHQ/selenium/wiki/Grid2' >more help here</a>");
builder.append("<br>default monitoring page : <a href='/grid/console' >console</a>");

builder.append("</body>");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ protected void process(HttpServletRequest request, HttpServletResponse response)

} catch (Throwable e) {
if (r instanceof WebDriverRequest && !response.isCommitted()) {
// http://code.google.com/p/selenium/wiki/JsonWireProtocol#Error_Handling
// https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#error-handling
response.reset();
response.setContentType("application/json");
response.setCharacterEncoding("UTF-8");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ private Object getHeader() {
builder.append("<h2>Grid Console v.");
builder.append(coreVersion).append(coreRevision);
builder.append("</h2>");
builder.append("<div><a id='helplink' target='_blank' href='http://code.google.com/p/selenium/wiki/Grid2'>Help</a></div>");
builder.append("<div><a id='helplink' target='_blank' href='https://github.com/SeleniumHQ/selenium/wiki/Grid2'>Help</a></div>");
builder.append("</div>");
builder.append("");
return builder.toString();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/*
Copyright 2011 Software Freedom Conservancy.
Copyright 2011-2015 Software Freedom Conservancy
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
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
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.
*/
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.
*/

package org.openqa.selenium.remote.server.xdrpc;

Expand All @@ -23,11 +23,10 @@
* A cross-domain RPC that specifies a command to execute in the WebDriver
* wire protocol.
*
* @see <a href="http://code.google.com/p/selenium/wiki/JsonWireProtocol">
* @see <a href="https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#error-handling">
* WebDriver Wire Protocol</a>
*/
public class CrossDomainRpc {

private final String method;
private final String path;
private final String data;
Expand Down
4 changes: 2 additions & 2 deletions java/server/test/org/openqa/grid/e2e/misc/Issue1586.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Copyright 2011 Selenium committers
Copyright 2011 Software Freedom Conservancy
Copyright 2015 Software Freedom Conservancy
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -59,7 +59,7 @@ public void test() throws MalformedURLException {
try {
driver = new RemoteWebDriver(new URL(hub.getUrl() + "/grid/driver"), GridTestHelper.getDefaultBrowserCapability());
for (int i = 0; i < 20; i++) {
driver.get("http://code.google.com/p/selenium/");
driver.get("https://github.com/SeleniumHQ/selenium");
WebElement keywordInput = driver.findElement(By.name("q"));
keywordInput.clear();
keywordInput.sendKeys("test");
Expand Down

0 comments on commit 5ef36d8

Please sign in to comment.