Commit graph

1065 commits

Author SHA1 Message Date
Derek Williams
a17b75fc09 Add check for jdk7 to disable -optimize 2011-08-06 15:00:15 -06:00
Peter Vlugter
d5c0237b2f Disable parallel execution in global scope
For avoiding tests from different projects, like cluster and
zookeeper mailbox, to run in parallel
2011-08-05 18:41:54 +12:00
Peter Vlugter
b41778fbc4 Remove heap size option for multi-jvm 2011-08-04 17:22:34 +12:00
Peter Vlugter
ea369a4b65 Quieten the multi-jvm tests 2011-08-04 16:55:27 +12:00
Viktor Klang
ef3b82a2c9 Updating Netty to 3.2.5, closing ticket #1074 2011-08-02 15:19:09 +02:00
Peter Vlugter
3dc1280768 Update sbt plugins 2011-08-01 16:13:00 +12:00
Derek Williams
50bb14d9c3 Test output cleaned up in akka-actor-tests and akka-testkit 2011-07-29 15:22:11 -06:00
Peter Vlugter
ebc50b5acd Update scalariform plugin 2011-07-27 09:37:44 +12: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
Viktor Klang
9d71be7778 Updating copyright section to Typesafe Inc. etc 2011-07-14 16:03:08 +02:00
Peter Vlugter
f842b7d968 Add test exclude to sbt build 2011-07-14 14:10:37 +12:00
Peter Vlugter
82070443e0 Update multi-jvm plugin 2011-07-14 09:34:12 +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
Brendan W. McAdams
1c88077513 Merge branch 'master' of https://github.com/jboner/akka 2011-07-11 18:44:04 -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
Derek Williams
34ca784846 Merge branch 'master' into wip-derekjw
Conflicts:
	akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
	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-actor/src/main/scala/akka/dispatch/Future.scala
2011-07-11 13:02:42 -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
Peter Vlugter
64b69a8f3f Move sbt 0.7 build to one side 2011-07-11 09:45:40 +12:00
Brendan W. McAdams
f3b7c16177 Update Hammersmith dependency to the 0.2.6 release. 2011-07-09 09:55:05 -04:00
Brendan W. McAdams
1f4cf472ba First pass at Mongo Durable Mailboxes in a "Naive" approach. Some bugs
in Hammersmith currently surfacing that need resolving.
2011-07-05 20:19:47 -04:00
Patrik Nordwall
a1bb7a7e5f Inital import of akka-sample-trading. Same as original except rename of root package 2011-07-04 19:11:27 +02:00
Martin Krasser
f186928272 Merge remote branch 'remotes/origin/modules-migration'
- Move akka-sample-camel from akka-modules repo to akka repo
- Conflicts (manually resolved):
	akka-docs/modules/spring.rst (use existing)
	project/build/AkkaProject.scala (use existing)
2011-07-04 13:31:05 +02:00
Peter Veentjer
fcea22faf6 added missing storage dir 2011-06-29 13:48:09 +03:00
Derek Williams
81b361e6d7 Merge branch 'master' into wip-derekjw 2011-06-28 12:21:44 -06:00
Martin Krasser
d25b8ce92c re-enable akka-camel and akka-camel-typed and fix compile and test errors 2011-06-28 16:53:11 +02:00
Peter Vlugter
86cfc8672e Include package name when calling multi-jvm tests 2011-06-28 20:35:30 +12:00
Jonas Bonér
7a5c95e44d Added tests for automatic actor migration when node is shut down.
Updated to modified version of ZkClient (0.3, forked and fixed to allow interrupting connection retry).

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2011-06-26 15:04:11 +02:00
Jonas Bonér
a0abd5ef57 Fixed problems with actor migration in cluster and added tests for explicit actor migration through API 2011-06-26 09:49:03 +02:00
Derek Williams
7fb61de729 Fix dependencies after merge 2011-06-23 15:06:16 -06:00