diff --git a/java/com.sap.sailing.selenium.test/local-test-environment-eclipse.xml b/java/com.sap.sailing.selenium.test/local-test-environment-eclipse.xml
new file mode 100644
index 00000000000..406319fc242
--- /dev/null
+++ b/java/com.sap.sailing.selenium.test/local-test-environment-eclipse.xml
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+ http://riccardo:riccardo@localhost:8889/
+
+
+
+
+
+
+ webdriver.chrome.driver
+ C:\apps\ChromeSeleniumDriver\chromedriver.exe
+
+
+
+ webdriver.firefox.bin
+ D:/Internet/Firefox/firefox.exe
+
+
+
+ webdriver.firefox.profile
+ Selenium
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.selenium.test/local-test-environment-maven.xml b/java/com.sap.sailing.selenium.test/local-test-environment-maven.xml
new file mode 100644
index 00000000000..1474289450d
--- /dev/null
+++ b/java/com.sap.sailing.selenium.test/local-test-environment-maven.xml
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+ http://riccardo:riccardo@localhost:8086/
+
+
+
+
+
+
+ webdriver.chrome.driver
+ C:\apps\ChromeSeleniumDriver\chromedriver.exe
+
+
+
+ webdriver.firefox.bin
+ D:/Internet/Firefox/firefox.exe
+
+
+
+ webdriver.firefox.profile
+ Selenium
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboard/LeaderboardTable.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboard/LeaderboardTable.java
new file mode 100644
index 00000000000..dd5c3f9d1d5
--- /dev/null
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/leaderboard/LeaderboardTable.java
@@ -0,0 +1,65 @@
+package com.sap.sailing.selenium.pages.leaderboard;
+
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+
+import com.sap.sailing.selenium.pages.gwt.CellTable2;
+import com.sap.sailing.selenium.pages.gwt.DataEntry;
+
+import com.sap.sailing.selenium.pages.leaderboard.LeaderboardTable.LeaderboardEntry;
+
+public class LeaderboardTable extends CellTable2 {
+ public class LeaderboardEntry extends DataEntry {
+ private static final String TOTAL_RANK = "Total rank";
+ private static final String COMPETITOR = "Competitor";
+ private static final String NAME = "Name";
+
+ protected LeaderboardEntry(WebElement element) {
+ super(LeaderboardTable.this, element);
+ }
+
+
+ public String getDescriptor() {
+ return getCompetitor();
+ }
+
+ public int getTotalRank() {
+ return Integer.parseInt(getColumnContent(TOTAL_RANK));
+ }
+
+ public String getCompetitor() {
+ return getColumnContent(COMPETITOR);
+ }
+
+ public String getName() {
+ return getColumnContent(NAME);
+ }
+
+// public int getTotalSailedDistance() {
+// }
+// public void getAverageSpeedOverGround() {
+// }
+// public void getMaximumSpeedOverGround() {
+// }
+// public int getTotalDownwindTime() {
+// }
+// public int getTotalUpwindTime() {
+// }
+// public int getTotalReachingLegsTime() {
+// }
+// public int getTotalSailingTime() {
+// }
+// public int getTotalPoints() {
+// }
+ }
+
+ public LeaderboardTable(WebDriver driver, WebElement element) {
+ super(driver, element);
+
+ }
+
+ @Override
+ protected LeaderboardEntry createDataEntry(WebElement element) {
+ return new LeaderboardEntry(element);
+ }
+}
diff --git a/java/org.openqa.selenium.osgi/.classpath b/java/org.openqa.selenium.osgi/.classpath
index 75b9264e3ef..7c05051876c 100644
--- a/java/org.openqa.selenium.osgi/.classpath
+++ b/java/org.openqa.selenium.osgi/.classpath
@@ -10,15 +10,15 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
@@ -26,9 +26,9 @@
-
+
-
+
@@ -37,7 +37,7 @@
-
+
diff --git a/java/org.openqa.selenium.osgi/META-INF/MANIFEST.MF b/java/org.openqa.selenium.osgi/META-INF/MANIFEST.MF
index 0af2dffc663..83f0f3da95d 100644
--- a/java/org.openqa.selenium.osgi/META-INF/MANIFEST.MF
+++ b/java/org.openqa.selenium.osgi/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Selenium
Bundle-SymbolicName: org.openqa.selenium.osgi
-Bundle-Version: 2.34.0
-Bundle-ClassPath: selenium-java-2.34.0.jar,
+Bundle-Version: 2.37.0
+Bundle-ClassPath: selenium-java-2.37.0.jar,
lib/apache-mime4j-0.6.jar,
lib/bsh-1.3.0.jar,
lib/cglib-nodep-2.1_3.jar,
@@ -14,15 +14,15 @@ Bundle-ClassPath: selenium-java-2.34.0.jar,
lib/commons-jxpath-1.3.jar,
lib/commons-lang3-3.1.jar,
lib/commons-logging-1.1.1.jar,
- lib/cssparser-0.9.9.jar,
- lib/guava-14.0.jar,
+ lib/cssparser-0.9.11.jar,
+ lib/guava-15.0.jar,
lib/hamcrest-core-1.3.jar,
lib/hamcrest-library-1.3.jar,
- lib/htmlunit-2.12.jar,
- lib/htmlunit-core-js-2.12.jar,
- lib/httpclient-4.2.1.jar,
- lib/httpcore-4.2.1.jar,
- lib/httpmime-4.2.1.jar,
+ lib/htmlunit-2.13.jar,
+ lib/htmlunit-core-js-2.13.jar,
+ lib/httpclient-4.3.1.jar,
+ lib/httpcore-4.3.jar,
+ lib/httpmime-4.3.1.jar,
lib/ini4j-0.5.2.jar,
lib/jcommander-1.29.jar,
lib/jetty-websocket-8.1.8.jar,
@@ -30,9 +30,9 @@ Bundle-ClassPath: selenium-java-2.34.0.jar,
lib/jna-platform-3.4.0.jar,
lib/json-20080701.jar,
lib/junit-dep-4.11.jar,
- lib/nekohtml-1.9.17.jar,
+ lib/nekohtml-1.9.19.jar,
lib/netty-3.5.7.Final.jar,
- lib/operadriver-1.3.jar,
+ lib/operadriver-1.5.jar,
lib/phantomjsdriver-1.0.4.jar,
lib/protobuf-java-2.4.1.jar,
lib/sac-1.3.jar,
diff --git a/java/org.openqa.selenium.osgi/build.properties b/java/org.openqa.selenium.osgi/build.properties
index 370ea23335c..02d9554a56f 100644
--- a/java/org.openqa.selenium.osgi/build.properties
+++ b/java/org.openqa.selenium.osgi/build.properties
@@ -1,39 +1,39 @@
bin.includes = META-INF/,\
- lib/commons-io-2.2.jar,\
- lib/commons-lang3-3.1.jar,\
- lib/cssparser-0.9.9.jar,\
- lib/guava-14.0.jar,\
- lib/hamcrest-core-1.3.jar,\
- lib/hamcrest-library-1.3.jar,\
- lib/htmlunit-2.12.jar,\
- lib/htmlunit-core-js-2.12.jar,\
- lib/httpclient-4.2.1.jar,\
- lib/httpcore-4.2.1.jar,\
- lib/httpmime-4.2.1.jar,\
- lib/jcommander-1.29.jar,\
- lib/jetty-websocket-8.1.8.jar,\
- lib/junit-dep-4.11.jar,\
- lib/nekohtml-1.9.17.jar,\
- lib/netty-3.5.7.Final.jar,\
- lib/operadriver-1.3.jar,\
- lib/phantomjsdriver-1.0.4.jar,\
- lib/testng-6.8.5.jar,\
- lib/xercesImpl-2.10.0.jar,\
- lib/xml-apis-1.4.01.jar,\
- selenium-java-2.34.0.jar,\
+ selenium-java-2.37.0.jar,\
lib/apache-mime4j-0.6.jar,\
lib/bsh-1.3.0.jar,\
lib/cglib-nodep-2.1_3.jar,\
lib/commons-codec-1.6.jar,\
lib/commons-collections-3.2.1.jar,\
lib/commons-exec-1.1.jar,\
+ lib/commons-io-2.2.jar,\
lib/commons-jxpath-1.3.jar,\
+ lib/commons-lang3-3.1.jar,\
lib/commons-logging-1.1.1.jar,\
+ lib/cssparser-0.9.11.jar,\
+ lib/guava-15.0.jar,\
+ lib/hamcrest-core-1.3.jar,\
+ lib/hamcrest-library-1.3.jar,\
+ lib/htmlunit-2.13.jar,\
+ lib/htmlunit-core-js-2.13.jar,\
+ lib/httpclient-4.3.1.jar,\
+ lib/httpcore-4.3.jar,\
+ lib/httpmime-4.3.1.jar,\
lib/ini4j-0.5.2.jar,\
+ lib/jcommander-1.29.jar,\
+ lib/jetty-websocket-8.1.8.jar,\
lib/jna-3.4.0.jar,\
lib/jna-platform-3.4.0.jar,\
lib/json-20080701.jar,\
+ lib/junit-dep-4.11.jar,\
+ lib/nekohtml-1.9.19.jar,\
+ lib/netty-3.5.7.Final.jar,\
+ lib/operadriver-1.5.jar,\
+ lib/phantomjsdriver-1.0.4.jar,\
lib/protobuf-java-2.4.1.jar,\
lib/sac-1.3.jar,\
lib/serializer-2.7.1.jar,\
- lib/xalan-2.7.1.jar
+ lib/testng-6.8.5.jar,\
+ lib/xalan-2.7.1.jar,\
+ lib/xercesImpl-2.10.0.jar,\
+ lib/xml-apis-1.4.01.jar
diff --git a/java/org.openqa.selenium.osgi/lib/cssparser-0.9.9.jar b/java/org.openqa.selenium.osgi/lib/cssparser-0.9.11.jar
similarity index 75%
rename from java/org.openqa.selenium.osgi/lib/cssparser-0.9.9.jar
rename to java/org.openqa.selenium.osgi/lib/cssparser-0.9.11.jar
index 54eee12e039..49eea5c51aa 100644
Binary files a/java/org.openqa.selenium.osgi/lib/cssparser-0.9.9.jar and b/java/org.openqa.selenium.osgi/lib/cssparser-0.9.11.jar differ
diff --git a/java/org.openqa.selenium.osgi/lib/guava-14.0.jar b/java/org.openqa.selenium.osgi/lib/guava-14.0.jar
deleted file mode 100644
index 5db914820da..00000000000
Binary files a/java/org.openqa.selenium.osgi/lib/guava-14.0.jar and /dev/null differ
diff --git a/java/org.openqa.selenium.osgi/lib/guava-15.0.jar b/java/org.openqa.selenium.osgi/lib/guava-15.0.jar
new file mode 100644
index 00000000000..eb9ef8ad5ff
Binary files /dev/null and b/java/org.openqa.selenium.osgi/lib/guava-15.0.jar differ
diff --git a/java/org.openqa.selenium.osgi/lib/htmlunit-2.12.jar b/java/org.openqa.selenium.osgi/lib/htmlunit-2.12.jar
deleted file mode 100644
index 6e3a1e87521..00000000000
Binary files a/java/org.openqa.selenium.osgi/lib/htmlunit-2.12.jar and /dev/null differ
diff --git a/java/org.openqa.selenium.osgi/lib/htmlunit-2.13.jar b/java/org.openqa.selenium.osgi/lib/htmlunit-2.13.jar
new file mode 100644
index 00000000000..b3178807b0f
Binary files /dev/null and b/java/org.openqa.selenium.osgi/lib/htmlunit-2.13.jar differ
diff --git a/java/org.openqa.selenium.osgi/lib/htmlunit-core-js-2.12.jar b/java/org.openqa.selenium.osgi/lib/htmlunit-core-js-2.13.jar
similarity index 55%
rename from java/org.openqa.selenium.osgi/lib/htmlunit-core-js-2.12.jar
rename to java/org.openqa.selenium.osgi/lib/htmlunit-core-js-2.13.jar
index cfbe7aafe19..ad61e8b4af5 100644
Binary files a/java/org.openqa.selenium.osgi/lib/htmlunit-core-js-2.12.jar and b/java/org.openqa.selenium.osgi/lib/htmlunit-core-js-2.13.jar differ
diff --git a/java/org.openqa.selenium.osgi/lib/httpclient-4.2.1.jar b/java/org.openqa.selenium.osgi/lib/httpclient-4.2.1.jar
deleted file mode 100644
index 1d523332858..00000000000
Binary files a/java/org.openqa.selenium.osgi/lib/httpclient-4.2.1.jar and /dev/null differ
diff --git a/java/org.openqa.selenium.osgi/lib/httpclient-4.3.1.jar b/java/org.openqa.selenium.osgi/lib/httpclient-4.3.1.jar
new file mode 100644
index 00000000000..cdd1e3874c4
Binary files /dev/null and b/java/org.openqa.selenium.osgi/lib/httpclient-4.3.1.jar differ
diff --git a/java/org.openqa.selenium.osgi/lib/httpcore-4.2.1.jar b/java/org.openqa.selenium.osgi/lib/httpcore-4.2.1.jar
deleted file mode 100644
index 16d75e1e8ef..00000000000
Binary files a/java/org.openqa.selenium.osgi/lib/httpcore-4.2.1.jar and /dev/null differ
diff --git a/java/org.openqa.selenium.osgi/lib/httpcore-4.3.jar b/java/org.openqa.selenium.osgi/lib/httpcore-4.3.jar
new file mode 100644
index 00000000000..ddfe6dacbc4
Binary files /dev/null and b/java/org.openqa.selenium.osgi/lib/httpcore-4.3.jar differ
diff --git a/java/org.openqa.selenium.osgi/lib/httpmime-4.2.1.jar b/java/org.openqa.selenium.osgi/lib/httpmime-4.2.1.jar
deleted file mode 100644
index f23d5be1ac4..00000000000
Binary files a/java/org.openqa.selenium.osgi/lib/httpmime-4.2.1.jar and /dev/null differ
diff --git a/java/org.openqa.selenium.osgi/lib/httpmime-4.3.1.jar b/java/org.openqa.selenium.osgi/lib/httpmime-4.3.1.jar
new file mode 100644
index 00000000000..2b26d7a79cc
Binary files /dev/null and b/java/org.openqa.selenium.osgi/lib/httpmime-4.3.1.jar differ
diff --git a/java/org.openqa.selenium.osgi/lib/nekohtml-1.9.17.jar b/java/org.openqa.selenium.osgi/lib/nekohtml-1.9.19.jar
similarity index 50%
rename from java/org.openqa.selenium.osgi/lib/nekohtml-1.9.17.jar
rename to java/org.openqa.selenium.osgi/lib/nekohtml-1.9.19.jar
index 97c55a3a177..979ffdedc8a 100644
Binary files a/java/org.openqa.selenium.osgi/lib/nekohtml-1.9.17.jar and b/java/org.openqa.selenium.osgi/lib/nekohtml-1.9.19.jar differ
diff --git a/java/org.openqa.selenium.osgi/lib/operadriver-1.3.jar b/java/org.openqa.selenium.osgi/lib/operadriver-1.5.jar
similarity index 95%
rename from java/org.openqa.selenium.osgi/lib/operadriver-1.3.jar
rename to java/org.openqa.selenium.osgi/lib/operadriver-1.5.jar
index 1424faea0fb..95088bdfced 100644
Binary files a/java/org.openqa.selenium.osgi/lib/operadriver-1.3.jar and b/java/org.openqa.selenium.osgi/lib/operadriver-1.5.jar differ
diff --git a/java/org.openqa.selenium.osgi/pom.xml b/java/org.openqa.selenium.osgi/pom.xml
index acc025c0d30..7a3f4a06ee4 100644
--- a/java/org.openqa.selenium.osgi/pom.xml
+++ b/java/org.openqa.selenium.osgi/pom.xml
@@ -8,6 +8,6 @@
1.0.0-SNAPSHOT
org.openqa.selenium.osgi
- 2.34.0
+ 2.37.0
eclipse-plugin
diff --git a/java/org.openqa.selenium.osgi/selenium-java-2.34.0.jar b/java/org.openqa.selenium.osgi/selenium-java-2.34.0.jar
deleted file mode 100644
index 2042195539f..00000000000
Binary files a/java/org.openqa.selenium.osgi/selenium-java-2.34.0.jar and /dev/null differ
diff --git a/java/org.openqa.selenium.osgi/selenium-java-2.37.0.jar b/java/org.openqa.selenium.osgi/selenium-java-2.37.0.jar
new file mode 100644
index 00000000000..c40f7596b66
Binary files /dev/null and b/java/org.openqa.selenium.osgi/selenium-java-2.37.0.jar differ