raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Merge branch 'wip-typed-actor-jboner' into master

Browse source 
Conflicts:
	akka-core/src/test/scala/ActiveObjectContextSpec.scala
	akka-core/src/test/scala/ActiveObjectGuiceConfiguratorSpec.scala
	akka-core/src/test/scala/ActorObjectUtilFunctionsSpec.scala
	akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/NestedTransactionalTypedActorSpec.scala
	akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/RemoteTransactionalTypedActorSpec.scala
	akka-core/src/test/scala/RestartNestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/RestartNestedTransactionalTypedActorSpec.scala
	akka-core/src/test/scala/RestartTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/RestartTransactionalTypedActorSpec.scala
	akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/TransactionalTypedActorSpec.scala
	akka-core/src/test/scala/TypedActorContextSpec.scala
	akka-core/src/test/scala/TypedActorGuiceConfiguratorSpec.scala
	akka-core/src/test/scala/TypedActorUtilFunctionsSpec.scala
	akka-core/src/test/scala/actor/ActiveObjectContextSpec.scala
	akka-core/src/test/scala/actor/ActiveObjectGuiceConfiguratorSpec.scala
	akka-core/src/test/scala/actor/ActiveObjectLifecycleSpec.scala
	akka-core/src/test/scala/actor/ActorObjectUtilFunctionsSpec.scala
	akka-core/src/test/scala/actor/NestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/actor/RestartNestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/actor/RestartTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/actor/TransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/remote/RemoteTransactionalActiveObjectSpec.scala
This commit is contained in:
Jonas Bonér 2010-07-28 20:21:59 +02:00
commit 117eb3bf92
123 changed files with 3546 additions and 2511 deletions
Download patch file Download diff file Expand all files Collapse all files

2
project/build/AkkaProject.scala
View file

@ -591,7 +591,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
// Test
// -------------------------------------------------------------------------------------------------------------------
class AkkaActiveObjectTestProject(info: ProjectInfo) extends DefaultProject(info) {
class AkkaTypedActorTestProject(info: ProjectInfo) extends DefaultProject(info) {
// testing
val junit = "junit" % "junit" % "4.5" % "test"
val jmock = "org.jmock" % "jmock" % "2.4.0" % "test"