svn commit: r785356 - in /incubator/esme/trunk/server/src: main/scala/bootstrap/liftweb/Boot.scala test/scala/org/apache/esme/lib/MsgParseTest.scala

[dpp]

Author: dpp
Date: Tue Jun 16 19:41:32 2009
New Revision: 785356

URL: http://svn.apache.org/viewvc?rev=785356&view=rev
Log:
Fixed tests

Modified:
    incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
    
incubator/esme/trunk/server/src/test/scala/org/apache/esme/lib/MsgParseTest.scala

Modified: 
incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: 
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=785356&r1=785355&r2=785356&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala 
(original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Tue 
Jun 16 19:41:32 2009
@@ -204,7 +204,6 @@
                     Props.get("db_pwd", ""))
       Full(dm)
     } else {
-      Class.forName("org.apache.derby.jdbc.EmbeddedDriver")
       val driverName = Props.mode match {
         case Props.RunModes.Test => "jdbc:derby:esme_test_db;create=true"
         case _ => "jdbc:derby:esme_db;create=true"

Modified: 
incubator/esme/trunk/server/src/test/scala/org/apache/esme/lib/MsgParseTest.scala
URL: 
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/test/scala/org/apache/esme/lib/MsgParseTest.scala?rev=785356&r1=785355&r2=785356&view=diff
==============================================================================
--- 
incubator/esme/trunk/server/src/test/scala/org/apache/esme/lib/MsgParseTest.scala
 (original)
+++ 
incubator/esme/trunk/server/src/test/scala/org/apache/esme/lib/MsgParseTest.scala
 Tue Jun 16 19:41:32 2009
@@ -30,11 +30,12 @@
 import MsgParser._
 import net.sourceforge.jwebunit.junit.WebTester
 import org.mortbay.jetty.Server
-//import org.mortbay.jetty.servlet.Context
+import org.mortbay.jetty.servlet.{Context, FilterHolder}
 import org.mortbay.jetty.servlet.ServletHolder
-// import org.mortbay.jetty.webapp.WebAppContext
+import org.mortbay.jetty.webapp.WebAppContext
 import org.apache.esme._
 import model._
+import net.liftweb.http._
 
 import net.sourceforge.jwebunit.junit.WebTester
 import _root_.junit.framework.AssertionFailedError
@@ -43,6 +44,8 @@
 object MsgParserSpecsRunner extends ConsoleRunner(MsgParserSpecs)
 
 object MsgParserSpecs extends Specification {
+  (new bootstrap.liftweb.Boot).boot
+  
   JettyTestServer.start()
   
   type PFT = MsgParser.ParseResult[_]
@@ -303,15 +306,16 @@
 
   private val server_ : Server = {
     val server = new Server(serverPort_)
-    /*
+    
     val context = new WebAppContext()
     context.setServer(server)
     context.setContextPath("/")
-    context.setWar("src/main/webapp")
-    */
-    //val context = new Context(_server, "/", Context.SESSIONS)
+    context.setWar("target/esme-server-0.3.0-SNAPSHOT")
+    
+    //val context = new Context(server, "/", Context.SESSIONS)
     //context.addFilter(new FilterHolder(new LiftFilter()), "/");
-    // server.addHandler(context)
+    //new LiftFilter()
+    //server.addHandler(context)
     server
   }