Commit graph

12466 commits

Author SHA1 Message Date
Jonas Bonér
5bcbdb22eb Merge branch 'master' of github.com:jboner/akka 2011-06-16 11:25:56 +02:00
Jonas Bonér
6f89c6270e Renamed ReplicationSpec to TransactionLogSpec. + Added sections to the Developer Guidelines on process 2011-06-16 11:25:48 +02:00
Derek Williams
d9f5561e7f Merge branch 'master' into promisestream 2011-06-15 14:57:24 -06:00
Roland
6a3049e4c5 document Channel contravariance 2011-06-15 21:05:37 +02:00
Roland
da7d878387 make Channel contravariant 2011-06-15 20:39:29 +02:00
Viktor Klang
37120150fd Fixing ticket #908 2011-06-15 18:37:36 +02:00
Viktor Klang
0c21afebdd Fixing ticket #907 2011-06-15 18:26:56 +02:00
Viktor Klang
79f71fd362 Merge branch 'master' of github.com:jboner/akka 2011-06-15 17:16:50 +02:00
Viktor Klang
986661f4fa Adding initial test cases for serialization of MethodCalls, preparing for hooking in Serialization.serialize/deserialize 2011-06-15 17:16:38 +02:00
Viktor Klang
19950b60fc Switching from -123456789 as magic number to Long.MinValue for noTimeoutGiven 2011-06-15 17:15:57 +02:00
Viktor Klang
00e8fd79cb Moving the timeout so that it isn't calculated unless the actor is running 2011-06-15 17:14:57 +02:00
Viktor Klang
df316b98de Making the default-serializer condition throw NoSerializerFoundException instead of plain Exception' 2011-06-15 17:14:11 +02:00
Jonas Bonér
cc27b8fe3f Merge branch 'master' of github.com:jboner/akka 2011-06-15 14:27:52 +02:00
Jonas Bonér
e5de16ec2a Fixed implicit deadlock in cluster deployment 2011-06-15 14:27:39 +02:00
Debasish Ghosh
217b5adba1 Merge branch 'master' of git@github.com:jboner/akka 2011-06-15 17:22:07 +05:30
Debasish Ghosh
9bb5460cec removed duplicate copy of Serializer.scala 2011-06-15 17:21:20 +05:30
Jonas Bonér
204f4e2c4c reformatted akka-reference.conf 2011-06-15 13:37:31 +02:00
Debasish Ghosh
a7dffdd445 pluggable serializers - changed entry name in akka.conf to serialization-bindings. Also updated akka-reference.conf with a commented section on pluggable serializers 2011-06-15 13:42:22 +05:30
Derek Williams
964dd76f1f Merge branch 'master' into nio-actor 2011-06-14 12:40:16 -06:00
Derek Williams
1e0291ac98 Specialize mapTo for KeptPromise 2011-06-14 12:32:34 -06:00
Derek Williams
42ec626b67 Merge branch 'master' into promisestream
Conflicts:
	akka-actor/src/main/scala/akka/dispatch/Future.scala
2011-06-14 12:27:20 -06:00
Jonas Bonér
01c01e9771 Merge branch 'master' of github.com:jboner/akka 2011-06-14 19:35:40 +02:00
Jonas Bonér
bf0515b8e5 Fixed remaining issues in pluggable serializers (cluster impl) 2011-06-14 19:35:18 +02:00
Roland
5aaf977776 re-add implicit timeout to ActorRef.?, but with better semantics:
actor ? msg // uses Actor.DefaultTimeout or implicit
actor ? (msg, timeout) // uses the given timeout

We still need to remove ActorRef.timeout for people to notice it's not
used anymore.
2011-06-14 15:43:44 +02:00
Jonas Bonér
e0e96960b8 Merge branch 'master' into pluggable-serializer 2011-06-14 15:00:47 +02:00
Jonas Bonér
79fb19362f Merge branch 'master' of github.com:jboner/akka 2011-06-14 14:58:42 +02:00
Jonas Bonér
1eeb9d9a6f 1. Removed implicit scoped timeout in ? method.
Reason: 'pingPongActor.?(Ping)(timeout = TimeoutMillis)' breaks old user code and is so ugly. It is not worth it. Now user write (as he used to): 'pingPongActor ? (Ping, TimeoutMillis)'
2. Fixed broken Cluster communication
3. Added constructor with only String arg for UnhandledMessageException to allow client instantiation of remote exception

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2011-06-14 14:58:27 +02:00
Jonas Bonér
04bf416ead Merge branch 'master' into pluggable-serializer 2011-06-14 14:41:24 +02:00
Jonas Bonér
26500bed09 1. Removed implicit scoped timeout in ? method.
Reason: 'pingPongActor.?(Ping)(timeout = TimeoutMillis)' breaks old user code and is so ugly. It is not worth it. Now user write (as he used to): 'pingPongActor ? (Ping, TimeoutMillis)'
2. Fixed broken Cluster communication
3. Added constructor with only String arg for UnhandledMessageException to allow client instantiation of remote exception

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2011-06-14 14:26:13 +02:00
Derek Williams
e92672fb4b Merge branch 'master' into nio-actor 2011-06-13 22:38:02 -06:00
Derek Williams
e18cc7bac6 revert changes to java api 2011-06-13 22:31:06 -06:00
Derek Williams
c62e6096d3 Didn't test that change, reverted to my original 2011-06-13 20:39:31 -06:00
Derek Williams
cbdfd0fe23 Fix Future type issues 2011-06-13 20:25:31 -06:00
Derek Williams
2cb7beabb6 Update to latest master 2011-06-13 19:19:45 -06:00
Derek Williams
d1a71a1aba Merge branch 'master' into nio-actor 2011-06-13 16:58:44 -06:00
Peter Vlugter
d917f999cf Adjust all protocols to work with scaladoc 2011-06-14 10:26:38 +12:00
Roland
05783baa2c Merge branch 'master' of github.com:jboner/akka 2011-06-14 00:22:56 +02:00
Roland
ca592ef1b4 Merge branch 'master' of github.com:jboner/akka
Conflicts:
	akka-actor/src/main/scala/akka/actor/Actor.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
	akka-actor/src/main/scala/akka/actor/TypedActor.scala
	akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
	akka-cluster/src/main/scala/akka/cluster/ReplicatedClusterRef.scala
	akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableDispatcher.scala
	akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
	akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
2011-06-14 00:19:54 +02:00
Peter Vlugter
73694af5a5 Manually fix remote protocol for scaladoc 2011-06-14 09:49:07 +12:00
Roland
7712c20620 unify sender/senderFuture into channel (++)
(squashed merge from the various bits and pieces already part of
release-1.2, everything related to Channel & Future)
2011-06-13 22:36:46 +02:00
Viktor Klang
3d54c09994 Merge branch 'master' of github.com:jboner/akka 2011-06-13 16:47:27 +02:00
Viktor Klang
e3e389e14f Fixing spelling errors in docs 2011-06-13 16:47:18 +02:00
Peter Veentjer
2bbbeba82e - more work on the storage functionality 2011-06-13 16:48:23 +03:00
Viktor Klang
9c1a50ba2c Refactoring the use of !! to ?+.get for Akka internal code 2011-06-13 15:29:35 +02:00
Viktor Klang
6ddee70e0b Creating a package object for the akka-package to put the .as-conversions there, also switching over at places from !! to ? 2011-06-13 14:59:22 +02:00
Debasish Ghosh
0d471ae084 fixed protobuf new version issues and some minor changes in Actor and ActorRef from merging 2011-06-13 17:17:53 +05:30
Viktor Klang
fa0478bc32 Replacing !!! with ? 2011-06-13 13:43:21 +02:00
Viktor Klang
fd5afde4ff Adding 'ask' to replace 'sendRequestReplyFuture' and removing sendRequestReply 2011-06-13 13:28:29 +02:00
Debasish Ghosh
f27e23bf1d Merged with master 2011-06-13 13:35:39 +05:30
Viktor Klang
ec9c2e100e Fixing formatting for SLF4J errors 2011-06-12 22:06:11 +02:00