updated to Scala 2.10.0, Lift 2.5-M4

README

@@ -4,4 +4,12 @@ mvn install
 cd web
 mvn jetty:run
 
-Then point your favorite browser to http://localhost:9090/
+Then point your favorite browser to http://localhost:9090/
+
+This is a fork from:
+https://github.com/rmuri/TravelCompanionScala
+
+There is some doc on the initial project.
+The latest lift doc is at :
+http://liftweb.net
+http://cookbook.liftweb.net

pom.xml

@@ -9,26 +9,25 @@
     <version>1.0</version>
     <name>TravelCompanionScala Master</name>
     <packaging>pom</packaging>
-    <inceptionYear>2010</inceptionYear>
+    <inceptionYear>2013</inceptionYear>
     <properties>
-        <scala.version>2.8.1</scala.version>
+        <scala.version>2.10.0</scala.version>
     </properties>
 
-    <!-- Set up repo for ScalaJPA -->
     <repositories>
         <repository>
             <id>scala-tools.releases</id>
             <name>Scala-Tools Dependencies Repository for Releases</name>
-            <url>http://scala-tools.org/repo-releases</url>
+            <url>https://oss.sonatype.org/content/groups/scala-tools</url>
         </repository>
         <repository>
             <id>scala-tools.snapshots</id>
             <name>Scala-Tools Dependencies Repository for Snapshots</name>
-            <url>http://scala-tools.org/repo-snapshots</url>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
         </repository>
         <repository>
             <id>EclipseLink Repo</id>
-            <url>http://www.eclipse.org/downloads/download.php?r=1&amp;nf=1&amp;file=/rt/eclipselink/maven.repo</url>
+            <url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
         </repository>
         <repository>
             <id>jboss</id>
@@ -46,7 +45,12 @@
         <pluginRepository>
             <id>scala-tools.releases</id>
             <name>Scala-Tools Plugins Repository for Releases</name>
-            <url>http://scala-tools.org/repo-releases</url>
+            <url>https://oss.sonatype.org/content/groups/scala-tools</url>
+        </pluginRepository>
+        <pluginRepository>
+            <id>org.mortbay.jetty</id>
+            <name>jetty</name>
+            <url>http://mvnrepository.com/artifact/org.mortbay.jetty</url>
         </pluginRepository>
     </pluginRepositories>
 
@@ -63,12 +67,6 @@
             <version>${scala.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.4.2.0</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -121,6 +119,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.13</version>
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>

spa/pom.xml

@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.2.137</version>
+            <version>1.3.170</version>
         </dependency>
         <dependency>
             <groupId>geronimo-spec</groupId>
@@ -28,14 +28,9 @@
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
-            <version>2.1.0</version>
+            <version>2.4.0</version>
             <scope>runtime</scope>
         </dependency>
-        <!--<dependency>-->
-        <!--<groupId>javax.persistence</groupId>-->
-        <!--<artifactId>persistence-api</artifactId>-->
-        <!--<version>1.0</version>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>javax.persistence</artifactId>

spa/src/main/scala/TravelCompanionScala/model/BlogEntry.scala

@@ -5,6 +5,7 @@ import javax.persistence._
 import java.util.{Date, ArrayList}
 import org.hibernate.validator.constraints._
 import javax.validation.constraints._
+import java.util
 
 /**
  * Created by IntelliJ IDEA.
@@ -45,7 +46,7 @@ class BlogEntry {
   var owner: Member = null
 
   @OneToMany(mappedBy = "blogEntry", cascade = Array(CascadeType.ALL), targetEntity = classOf[Comment])
-  var comments: java.util.List[Comment] = new ArrayList[Comment]()
+  var comments: java.util.List[Comment] = new util.ArrayList[Comment]()
 }
 
 }

spa/src/main/scala/TravelCompanionScala/model/Comment.scala

@@ -2,7 +2,7 @@ package TravelCompanionScala {
 package model {
 
 import javax.persistence._
-import _root_.java.util._
+import java.util._
 import javax.validation.constraints._
 import org.hibernate.validator.constraints.NotEmpty
 

spa/src/main/scala/TravelCompanionScala/model/Location.scala

@@ -2,7 +2,6 @@ package TravelCompanionScala {
 package model {
 
 import javax.persistence._
-import _root_.java.util._
 
 /**
  * Created by IntelliJ IDEA.

spa/src/main/scala/TravelCompanionScala/model/Member.scala

@@ -2,8 +2,10 @@ package TravelCompanionScala {
 package model {
 
 import javax.persistence._
-import _root_.java.util._
+import java.util._
 import org.hibernate.validator.constraints._
+import java.util
+
 
 /**
  * Created by IntelliJ IDEA.
@@ -16,6 +18,12 @@ import org.hibernate.validator.constraints._
 @Entity
 @Table(name = "members")
 class Member() {
+
+//   val toXML: NodeSeq = {
+//     NodeSeq.Empty
+//  }
+
+
   @Id
   @GeneratedValue(strategy = GenerationType.AUTO)
   var id: Long = _
@@ -48,17 +56,17 @@ class Member() {
   var zipcode: String = ""
 
   @OneToMany(mappedBy = "owner", cascade = Array(CascadeType.ALL), targetEntity = classOf[Tour])
-  var tours: List[Tour] = new ArrayList[Tour]()
+  var tours: util.List[Tour] = new util.ArrayList[Tour]()
 
   @OneToMany(mappedBy = "owner", cascade = Array(CascadeType.ALL), targetEntity = classOf[BlogEntry])
-  val blogEntries: List[BlogEntry] = new ArrayList[BlogEntry]()
+  val blogEntries: util.List[BlogEntry] = new util.ArrayList[BlogEntry]()
 
   @OneToMany(mappedBy = "owner", cascade = Array(CascadeType.ALL))
-  val pictures: List[Picture] = new ArrayList[Picture]()
+  val pictures: util.List[Picture] = new util.ArrayList[Picture]()
 
   @ManyToMany(cascade = Array(CascadeType.ALL))
   @JoinTable(name = "member_roles", joinColumns = Array(new JoinColumn(name = "member", referencedColumnName = "id")), inverseJoinColumns = Array(new JoinColumn(name = "roles", referencedColumnName = "id")))
-  val roles: List[Role] = new ArrayList[Role]()
+  val roles: util.List[Role] = new util.ArrayList[Role]()
 
   override def equals(that: Any): Boolean = that match {
     case other: Member => id == other.id

spa/src/main/scala/TravelCompanionScala/model/Stage.scala

@@ -2,7 +2,7 @@ package TravelCompanionScala {
 package model {
 
 import javax.persistence._
-import _root_.java.util._
+import java.util._
 import org.hibernate.validator.constraints._
 import javax.validation.constraints._
 
@@ -31,11 +31,11 @@ class Stage {
   @Temporal(TemporalType.DATE)
   @Column(name = "startdate")
   @NotNull
-  var startdate: Date = null;
+  var startdate: Date = null
 
   @OneToOne
   @NotNull
-  var destination: Location = null;
+  var destination: Location = null
 
   @ManyToOne
   @NotNull

spa/src/main/scala/TravelCompanionScala/model/Tour.scala

@@ -2,9 +2,10 @@ package TravelCompanionScala {
 package model {
 
 import javax.persistence._
-import _root_.java.util._
+import java.util._
 import org.hibernate.validator.constraints._
 import javax.validation.constraints._
+import java.util
 
 /**
  * Created by IntelliJ IDEA.
@@ -33,10 +34,10 @@ class Tour {
   var owner: Member = null
 
   @OneToMany(mappedBy = "tour", cascade = Array(CascadeType.ALL), targetEntity = classOf[Stage])
-  var stages: List[Stage] = new ArrayList[Stage]()
+  var stages: util.List[Stage] = new util.ArrayList[Stage]()
 
   @OneToMany(mappedBy = "tour", cascade = Array(CascadeType.ALL), targetEntity = classOf[BlogEntry])
-  var blogEntries: List[BlogEntry] = new ArrayList[BlogEntry]()
+  var blogEntries: util.List[BlogEntry] = new util.ArrayList[BlogEntry]()
 
 }
 

spa/src/test/scala/TravelCompanionScala/model/TestJPAWeb.scala

@@ -19,15 +19,15 @@ class TestJPAWeb {
   var emf : EntityManagerFactory = _
 
   @Before
-  def initEMF () = {
+  def initEMF () {
     try {
       emf = Persistence.createEntityManagerFactory("jpaweb")
     } catch {
       case e: Exception => {
-        def printAndDescend(ex : Throwable) : Unit = {
-        println(e.getMessage())
-          if (ex.getCause() != null) {
-            printAndDescend(ex.getCause())
+        def printAndDescend(ex : Throwable) {
+        println(e.getMessage)
+          if (ex.getCause != null) {
+            printAndDescend(ex.getCause)
           }
         }
         printAndDescend(e)
@@ -36,16 +36,16 @@ class TestJPAWeb {
   }
 
   @After
-  def closeEMF () = {
+  def closeEMF () {
     if (emf != null) emf.close()
   }
 
 
   @Test
-  def save_stuff () = {
+  def save_stuff () {
 
     var em = emf.createEntityManager()
-    val tx = em.getTransaction()
+    val tx = em.getTransaction
 
     tx.begin()
 
@@ -78,21 +78,21 @@ class TestJPAWeb {
     println("Found member " + retrieved.get(0).owner.name)
 
     ///clenaup
-    em.getTransaction().begin()
+    em.getTransaction.begin()
 
     em.remove(em.getReference(classOf[Tour],tour.id))
     em.remove(em.getReference(classOf[Member],member.id))
 
-    em.getTransaction().commit()
+    em.getTransaction.commit()
 
     em.close()
   }
 
   @Test
-  def collection () = {
+  def collection () {
 
     var em = emf.createEntityManager()
-    val tx = em.getTransaction()
+    val tx = em.getTransaction
 
     tx.begin()
 
@@ -130,13 +130,13 @@ class TestJPAWeb {
 //    println("Found member " + retrieved.get(1).name)
 
      ///cleanup
-    em.getTransaction().begin()
+    em.getTransaction.begin()
 
     em.remove(em.getReference(classOf[Tour],tour.id))
     em.remove(em.getReference(classOf[Tour],tour2.id))
     em.remove(em.getReference(classOf[Member],member.id))
 
-    em.getTransaction().commit()
+    em.getTransaction.commit()
 
     em.close()
   }

spa/src/test/scala/TravelCompanionScala/model/TestTravelGenerator.scala

@@ -14,20 +14,21 @@ import org.junit.Before
 import org.junit.After
 import javax.persistence.{Persistence, EntityManagerFactory}
 import java.util.{Date, ArrayList}
+import java.util
 
 class TestTravelGenerator {
   var emf: EntityManagerFactory = _
 
   @Before
-  def initEMF() = {
+  def initEMF() {
     try {
       emf = Persistence.createEntityManagerFactory("jpaweb")
     } catch {
       case e: Exception => {
-        def printAndDescend(ex: Throwable): Unit = {
-          println(e.getMessage())
-          if (ex.getCause() != null) {
-            printAndDescend(ex.getCause())
+        def printAndDescend(ex: Throwable) {
+          println(e.getMessage)
+          if (ex.getCause != null) {
+            printAndDescend(ex.getCause)
           }
         }
         printAndDescend(e)
@@ -36,14 +37,14 @@ class TestTravelGenerator {
   }
 
   @After
-  def closeEMF() = {
+  def closeEMF() {
     if (emf != null) emf.close()
   }
 
   @Test
-  def generate() = {
+  def generate() {
     var em = emf.createEntityManager()
-    val tx = em.getTransaction()
+    val tx = em.getTransaction
 
     tx.begin()
 
@@ -72,17 +73,17 @@ class TestTravelGenerator {
       var location: Location = createDummyLocation
       em.persist(location)
 
-      var stages = new ArrayList[Stage]()
+      var stages = new util.ArrayList[Stage]()
       var stage = new Stage
-      stage.startdate = new Date;
+      stage.startdate = new Date
       stage.description = "startbeschreibung"
       stage.name = "Start"
       stage.tour = tour
       stage.destination = location
       em.persist(stage)
 
       stages.add(stage)
-      tour.stages = stages;
+      tour.stages = stages
       em.merge(tour)
     }