Commit graph

554 commits

Author SHA1 Message Date
Jonas Bonér
ab330c5570 Merge branch 'master' of github.com:jboner/akka
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2011-11-25 12:10:41 +01:00
viktorklang
c654a60449 Merge pull request #123 from jboner/wip-extensions
Reinterpretation of Extensions
2011-11-25 02:26:00 -08:00
Jonas Bonér
ff535d53f1 Merge branch 'master' of github.com:jboner/akka
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2011-11-24 21:05:41 +01:00
Viktor Klang
f9f8d8af3c Adding DispatcherPrerequisites to hold the common dependencies that a dispatcher needs to be created 2011-11-17 16:09:18 +01:00
Roland
5025bd3556 merge system-cleanup into master 2011-11-17 14:38:49 +01:00
viktorklang
47050cedf5 Merge pull request #94 from kjellwinblad/master
Ticket #1282 Test for the new Index class
2011-11-15 08:00:22 -08:00
Kjell Winblad
ca0307b94c Merge remote branch 'upstream/master' 2011-11-15 16:48:55 +01:00
Kjell Winblad
9c8f921342 Merge remote branch 'upstream/master' 2011-11-15 12:06:37 +01:00
Viktor Klang
c8f05cbe3a Merging in Henriks HashedWheelTimer stuff manually 2011-11-10 18:41:51 +01:00
Jonas Bonér
2e19717b84 Merge branch 'master' of github.com:jboner/akka 2011-11-10 11:51:04 +01:00
Roland
de2d2c6be7 Merge branch 'logging'
known failures in BalancingDispatcherModelSpec and ActorPoolSpec have
tickets
2011-11-09 18:18:32 +01:00
Viktor Klang
09ceb8ec92 Removing akka-http, making so that 'waves of actors'-test fails when there's a problem and removing unused config sections in the conf file 2011-11-09 15:47:57 +01:00
Roland
3243d65733 Merge remote branch 'origin/master' into logging
BalancingDispatcherModelSpec is currently broken, leaves count==1 in
wavesOfActors test, committed anyway in order to check out where it
broke before this merge
2011-11-09 14:56:05 +01:00
Viktor Klang
f0715ca181 Removing Channel(s), tryTell etc, everything compiles but all tests are semibroken 2011-10-31 16:09:51 +01:00
Roland
5e75302d3c introducing: MainBus feat. LoggingBus
most tests passing, everything compiling, but docs not updated and nasty
thread-leak preventing me from running the whole test-suite (which is
the reason for this commit: I want to chase down that one first).

- the app.mainbus is classified by Class[_] (currently lookup, will
  possibly change to sub-class-aware) and accepts AnyRef messages
- LoggingBus handles akka.event-handlers from config specially:
  + start them as system services, supervised by SystemGuardian
  + keep their subscriptions in sync when logLevel_= is called
  + send them InitializeLogger(bus) message before subscribing them (so
    they can register for extras like Mute/UnMute)
- two-phased start-up: first phase with actor-less stdout logging, then
  subscription of config loggers, then remove stdout logger (logLevels
  configurable separately)
- MainBusReaper watches registered receivers and unsubscribes them upon
  death (started in phase 2)
- logger factory on Logging object, needs app/bus and log source;
  default instance in app.log
2011-10-27 12:36:22 +02:00
Jonas Bonér
516ba706b3 Merge pull request #98 from amir343/master
Some formatting correction in TypedActors doc page
2011-10-25 07:31:49 -07:00
Roland
0c84c60b73 Merge branch 'parental-supervision'
commented out one failing test in LoggingReceiveSpec (known, to be fixed
soon by implementing MainBusLogging)
2011-10-25 12:24:39 +02:00
Roland
eb314da5d6 make most AkkaSpec-based tests runnable in Eclipse 2011-10-21 17:01:22 +02:00
Kjell Winblad
3ef629c42f Merge branch 'master' of https://github.com/jboner/akka 2011-10-20 20:03:03 +02:00
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