[infinispan-commits] Infinispan SVN: r1261 - in trunk/server/rest/src: test/scala/org/infinispan/rest and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-12-07 09:47:09 -0500 (Mon, 07 Dec 2009)
New Revision: 1261

Modified:
   trunk/server/rest/src/main/scala/org/infinispan/rest/StartupListener.scala
   trunk/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala
   trunk/server/rest/src/test/scala/org/infinispan/rest/ServerInstance.scala
Log:
* Updated to use a default LOCAL mode config
* Added TODO for ISPN-281
* Used explicit imports to prevent Maia Scala plugin from bitching

Modified: trunk/server/rest/src/main/scala/org/infinispan/rest/StartupListener.scala
===================================================================
--- trunk/server/rest/src/main/scala/org/infinispan/rest/StartupListener.scala	2009-12-07 12:26:32 UTC (rev 1260)
+++ trunk/server/rest/src/main/scala/org/infinispan/rest/StartupListener.scala	2009-12-07 14:47:09 UTC (rev 1261)
@@ -11,7 +11,8 @@
  */
 class StartupListener extends ServletContextListener {
   def contextInitialized(ev: ServletContextEvent) = {
-    ManagerInstance.instance = new DefaultCacheManager("infinispan-config.xml")
+    // Start with the default config (LOCAL mode!)  TODO - add the ability to specify a config file when deploying (ISPN-281)
+    ManagerInstance.instance = new DefaultCacheManager()
     ManagerInstance.instance.start
   }
   def contextDestroyed(ev: ServletContextEvent) = {

Modified: trunk/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala
===================================================================
--- trunk/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala	2009-12-07 12:26:32 UTC (rev 1260)
+++ trunk/server/rest/src/test/scala/org/infinispan/rest/IntegrationTest.scala	2009-12-07 14:47:09 UTC (rev 1261)
@@ -1,14 +1,14 @@
 package org.infinispan.rest
 
 
-import apache.commons.httpclient.methods._
-import apache.commons.httpclient.{Header, HttpClient}
-import container.entries.CacheEntry
+import org.apache.commons.httpclient.methods._
+import org.apache.commons.httpclient.{Header, HttpClient}
+import org.infinispan.container.entries.CacheEntry
 import javax.servlet.http.{HttpServletResponse}
-import remoting.MIMECacheEntry
+import org.infinispan.remoting.MIMECacheEntry
 import java.io._
-import testng.annotations.Test
-import testng.Assert._
+import org.testng.annotations.Test
+import org.testng.Assert._
 
 
 /**

Modified: trunk/server/rest/src/test/scala/org/infinispan/rest/ServerInstance.scala
===================================================================
--- trunk/server/rest/src/test/scala/org/infinispan/rest/ServerInstance.scala	2009-12-07 12:26:32 UTC (rev 1260)
+++ trunk/server/rest/src/test/scala/org/infinispan/rest/ServerInstance.scala	2009-12-07 14:47:09 UTC (rev 1261)
@@ -1,9 +1,9 @@
 package org.infinispan.rest
 
 
-import apache.commons.httpclient.{HttpClient, HttpMethodBase}
-import jboss.resteasy.plugins.server.servlet.{ResteasyBootstrap, HttpServletDispatcher}
-import mortbay.jetty.servlet.Context
+import org.apache.commons.httpclient.{HttpClient, HttpMethodBase}
+import org.jboss.resteasy.plugins.server.servlet.{ResteasyBootstrap, HttpServletDispatcher}
+import org.mortbay.jetty.servlet.Context
 
 /**
  *