Remove camel dependencies

diff --git a/logic/pom.xml b/logic/pom.xml
index 49a89c7..0b06b6c 100644 (file)
--- a/logic/pom.xml
+++ b/logic/pom.xml
@@ -169,24 +169,6 @@
     </dependency>
 
     <dependency>
     </dependency>
 
     <dependency>

-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel</artifactId>
-      <version>2.7.0</version>
-    </dependency>
-
-    <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-jetty</artifactId>
-        <version>2.7.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-http</artifactId>
-      <version>2.7.0</version>
-    </dependency>
-
-    <dependency>

       <groupId>se.scalablesolutions.akka</groupId>
       <artifactId>akka-testkit</artifactId>
       <version>1.3-RC2</version>
       <groupId>se.scalablesolutions.akka</groupId>
       <artifactId>akka-testkit</artifactId>
       <version>1.3-RC2</version>

diff --git a/logic/src/main/scala/gr/grnet/aquarium/rest/akka/service/SprayPingService.scala b/logic/src/main/scala/gr/grnet/aquarium/rest/akka/service/AquariumRESTService.scala
similarity index 90%
rename from logic/src/main/scala/gr/grnet/aquarium/rest/akka/service/SprayPingService.scala
rename to logic/src/main/scala/gr/grnet/aquarium/rest/akka/service/AquariumRESTService.scala
index d6c8554..8588f87 100644 (file)
--- a/logic/src/main/scala/gr/grnet/aquarium/rest/akka/service/SprayPingService.scala
+++ b/logic/src/main/scala/gr/grnet/aquarium/rest/akka/service/AquariumRESTService.scala
@@ -39,16 +39,22 @@ import org.slf4j.LoggerFactory
 import cc.spray.can.HttpMethods.GET
 import cc.spray.can._
 import akka.actor.Actor
 import cc.spray.can.HttpMethods.GET
 import cc.spray.can._
 import akka.actor.Actor

+import gr.grnet.aquarium.util.Loggable
+import net.liftweb.json.JsonAST.JValue

 
 /**
  *
  * @author Christos KK Loverdos <loverdos@gmail.com>.
  */
 
 /**
  *
  * @author Christos KK Loverdos <loverdos@gmail.com>.
  */

-class SprayPingService(_id: String = "spray-root-service") extends Actor {
-  private[this] val logger = LoggerFactory.getLogger(getClass)
-  
+class AquariumRESTService(_id: String = "spray-root-service", version: String) extends Actor with Loggable {

   self.id = _id
 
   self.id = _id
 

+  private[this] def jsonResponseOK(body: JValue, pretty: Boolean = false): HttpResponse = {
+    HttpResponse(
+      200,
+      HttpHeader("Content-type", "application/json;charset=utf-8") :: Nil,
+      )
+  }

   protected def receive = {
     case RequestContext(HttpRequest(GET, "/", _, _, _), _, responder) =>
       responder.complete(index)
   protected def receive = {
     case RequestContext(HttpRequest(GET, "/", _, _, _), _, responder) =>
       responder.complete(index)