raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11
571 commits 1 branch 31 tags 268 MiB
Commit graph

571 commits

This branch
This branch
All branches
Author SHA1 Message Date
Patrik Nordwall
76b2c699c6 Merge branch 'master' into wip-1377-context-patriknw 2011-12-07 10:08:17 +01:00
Patrik Nordwall
4f99b74dc0 Merge branch 'master' into wip-1377-context-patriknw 2011-12-07 08:07:58 +01:00
Patrik Nordwall
c13991f8fb Merge branch 'master' into wip-1377-context-patriknw 
Conflicts:
	akka-actor/src/main/scala/akka/actor/ActorCell.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
	akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
	akka-actor/src/main/scala/akka/event/EventStream.scala
	akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java
	akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
 2011-12-07 07:49:34 +01:00
Jonas Bonér
71ba69425f Merge branch 'master' of github.com:jboner/akka 
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
 2011-12-06 17:29:21 +01:00
Roland
c6ea2157dc Merge branch 'wip-ActorPath-rk' 2011-12-06 15:12:09 +01:00
Roland
227387ff78 Merge branch master into wip-ActorPath-rk 
Had to make Davy Jones a bit more robust, i.e. put him into a different
system to guarantee survival until all messages are delivered.
 2011-12-05 22:46:34 +01:00
Roland
cda9762a5c Merge branch 'master' into wip-ActorPath-rk 2011-12-02 13:31:48 +01:00
patriknw
5d96823376 Merge pull request #131 from jboner/wip-1378-fixme-patriknw 
First walk through of FIXME. See #1378
 2011-12-02 00:28:20 -08:00
Patrik Nordwall
f75d4d46e8 Merge branch 'master' into wip-1378-fixme-patriknw 
Conflicts:
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
	akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala
	akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
 2011-12-02 09:03:03 +01:00
patriknw
b107496cb9 Merge pull request #129 from jboner/wip-config-patriknw 
Updated to latest config lib and changed how reference config files are loaded.
* Config lib 4f3a91f
* All reference files named reference.conf, all will be loaded
* Usage of ConfigFactor.load as default way
* Extensions use same config as ActorSystem.settings.config
 2011-12-01 23:53:49 -08:00
Patrik Nordwall
fdb57cca41 Merge branch 'master' into wip-config-patriknw 2011-12-02 08:49:34 +01:00
Viktor Klang
cbbb1bf0aa Merge branch 'master' of github.com:jboner/akka 2011-11-30 18:10:46 +01:00
patriknw
ab571f60af Merge pull request #127 from jboner/wip-1380-scheduler-dispatcher-patriknw 
Execute scheduled tasks in system default dispatcher. See #1380
 2011-11-30 06:25:38 -08:00
Patrik Nordwall
f8b0047df1 Merge branch 'master' into wip-1380-scheduler-dispatcher-patriknw 2011-11-30 15:18:22 +01:00
Henrik Engstrom
f6b71aced1 Merge pull request #130 from jboner/samples-henrikengstrom 
Samples henrikengstrom
 2011-11-30 02:08:55 -08:00
Henrik Engstrom
f2326693b3 Merge branch 'master' into samples-henrikengstrom 
Conflicts:
	akka-actor/src/main/scala/akka/routing/Routing.scala
	akka-samples/akka-sample-ants/README.md
	akka-samples/akka-sample-ants/src/main/scala/Ants.scala
	akka-samples/akka-sample-camel/src/main/scala/sample/camel/Actors.scala
	akka-samples/akka-sample-camel/src/main/scala/sample/camel/Boot.scala
	akka-samples/akka-sample-camel/src/main/scala/sample/camel/ClientApplication.scala
	akka-samples/akka-sample-camel/src/main/scala/sample/camel/ServerApplication.scala
	akka-samples/akka-sample-camel/src/main/scala/sample/camel/StandaloneApplication.scala
	akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
	akka-samples/akka-sample-osgi/src/main/scala/OsgiExample.scala
	akka-samples/akka-sample-remote/src/main/scala/ServerManagedRemoteActorSample.scala
	project/AkkaBuild.scala
 2011-11-30 11:05:13 +01:00
Roland
4b24af7a52 merge master into wip-ActorPath-rk 2011-11-29 21:52:18 +01:00
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