Commit graph

75 commits

Author SHA1 Message Date
Jonas Bonér
b8ab69a951 Merge branch 'master' of git@github.com:jboner/akka 2010-07-02 13:11:54 +02:00
momania
678254fa8f Merge branch 'master' of http://github.com/jboner/akka
Conflicts:
	akka-amqp/src/main/scala/AMQP.scala
2010-07-02 12:49:57 +02:00
Jonas Bonér
f9c3f7b42b Changed Akka to use IllegalActorStateException instead of IllegalStateException 2010-07-02 11:39:25 +02:00
Jonas Bonér
d70ad2a867 Merge commit '02b816b893' 2010-07-01 23:58:01 +02:00
Jonas Bonér
70bbb9c5c1 Merge branch 'master' of git@github.com:jboner/akka 2010-07-01 23:27:04 +02:00
Jonas Bonér
e69bd6ec6d Merge branch 'master' of git@github.com:jboner/akka 2010-07-01 17:26:58 +02:00
Jonas Bonér
3f3ba3b97d Merge commit '38e8bea3fe'
Conflicts:
	akka-core/src/main/scala/actor/ActorRef.scala
	akka-core/src/test/java/se/scalablesolutions/akka/actor/ActiveObjectFailer.java
	akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/RemoteSupervisorSpec.scala
	akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/SupervisorSpec.scala
	akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
2010-07-01 17:21:17 +02:00
Jonas Bonér
4ce8ac09a4 Removed trailing whitespace 2010-06-30 16:26:15 +02:00
Jonas Bonér
fc97b18954 Converted TAB to SPACE 2010-06-30 16:20:20 +02:00
Viktor Klang
70f805bb88 FP approach always makes one happy 2010-06-27 23:54:12 +02:00
Viktor Klang
3f3a5fe67f Minor tidying 2010-06-27 23:45:49 +02:00
Viktor Klang
fa318962a4 Atmosphere bugfix 2010-06-25 15:54:41 +02:00
Jonas Bonér
0871bf3f32 Merge branch 'master' of git@github.com:jboner/akka 2010-06-24 16:19:08 +02:00
Martin Krasser
a8cef9c5a4 Merge branch 'master' of github.com:jboner/akka 2010-06-24 07:13:55 +02:00
Jonas Bonér
9eddbc90ef Merge branch 'master' of git@github.com:jboner/akka 2010-06-23 10:59:08 +02:00
Viktor Klang
baa3b49857 Added akka.conf values as defaults and removed lift dependency 2010-06-22 22:52:05 +02:00
Jonas Bonér
ebd7120ab2 Merge branch 'master' of git@github.com:jboner/akka 2010-06-22 07:23:05 +02:00
Johan Rask
e2e0b4be8a Merge branch 'master' of github.com:jboner/akka 2010-06-21 20:58:40 +02:00
Jonas Bonér
3457e64f22 Merge branch 'master' of git@github.com:jboner/akka 2010-06-21 20:26:35 +02:00
Johan Rask
2436780e22 Merge branch 'master' of github.com:jboner/akka 2010-06-21 13:25:10 +02:00
Heiko Seeberger
d584e3672b Merge branch '281-hseeberger' 2010-06-21 13:08:31 +02:00
Heiko Seeberger
254489ae7b closes #281: Made all subprojects test after breaking changes introduced by removing the type parameter from ActorRef.!!. 2010-06-21 13:08:10 +02:00
Heiko Seeberger
5328f6a6f0 re #281: Made all subprojects compile after breaking changes introduced by removing the type parameter from ActorRef.!!; test-compile still missing! 2010-06-21 12:47:23 +02:00
Heiko Seeberger
47e4aa1ca1 Merge branch 'master' into 281-hseeberger
Conflicts:
	akka-core/src/test/scala/InMemoryActorSpec.scala
	akka-core/src/test/scala/StmSpec.scala
2010-06-21 09:31:02 +02:00
Heiko Seeberger
f02c38d338 Merge branch 'master' into 281-hseeberger
Conflicts:
	akka-core/src/main/scala/remote/RemoteServer.scala
2010-06-19 15:54:51 +02:00
Jonas Bonér
6fe7d7c3af Added SerializableActor trait and friends 2010-06-17 07:30:07 +02:00
Martin Krasser
32aa6ea403 Merge branch 'master' of github.com:jboner/akka 2010-06-10 19:41:58 +02:00
Jonas Bonér
13ae10c967 Merge branch 'master' of git@github.com:jboner/akka 2010-06-08 20:47:35 +02:00
Martin Krasser
651d74a08a Merge commit 'remotes/origin/master' into 224-krasserm 2010-06-08 14:12:31 +02:00
Martin Krasser
bfd521858c Merge remote branch 'remotes/origin/master' into 224-krasserm 2010-06-06 08:57:40 +02:00
Martin Krasser
7a6304f52d Dropped service package and moved contained classes one level up. 2010-06-03 13:06:27 +02:00
Martin Krasser
71eb77332f Merge commit 'remotes/origin/master' into 224-krasserm 2010-06-02 10:47:38 +02:00
Jonas Bonér
0386e4277e Merge branch 'master' of git@github.com:jboner/akka 2010-06-01 20:57:26 +02:00
Jonas Bonér
e09050d90a Removed trailing whitespace 2010-06-01 18:41:39 +02:00
Viktor Klang
fd45a5af1c Upgraded Atmosphere to 0.6-SNAPSHOT 2010-05-30 21:40:20 +02:00
Jonas Bonér
07f82426b3 Merge branch 'master' of git@github.com:jboner/akka
Conflicts:
	config/akka-reference.conf
2010-05-30 12:52:33 +02:00
Viktor Klang
9460dfbc09 Merge branch 'master' of github.com:jboner/akka into wip-akka-rest-fix 2010-05-29 14:39:30 +02:00
Heiko Seeberger
c2fd680f79 Merge branch '247-hseeberger' 2010-05-29 10:56:19 +02:00
Heiko Seeberger
e72e660f30 Merge branch 'master' into 247-hseeberger 2010-05-29 06:59:32 +02:00
Jonas Bonér
e817aa9f32 Merge branch 'master' of git@github.com:jboner/akka 2010-05-29 00:04:07 +02:00
Jonas Bonér
90e0eb9748 Fixed issue with CommitBarrier and its registered callbacks + Added compensating 'barrier.decParties' to each 'barrier.incParties' 2010-05-28 23:50:08 +02:00
Viktor Klang
5b34bd318e Looks promising! 2010-05-28 23:13:37 +02:00
Viktor Klang
3188541373 Merge branch 'master' of github.com:jboner/akka into wip-akka-rest-fix 2010-05-28 21:49:38 +02:00
Viktor Klang
e6ec4a714b Merge branch 'master' of github.com:jboner/akka into wip-akka-rest-fix 2010-05-28 19:27:29 +02:00
Jonas Bonér
cbed93805c Merge branch 'master' of git@github.com:jboner/akka 2010-05-28 11:00:39 +02:00
Jonas Bonér
6f175cbe73 Fixed issue with sender reference in Active Objects 2010-05-28 10:58:32 +02:00
Viktor Klang
96bb8e381e Elaborated on classloader handling 2010-05-26 23:00:31 +02:00
Viktor Klang
ef8f11f8a6 Merge branch 'master' of github.com:jboner/akka 2010-05-26 21:47:25 +02:00
Viktor Klang
f0e2fa1327 Initial attempt at fixing akka rest 2010-05-25 21:53:49 +02:00
Jonas Bonér
0f783d9594 Merge branch 'master' of git@github.com:jboner/akka 2010-05-23 16:13:52 +02:00