Commit graph

535 commits

Author SHA1 Message Date
Kjell Winblad
e2c46cc2b8 Merge branch 'master' of https://github.com/jboner/akka 2011-10-20 14:21:41 +02:00
Jonas Bonér
f72ffa8dde Merge branch 'master' of github.com:jboner/akka 2011-10-14 15:11:43 +02:00
Peter Vlugter
0cc0792d56 Merge master into tame-globals branch 2011-10-13 18:15:09 +02:00
Roland
ad526535d1 Merge with Peter's work (i.e. merging master into tame-globals) 2011-10-13 14:17:07 +02:00
Roland
ee57ef564c fix akka-docs compilation, remove duplicate applications from STM tests 2011-10-13 13:53:09 +02:00
Peter Vlugter
9d5d652860 Merge master into tame-globals branch 2011-10-13 13:41:44 +02:00
Roland
32effb5083 make EventHandler non-global
- add Logging trait for nicer interface
- add EventHandlerLogging class for offering the nice interface from
  app.log
- add eventHandler instance to app and use that for all internal logging
  (this means that some places (dispatchers, remoting) were infiltrated
  by app just to do logging, but I think we'll need app in there soon
  enough for other reasons)
2011-10-13 13:21:59 +02:00
Peter Vlugter
e945dcfbe7 Fix actor ref spec 2011-10-12 09:57:33 +02:00
Roland
4df5b801fa make everything except tutorial-second compile
someone should look at remoting vs. timeout (i.e. which is sent around),
because I removed that in some places. It might simply be irrelevant
once we remove the Future special-casing.
2011-10-12 09:10:05 +02:00
Roland
50caa966d1 make akka-actor-tests compile again 2011-10-11 16:05:48 +02:00
Viktor Klang
9927ef3e43 Merge branch 'master' of github.com:jboner/akka 2011-10-11 14:17:51 +02:00
Jonas Bonér
afbd0bff6a Merge branch 'master' of github.com:jboner/akka 2011-10-11 11:18:57 +02:00
Viktor Klang
384ccab843 Merge branch 'master' of github.com:jboner/akka 2011-10-10 16:53:23 +02:00
Jonas Bonér
cec5989c0f Merge branch 'ditch-registry' 2011-10-10 14:05:20 +02:00
Jonas Bonér
3ec48171b7 Removed the ActorRegistry, the different ActorRefProvider implementations now holds an Address->ActorRef registry. Looking up by UUID is gone together with all the other lookup methods such as 'foreach' etc. which do not make sense in a distributed env. 'shutdownAll' is also removed but will be replaced by parental supervision. 2011-10-10 14:02:33 +02:00
Jonas Bonér
4b9d7c2d26 Merge branch 'master' of github.com:jboner/akka 2011-09-27 15:25:30 +02:00
Jonas Bonér
70c88714a1 Merge branch 'master' of github.com:jboner/akka 2011-09-27 12:48:33 +02:00
Jonas Bonér
4c87905a20 Merge branch 'master' of github.com:jboner/akka
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2011-09-27 12:31:33 +02:00
Viktor Klang
82fe020311 Upgrading to SBT 0.11 2011-09-27 10:37:53 +02:00
Jonas Bonér
62a8d822e9 Merge branch 'remote-actorref-provider'
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2011-09-22 04:38:33 +02:00
Jonas Bonér
e862320bde Merge pull request #90 from havocp/havocp-actor-pool
add more API docs to routing/Pool.scala
2011-09-20 16:21:33 -07:00
Viktor Klang
c5b276db5b Resolve merge conflict with master 2011-09-19 19:01:23 +02:00
Peter Vlugter
1ac8c2876c Remove SelfActorRef and use ActorContext to access state in ActorInstance. See #1202
- removed SelfActorRef
- added an ActorContext interface that provides a view into ActorInstance
- the ActorInstance (as ActorContext) gets injected into the Actor
- moved self methods like sender and reply directly to the Actor
2011-09-19 12:03:15 +02:00
Viktor Klang
f100170925 Trying to merge with master 2011-09-09 17:22:40 +02:00
Viktor Klang
a9e58cda8b Merge branch 'master' of github.com:jboner/akka 2011-09-09 13:46:59 +02:00
Viktor Klang
6cfb109ffa Merge branch 'master' of github.com:jboner/akka 2011-09-09 12:40:06 +02:00
Viktor Klang
63d202a5a5 Merge with master 2011-09-09 12:00:19 +02:00
Jonas Bonér
c1be23fbec Merge branch 'master' into wip-remote-connection-failover 2011-09-08 19:50:33 +02:00
Roland Kuhn
cb4a4fa818 Merge pull request #87 from jrudolph/patch-1
Just a little documentation fix where a bullet wasn't displayed correctly

Merged by rkuhn: valid one-character fix should not be a problem
2011-09-03 02:32:41 -07:00
Jonas Bonér
ab50e2c1a6 Merge branch 'master' of github.com:jboner/akka
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2011-08-29 14:26:24 +02:00
Peter Veentjer
ade4ce6265 Merge ClusterActoRef & RoutedActorRef: After merge with master, part 2 2011-08-29 12:07:34 +03:00
Peter Veentjer
32b2bd2501 Merge ClusterActoRef & RoutedActorRef: After merge with master 2011-08-29 09:22:14 +03:00
Viktor Klang
df76a7efba Merge branch 'master' of github.com:jboner/akka 2011-08-26 17:36:18 +02:00
Viktor Klang
b13cb6de96 Adding initial support for Props 2011-08-26 17:25:18 +02:00
Vasil Remeniuk
c4eeacc1be Merge branch 'master' of github.com:jboner/akka 2011-08-17 10:17:21 +03:00
Vasil Remeniuk
3671c6b70f Merge branch 'master' of https://github.com/jboner/akka 2011-08-16 01:18:53 +03:00
Vasil Remeniuk
27b539dc2e Merge branch 'master' of https://github.com/jboner/akka 2011-08-15 19:35:34 +03:00
Viktor Klang
babbd11dfc Merge branch 'master' of github.com:jboner/akka 2011-08-15 17:19:28 +02:00
Jonas Bonér
9926acbf10 Merge branch 'master' of github.com:jboner/akka 2011-08-15 10:42:24 +02:00
Roland
f7ee8103b4 Merge forward-ports from branch 'release-1.2' 2011-08-14 23:48:33 +02:00
Vasil Remeniuk
c02c49c124 Merge branch 'master' of https://github.com/jboner/akka 2011-08-14 11:20:41 +03:00
Peter Veentjer
2ed155adcc Merge branch 'wip-1075' 2011-08-12 10:05:36 +03:00
Jonas Bonér
a0a85c18b5 Merge branch 'master' of github.com:jboner/akka 2011-08-10 07:52:05 +02:00
Roland
5193e8a849 Merge channel-cleanup into remote branch 'origin/master'
Conflicts:
	akka-actor/src/main/scala/akka/dispatch/Future.scala
2011-08-09 22:05:29 +02:00
Peter Veentjer
df4db16ec0 ticket 989 #Allow specifying preferred-nodes of other type than node:<name>/
currently the task has been downscoped to only allow node:name since we need to rethink this part. Metadata is going to make it /
it possible to deal with way more nodes
2011-08-09 13:22:05 +03:00
Peter Veentjer
e3071a76c4 Merge branch 'master' of github.com:jboner/akka 2011-08-07 14:48:22 +03:00
Derek Williams
ac1d3a1d3b Merge branch 'masterfuture' 2011-08-06 16:19:55 -06:00
Peter Veentjer
c761ac2e49 ticket #992 after merge 2011-08-06 23:10:30 +03:00
Viktor Klang
b492ee7cd5 Merge branch 'master' of github.com:jboner/akka 2011-08-03 14:26:26 +02:00
Derek Williams
196c581966 Merge branch 'master' into derekjw-1054
Conflicts:
	akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
2011-08-02 11:21:48 -06:00