Skip to content

Commit c1f1034

Browse files
committed
Make Wicket example run on Java 1.6
1 parent c3ef5d0 commit c1f1034

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

examples/java-wicket/java-wicket-test/pom.xml

+8-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<plugin>
1414
<groupId>org.apache.maven.plugins</groupId>
1515
<artifactId>maven-failsafe-plugin</artifactId>
16+
<version>2.16</version>
1617
<executions>
1718
<execution>
1819
<id>integration-test</id>
@@ -33,6 +34,7 @@
3334
<plugin>
3435
<groupId>org.codehaus.cargo</groupId>
3536
<artifactId>cargo-maven2-plugin</artifactId>
37+
<version>1.4.3</version>
3638
<executions>
3739
<execution>
3840
<id>start-servlet-engine</id>
@@ -51,9 +53,14 @@
5153
</executions>
5254
<configuration>
5355
<container>
54-
<containerId>jetty9x</containerId>
56+
<containerId>jetty8x</containerId>
5557
<type>embedded</type>
5658
</container>
59+
<configuration>
60+
<properties>
61+
<cargo.servlet.port>9878</cargo.servlet.port>
62+
</properties>
63+
</configuration>
5764
<deployables>
5865
<deployable>
5966
<groupId>info.cukes</groupId>

examples/java-wicket/java-wicket-test/src/test/java/cucumber/examples/java/wicket/steps/RentACarSupport.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class RentACarSupport {
99
public void createCars(int availableCars) {
1010
WebDriver driver = new FirefoxDriver();
1111
try {
12-
driver.get("http://localhost:8080/rentit/create");
12+
driver.get("http://localhost:9878/rentit/create");
1313

1414
WebElement numberOfCarsToCreate = driver.findElement(By.id("numberOfCars"));
1515
numberOfCarsToCreate.clear();
@@ -25,7 +25,7 @@ public void createCars(int availableCars) {
2525
public void rentACar() {
2626
WebDriver driver = new FirefoxDriver();
2727
try {
28-
driver.get("http://localhost:8080/rentit/rent");
28+
driver.get("http://localhost:9878/rentit/rent");
2929

3030
WebElement rentButton = driver.findElement(By.id("rentButton"));
3131
rentButton.click();
@@ -37,7 +37,7 @@ public void rentACar() {
3737
public int getAvailableNumberOfCars() {
3838
WebDriver driver = new FirefoxDriver();
3939
try {
40-
driver.get("http://localhost:8080/rentit/available");
40+
driver.get("http://localhost:9878/rentit/available");
4141

4242
WebElement availableCars = driver.findElement(By.id("availableCars"));
4343
String availableCarsString = availableCars.getText();

pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
<!-- Minimum android sdk api level 8 = platform 2.2.1 -->
6161
<android.version>2.2.1</android.version>
6262
<wicket.version>6.9.1</wicket.version>
63-
<jetty.version>9.0.5.v20130815</jetty.version>
63+
<!-- We need a version that works with Java 6 awnd Java 7: http://www.eclipse.org/jetty/documentation/current/what-jetty-version.html -->
64+
<jetty.version>8.1.12.v20130726</jetty.version>
6465
</properties>
6566
<licenses>
6667
<license>

0 commit comments

Comments
 (0)