Issue 10 - Fix wicket-scala-sample in master branch due to upstream c…

…hange Upgrade to Scala 2.8.1 (latest stable) Upgrade the testing libraries to their latest stable version compiled against Scala 2.8.1 Now the compile phase passes for all modules but the tests cannot start.
wicketstuff · Feb 10, 2011 · fa34e5d · fa34e5d
1 parent c2c8cee
commit fa34e5d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/jdk-1.5-parent/scala-extensions-parent/pom.xml b/jdk-1.5-parent/scala-extensions-parent/pom.xml
@@ -34,12 +34,12 @@
 		<dependency>
 			<groupId>org.scala-lang</groupId>
 			<artifactId>scala-library</artifactId>
-			<version>2.7.5</version>
+			<version>2.8.1</version>
 		</dependency>
 		<dependency>
-			<groupId>org.scala-tools.testing</groupId>
+			<groupId>org.scalatest</groupId>
 			<artifactId>scalatest</artifactId>
-			<version>0.9.5</version>
+			<version>1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.wicket</groupId>

diff --git a/jdk-1.5-parent/scala-extensions-parent/wicket-scala/pom.xml b/jdk-1.5-parent/scala-extensions-parent/wicket-scala/pom.xml
@@ -17,9 +17,9 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.scala-tools.testing</groupId>
-			<artifactId>specs</artifactId>
-			<version>1.5.0</version>
+			<artifactId>specs_2.8.1</artifactId>
+			<version>1.6.7.2</version>
 		</dependency>
 	</dependencies>
 
-</project>
+</project>
diff --git a/...xtensions-parent/wicket-scala/src/main/scala/org/wicketstuff/scala/SimpleComponents.scala b/...xtensions-parent/wicket-scala/src/main/scala/org/wicketstuff/scala/SimpleComponents.scala
@@ -19,7 +19,7 @@ class SForm[T](id:String, model:IModel[T] , onSubmitFunc: ⇒ Unit) extends Form
 
 }
 
-class SLabel(id:String, gtr: ⇒ String) extends Label[String](id, new Fodel(gtr, null)) {
+class SLabel(id:String, gtr: ⇒ String) extends Label(id, new Fodel(gtr, null)) {
 
   def print = println(gtr)
 

diff --git a/...xtensions-parent/wicket-scala/src/test/scala/org/wicketstuff/scala/ScalaWicketSpecs.scala b/...xtensions-parent/wicket-scala/src/test/scala/org/wicketstuff/scala/ScalaWicketSpecs.scala
@@ -1,7 +1,7 @@
 package org.wicketstuff.scala
 
 import org.apache.wicket.markup.html.basic.Label
-import org.apache.wicket.model.PropertyModel
+import org.apache.wicket.model.{Model,PropertyModel}
 
 import org.specs._
 import org.specs.runner._
@@ -67,7 +67,7 @@ class ScalaWicketSpecs extends Specification with JUnit with ScalaTest with Scal
     "allow us to create a ListView out of a Scala List" in {
       import org.apache.wicket.markup.html.list._
       val wt = new WicketTester
-      val lv = new ListView[Int]("myListView", List(1,2,3)) {
+      val lv = new ListView[Int]("myListView", Model.ofList(List(1,2,3))) {
         override def populateItem(li:ListItem[Int]) = println("o Hi!")
       }
       lv.getModelObject.size mustBe 3