WIP: Remodeling events

[aquarium] / src / main / scala / gr / grnet / aquarium / Configurator.scala

diff --git a/src/main/scala/gr/grnet/aquarium/Configurator.scala b/src/main/scala/gr/grnet/aquarium/Configurator.scala
index 667565f..8811a9f 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/Configurator.scala
+++ b/src/main/scala/gr/grnet/aquarium/Configurator.scala
@@ -35,16 +35,16 @@
 
 package gr.grnet.aquarium
 
+import events.im.IMEventModel
 import java.io.File
 
 import com.ckkloverdos.maybe._
 import com.ckkloverdos.props.Props
 import com.ckkloverdos.convert.Converters.{DefaultConverters => TheDefaultConverters}
 
-import gr.grnet.aquarium.actor.provider.ActorProvider
+import gr.grnet.aquarium.service._
 import gr.grnet.aquarium.util.{Lifecycle, Loggable}
 import gr.grnet.aquarium.store._
-import service.{AkkaService, IMEventProcessorService, ResourceEventProcessorService}
 
 /**
  * The master configurator. Responsible to load all of application configuration and provide the relevant services.
@@ -81,9 +81,9 @@ class Configurator(val props: Props) extends Loggable {
 
   }
 
-  private[this] lazy val _actorProvider: ActorProvider = {
-    val instance = newInstance[ActorProvider](props.getEx(Keys.actor_provider_class))
-    logger.info("Loaded ActorProvider: %s".format(instance.getClass))
+  private[this] lazy val _actorProvider: ActorProviderService = {
+    val instance = newInstance[ActorProviderService](props.getEx(Keys.actor_provider_class))
+    logger.info("Loaded ActorProviderService: %s".format(instance.getClass))
     instance
   }
 
@@ -351,7 +351,7 @@ object Configurator {
     final val version = "version"
 
     /**
-     * The fully qualified name of the class that implements the `ActorProvider`.
+     * The fully qualified name of the class that implements the `ActorProviderService`.
      * Will be instantiated reflectively and should have a public default constructor.
      */
     final val actor_provider_class = "actor.provider.class"
@@ -536,7 +536,7 @@ object Configurator {
     final val events_store_folder = "events.store.folder"
 
     /**
-     * If set to `true`, then an IM event that cannot be parsed to [[gr.grnet.aquarium.events.IMEvent]] is
+     * If set to `true`, then an IM event that cannot be parsed to [[gr.grnet.aquarium.events.im.IMEventModel]] is
      * saved to the [[gr.grnet.aquarium.store.IMEventStore]].
      */
     final val save_unparsed_event_im = "save.unparsed.event.im"
@@ -547,4 +547,9 @@ object Configurator {
      */
     final val admin_cookie = "admin.cookie"
   }
+
+  object HTTP {
+    final val RESTAdminHeaderName = "X-Aquarium-Admin-Cookie"
+    final val RESTAdminHeaderNameLowerCase = RESTAdminHeaderName.toLowerCase
+  }
 }