Upgrade to Tapestry 5.6.3 and fix selenium tests

pom.xml

@@ -17,17 +17,17 @@
      <licenses>
 		<license>
 			<name>Apache Software License 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
 	<organization>
 		<name>GOT5</name>
 		<url>https://github.com/got5</url>
-	</organization>	
+	</organization>
 	<issueManagement>
 		<system>Github</system>
-		<url>http://github.com/got5</url>
+		<url>https://github.com/got5</url>
 	</issueManagement>
 	<scm>
 	    <connection>scm:git:[email protected]:got5/tapestry5-jquery.git</connection>
@@ -81,7 +81,7 @@
 	    </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
+            <artifactId>selenium-support</artifactId>
             <version>${selenium-version}</version>
             <scope>test</scope>
             <exclusions>
@@ -97,9 +97,19 @@
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-server</artifactId>
+            <artifactId>selenium-leg-rc</artifactId>
             <version>${selenium-version}</version>
             <scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>jetty-websocket</artifactId>
+					<groupId>org.eclipse.jetty</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>javax.servlet-api</artifactId>
+					<groupId>javax.servlet</groupId>
+				</exclusion>
+			</exclusions>
         </dependency>
         <dependency>
 			<groupId>ch.qos.logback</groupId>
@@ -147,8 +157,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>8</source>
+					<target>8</target>
 					<optimize>true</optimize>
 				</configuration>
 			</plugin>
@@ -274,7 +284,7 @@
 							<junitArtifactName>none:none</junitArtifactName>
 							<testNGArtifactName>org.testng:testng</testNGArtifactName>
 							<suiteXmlFiles>
-								<suiteXmlFile>target/test-classes/testng.xml</suiteXmlFile>	
+								<suiteXmlFile>target/test-classes/testng.xml</suiteXmlFile>
 							</suiteXmlFiles>
 							<excludes>
 								<exclude>**/*.groovy</exclude>
@@ -285,8 +295,8 @@
 						</configuration>
 					</execution>
 				</executions>
-			</plugin>	
-			
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 		        <artifactId>maven-assembly-plugin</artifactId>
@@ -344,7 +354,7 @@
             	<groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
                 <version>2.5</version>
-            </plugin>       	
+            </plugin>
 		</plugins>
 	</reporting>
     <repositories>
@@ -356,7 +366,7 @@
 			<id>central</id>
 			<name>Maven Repository</name>
 			<layout>default</layout>
-			<url>http://central.maven.org/maven2/</url>
+			<url>https://repo1.maven.org/maven2/</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
@@ -365,12 +375,12 @@
     <pluginRepositories>
         <pluginRepository>
             <id>maven</id>
-            <url>http://central.maven.org/maven2/</url>
+            <url>https://repo1.maven.org/maven2/</url>
         </pluginRepository>
         <pluginRepository>
         <id>spring-maven-release</id>
         <name>Spring Maven Release Repository</name>
-        <url>http://maven.springframework.org/release</url>
+        <url>https://maven.springframework.org/release</url>
     </pluginRepository>
     </pluginRepositories>
     <distributionManagement>
@@ -432,8 +442,8 @@
 	</profiles>
 	<properties>
 		<spock-version>0.6-groovy-1.8</spock-version>
-        <tapestry-release-version>5.4.1</tapestry-release-version>
-        <selenium-version>2.35.0</selenium-version>
+        <tapestry-release-version>5.6.3</tapestry-release-version>
+        <selenium-version>3.12.0</selenium-version>
         <browserStartCommand>*googlechrome</browserStartCommand>
         <sourceDirectory>src/main/java</sourceDirectory>
 	</properties>

src/main/java/org/got5/tapestry5/jquery/mixins/CustomDatepicker.java

@@ -64,7 +64,7 @@ public class CustomDatepicker {
 
 	@Inject
 	@Symbol(JQuerySymbolConstants.SUPPRESS_PROTOTYPE)
-	private Boolean supressPrototype;
+	private Boolean suppressPrototype;
 
 	@Inject
 	private ThreadLocale locale;
@@ -85,7 +85,7 @@ public class CustomDatepicker {
 	 * change the JSON option of the jQuery datepicker widget
 	 */
 	void afterRender() {
-		if (supressPrototype) {
+		if (suppressPrototype) {
 			/*
 			 * If the selector parameter is not bound, we will use the clientId
 			 * of the component using the mixin
@@ -101,7 +101,7 @@ void afterRender() {
 
             JSONObject temp = widgetParams.paramsForWidget(this.getClass().getSimpleName().toLowerCase());
             if(temp != null){
-                defaultParamsObject = temp;
+                defaultParamsObject = temp.copy();
             }
 
             defaultParamsObject.put("dateFormat", toJQueryUIDateFormat());

src/main/java/org/got5/tapestry5/jquery/services/WidgetParams.java

@@ -13,6 +13,6 @@
 @UsesMappedConfiguration(value = JSONObject.class)
 public interface WidgetParams {
 
-	public abstract JSONObject paramsForWidget(String widget);
+	JSONObject paramsForWidget(String widget);
 
 }

src/main/resources/META-INF/modules/tjq/PageScroll.js

@@ -27,7 +27,7 @@ define([ "t5/core/dom", "t5/core/zone", "t5/core/events", "tjq/vendor/components
 
             this.disable = true;
             scroller.addClass("scrollExtend-loading");
-            if (activeZone.length != 0) {
+            if (activeZone.length !== 0) {
                 this.disable = true;
 
                 activeZone.trigger(events.zone.refresh, {

src/test/java/org/got5/tapestry5/jquery/AccordionTest.java

@@ -1,11 +1,11 @@
 package org.got5.tapestry5.jquery;
 
-import org.apache.tapestry5.test.SeleniumTestCase;
+import org.got5.tapestry5.jquery.test.SeleniumTestCase2;
 import org.testng.annotations.Test;
 
 import com.thoughtworks.selenium.Wait;
 
-public class AccordionTest extends SeleniumTestCase{
+public class AccordionTest extends SeleniumTestCase2{
 
 	@Test
     public void testAccordion()

src/test/java/org/got5/tapestry5/jquery/AjaxFormLoopTest.java

@@ -1,11 +1,11 @@
 package org.got5.tapestry5.jquery;
 
-import org.apache.tapestry5.test.SeleniumTestCase;
+import org.got5.tapestry5.jquery.test.SeleniumTestCase2;
 import org.testng.annotations.Test;
 
 import com.thoughtworks.selenium.Wait;
 
-public class AjaxFormLoopTest extends SeleniumTestCase{
+public class AjaxFormLoopTest extends SeleniumTestCase2{
 
 	@Test
     public void testAjaxFormLoop(){

src/test/java/org/got5/tapestry5/jquery/AutocompleteTest.java

@@ -1,23 +1,21 @@
 package org.got5.tapestry5.jquery;
 
-import org.apache.tapestry5.test.SeleniumTestCase;
-import org.testng.annotations.Test;
-
 import com.thoughtworks.selenium.Wait;
+import org.got5.tapestry5.jquery.test.SeleniumTestCase2;
+import org.openqa.selenium.interactions.Actions;
+import org.testng.annotations.Test;
 
-public class AutocompleteTest extends SeleniumTestCase{
+public class AutocompleteTest extends SeleniumTestCase2{
 
 	@Test
     public void testAutoComplete()
     {
         open("/ext/jqueryautocomplete");
         waitForPageToLoad();
 
-        focus("identifier=foo");
-        type("identifier=foo", "abcdeff");
-        keyDown("identifier=foo", "e");
-        keyUp("identifier=foo", "e");
-        fireEvent("identifier=foo", "keydown");
+        focus("id=foo");
+        type("id=foo", "abcdeff");
+        new Actions(webDriver).sendKeys("e").perform();
 
         new Wait()
         {

src/test/java/org/got5/tapestry5/jquery/BindTest.java

@@ -1,11 +1,11 @@
 package org.got5.tapestry5.jquery;
 
-import org.apache.tapestry5.test.SeleniumTestCase;
+import org.got5.tapestry5.jquery.test.SeleniumTestCase2;
 import org.testng.annotations.Test;
 
 import com.thoughtworks.selenium.Wait;
 
-public class BindTest extends SeleniumTestCase{
+public class BindTest extends SeleniumTestCase2{
 
 	@Test
     public void testBind(){
@@ -31,7 +31,7 @@ public boolean until()
             }
         }.wait("element not found", JQueryTestConstants.TIMEOUT);
 
-        assertEquals(getText("identifier=clickZone"), "click OK");
+        assertEquals(getText("id=clickZone"), "click OK");
 	}
 
 }

src/test/java/org/got5/tapestry5/jquery/ButtonTest.java

@@ -1,11 +1,11 @@
 package org.got5.tapestry5.jquery;
 
-import org.apache.tapestry5.test.SeleniumTestCase;
+import org.got5.tapestry5.jquery.test.SeleniumTestCase2;
 import org.testng.annotations.Test;
 
 import com.thoughtworks.selenium.Wait;
 
-public class ButtonTest extends SeleniumTestCase{
+public class ButtonTest extends SeleniumTestCase2{
 	@Test
     public void testButtonMixin(){