Commit graph

27 commits

Author SHA1 Message Date
Derek Williams
50bb14d9c3 Test output cleaned up in akka-actor-tests and akka-testkit 2011-07-29 15:22:11 -06:00
Derek Williams
5b5d3cd892 Merge branch 'master' into wip-derekjw
Conflicts:
	akka-actor-tests/src/test/scala/akka/misc/SchedulerSpec.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
	akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
	akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
	project/AkkaBuild.scala
2011-07-26 13:05:28 -06:00
Derek Williams
6d343b01f0 Merge branch 'master' into wip-derekjw
Conflicts:
	akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
2011-07-26 12:50:09 -06:00
Peter Vlugter
6f2fcc91ed Add scalariform plugin 2011-07-26 18:15:34 +12:00
Peter Vlugter
6e337bfa2b Update to sbt 0.10.1 2011-07-26 18:15:34 +12:00
Viktor Klang
4258abfc9f Merge branch 'master' of github.com:jboner/akka 2011-07-20 12:58:59 +02:00
Viktor Klang
79d585ec96 Moving the config of the Scalariform 2011-07-20 12:44:34 +02:00
Viktor Klang
cc9b3685fe Adding Scalariform plugin 2011-07-19 23:29:33 +02:00
Viktor Klang
5592cce5fa Testing out scalariform for SBT 0.10 2011-07-19 21:39:42 +02:00
Martin Krasser
18dd81b127 changed scope of spring-jms dependency to runtime 2011-07-16 11:52:23 +02:00
Martin Krasser
a3408bf3f8 Move sampleCamel-specific Ivy XML to Dependencies object 2011-07-16 11:40:24 +02:00
Martin Krasser
13da777586 Excluded conflicting jetty dependency 2011-07-16 11:18:08 +02:00
Martin Krasser
68fdaaaf0f re-added akka-sample-camel to build 2011-07-16 10:38:17 +02:00
Derek Williams
50dcdd411c Merge branch 'master' into wip-derekjw
Conflicts:
	akka-actor-tests/src/test/scala/akka/misc/SchedulerSpec.scala
2011-07-15 11:31:24 -06:00
Peter Vlugter
f842b7d968 Add test exclude to sbt build 2011-07-14 14:10:37 +12:00
Viktor Klang
b27448ab3e Revert "Commenting out the Mongo mailboxen until @rit has published the jar ;-)"
This reverts commit a5f449043a.
2011-07-12 15:37:49 +02:00
Viktor Klang
a5f449043a Commenting out the Mongo mailboxen until @rit has published the jar ;-) 2011-07-12 10:46:33 +02:00
Brendan W. McAdams
5092adc2e0 Add the Mongo Durable Mailbox stuff into the 0.10 SBT Build 2011-07-11 20:01:40 -04:00
Derek Williams
dba8749f1d Add testkit as a test dependency for all modules 2011-07-11 15:38:22 -06:00
Derek Williams
0e9ae446cc Getting akka-actor-tests to run again 2011-07-11 14:19:53 -06:00
Peter Vlugter
c0d60a17c6 Move multi-jvm tests to src/multi-jvm 2011-07-11 11:56:38 +12:00
Peter Vlugter
29106c0df0 Add publish settings to sbt build 2011-07-11 09:45:41 +12:00
Peter Vlugter
82b459b224 Add reST docs task to sbt build 2011-07-11 09:45:41 +12:00
Peter Vlugter
6923e179e4 Disable cross paths in sbt build 2011-07-11 09:45:41 +12:00
Peter Vlugter
8947a69df3 Add unified scaladoc to sbt build 2011-07-11 09:45:41 +12:00
Peter Vlugter
5776362f70 Update build and include multi-jvm tests 2011-07-11 09:45:41 +12:00
Peter Vlugter
5f6a393808 Basis for sbt 0.10 build 2011-07-11 09:45:41 +12:00