Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restructured Props according to Akka 2.2-M3 #53

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Restructured Props according to Akka 2.2-M3 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
739df7f
Used Akka 2.2-M3 with restructured Props
Apr 29, 2013
6db0185
Merge remote-tracking branch 'upstream/master'
May 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions server/api/src/main/scala/org/eigengo/akkapatterns/api/boot.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ trait Api extends RouteConcatenation {
val routes =
new RecogService(recogCoordinator, actorSystem.settings.config.getString("server.web-server")).route

def rejectionHandler: PartialFunction[scala.List[Rejection], HttpResponse] = {
case (rejections: List[Rejection]) => HttpResponse(StatusCodes.BadRequest)
}

val rootService = actorSystem.actorOf(Props(new RoutedHttpService(routes)))

}
1 change: 1 addition & 0 deletions server/api/src/main/scala/org/eigengo/akkapatterns/api/customer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import org.eigengo.akkapatterns.core.CustomerController
import akka.util.Timeout
import scala.concurrent.Future
import java.util.Date
import org.eigengo.akkapatterns.domain.CustomerFormats

trait CustomerService extends HttpService {
this: EndpointMarshalling with AuthenticationDirectives =>
Expand Down
2 changes: 1 addition & 1 deletion server/api/src/main/scala/org/eigengo/akkapatterns/api/marshalling.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ trait EitherErrorMarshalling {
trait EndpointMarshalling extends MetaMarshallers with SprayJsonSupport
with ApiMarshalling
with UserFormats with CustomerFormats
with EitherErrorMarshalling
with EitherErrorMarshalling
15 changes: 0 additions & 15 deletions server/core/src/main/scala/org/eigengo/akkapatterns/core/CoreActorRefs.scala
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions server/core/src/main/scala/org/eigengo/akkapatterns/core/boot.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ trait ServerCore {
this: AmqpServerCore =>
def actorSystem: ActorSystem

lazy val recogCoordinator = actorSystem.actorOf(Props(new RecogCoordinatorActor(connectionActor)))
lazy val recogCoordinator = actorSystem.actorOf(Props(classOf[RecogCoordinatorActor], connectionActor))
lazy val messageDelivery = actorSystem.actorOf(Props[MessageDeliveryActor].withDispatcher("low-priority-dispatcher"))
lazy val userActor = actorSystem.actorOf(Props(new UserActor(messageDelivery)))
lazy val loginActor = actorSystem.actorOf(Props(new LoginActor(messageDelivery)))
lazy val userActor = actorSystem.actorOf(Props(classOf[UserActor], messageDelivery))
lazy val loginActor = actorSystem.actorOf(Props(classOf[LoginActor], messageDelivery))
}
2 changes: 1 addition & 1 deletion server/core/src/main/scala/org/eigengo/akkapatterns/core/recog/coordinator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class RecogCoordinatorActor(connectionActor: ActorRef) extends Actor {
def receive = {
case Begin =>
val id = UUID.randomUUID()
val instanceActor = context.actorOf(Props(new RecogSessionActor(connectionActor)), id.toString)
val instanceActor = context.actorOf(Props(classOf[RecogSessionActor], connectionActor), id.toString)
instanceActor ! SessionConfiguration(FaceFeature :: Nil)
sender ! id
case ProcessImage(id, image) =>
Expand Down
2 changes: 1 addition & 1 deletion server/project/build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ object Dependencies {
ExclusionRule(organization = "org.slf4j")
)

val akka_version = "2.1.2"
val akka_version = "2.2-M3"
val spray_version = "1.1-M7"

val java_logging = "com.github.fommil" % "java-logging" % "1.0"
Expand Down