Commit graph

1377 commits

Author SHA1 Message Date
Heiko Seeberger
bd057616b3 Merge branch 'master' into osgi
Conflicts:
	project/build/AkkaProject.scala
2010-06-21 16:32:25 +02:00
Heiko Seeberger
485ba417ea Merge branch '281-hseeberger' 2010-06-21 13:08:31 +02:00
Heiko Seeberger
3af484c0a0 closes #281: Made all subprojects test after breaking changes introduced by removing the type parameter from ActorRef.!!. 2010-06-21 13:08:10 +02:00
Heiko Seeberger
07ac1d990c re #281: Made all subprojects compile after breaking changes introduced by removing the type parameter from ActorRef.!!; test-compile still missing! 2010-06-21 12:47:23 +02:00
Heiko Seeberger
2128dcda3b re #281: Made akka-core compile and test after breaking changes introduced by removing the type parameter from ActorRef.!!. 2010-06-21 12:25:24 +02:00
Heiko Seeberger
5668337975 re #281: Added as[T] and asSilently[T] to Option[Any] via implicit conversions in object Actor. 2010-06-21 12:24:06 +02:00
Heiko Seeberger
a2dc2017d0 Merge branch 'master' into 281-hseeberger
Conflicts:
	akka-core/src/test/scala/InMemoryActorSpec.scala
	akka-core/src/test/scala/StmSpec.scala
2010-06-21 09:31:02 +02:00
Martin Krasser
265be35d5e Added more examples to akka-sample-camel 2010-06-20 17:16:06 +02:00
Martin Krasser
098dadfe38 Changed return type of CamelService.load to CamelService 2010-06-20 17:15:17 +02:00
Peter Vlugter
b8090b3177 Merge branch 'stm-pvlugter' 2010-06-20 21:16:56 +12:00
Peter Vlugter
4e5a516493 Some stm documentation changes 2010-06-20 16:40:18 +12:00
Peter Vlugter
d382f9bbac Improved transaction factory defaults 2010-06-20 12:49:49 +12:00
Peter Vlugter
dd7dc9e179 Removed isTransactionalityEnabled 2010-06-20 10:10:09 +12:00
Peter Vlugter
db325d8fab Updated ants sample 2010-06-20 09:29:23 +12:00
Peter Vlugter
e85322c782 Removing unused stm classes 2010-06-20 09:29:23 +12:00
Peter Vlugter
3576f32533 Moved data flow to its own package 2010-06-20 09:29:23 +12:00
Peter Vlugter
4e47a68716 Using actor id for transaction family name 2010-06-20 09:29:23 +12:00
Peter Vlugter
79e54d1f00 Updated imports to use stm package objects 2010-06-20 09:29:23 +12:00
Peter Vlugter
f3335ea11a Added some documentation for stm 2010-06-20 09:29:22 +12:00
Peter Vlugter
91f3c83ba1 Added transactional package object - includes Multiverse data structures 2010-06-20 09:29:22 +12:00
Peter Vlugter
9e8ff7319d Added stm local and global package objects 2010-06-20 09:29:22 +12:00
Peter Vlugter
8bf6e00f75 Removed some trailing whitespace 2010-06-20 09:27:43 +12:00
Peter Vlugter
02b4403138 Updated actor ref to use transaction factory 2010-06-20 09:27:43 +12:00
Peter Vlugter
c5caf5832c Configurable TransactionFactory 2010-06-20 09:27:43 +12:00
Peter Vlugter
5b0a7d0eec Fixed import in ants sample for removed Vector class 2010-06-20 09:27:43 +12:00
Peter Vlugter
fce9d8ec8d Added Transaction.Util with methods for transaction lifecycle and blocking 2010-06-20 09:27:43 +12:00
Peter Vlugter
b20b399505 Removed unused stm config options from akka conf 2010-06-20 09:27:43 +12:00
Peter Vlugter
5a03a8d179 Removed some unused stm config options 2010-06-20 09:27:43 +12:00
Peter Vlugter
d47c152a5b Added Duration utility class for working with j.u.c.TimeUnit 2010-06-20 09:27:43 +12:00
Peter Vlugter
e18305c699 Updated stm tests 2010-06-20 09:27:43 +12:00
Peter Vlugter
ef4d926d6d Using Scala library HashMap and Vector 2010-06-20 09:27:43 +12:00
Peter Vlugter
fa044ca1ad Removed TransactionalState and TransactionalRef 2010-06-20 09:27:43 +12:00
Peter Vlugter
ce41e170dd Removed for-comprehensions for transactions 2010-06-20 09:27:43 +12:00
Peter Vlugter
3cc875e3b9 Removed AtomicTemplate - new Java API will use Multiverse more directly 2010-06-20 09:27:42 +12:00
Peter Vlugter
2eeffb6a06 Removed atomic0 - no longer used 2010-06-20 09:27:42 +12:00
Peter Vlugter
a0d4d7c833 Updated to Multiverse 0.6-SNAPSHOT 2010-06-20 09:27:42 +12:00
Jonas Bonér
9ca039c470 Fixed bug with stm not being enabled by default when no AKKA_HOME is set. 2010-06-19 11:32:55 -07:00
Martin Krasser
7ba76a88fe Enforce commons-codec version 1.4 for akka-core 2010-06-19 18:36:32 +02:00
Martin Krasser
52b6dfe188 Producer trait with default implementation of Actor.receive 2010-06-19 15:56:29 +02:00
Heiko Seeberger
516cad81ba Merge branch 'master' into 281-hseeberger
Conflicts:
	akka-core/src/main/scala/remote/RemoteServer.scala
2010-06-19 15:54:51 +02:00
Heiko Seeberger
4ba1c584f1 re #281: Removed type parameter from ActorRef.!! which now returns Option[Any] and added Helpers.narrow and Helpers.narrowSilently. 2010-06-18 16:31:25 +02:00
Peter Vlugter
35c599892a Added akka-sbt-plugin source 2010-06-18 21:53:11 +12:00
Roman Roelofsen
530b94d6d6 Merge remote branch 'origin/master' into osgi
Conflicts:
	project/build/AkkaProject.scala
2010-06-18 11:24:01 +02:00
Roman Roelofsen
dff7cc65d1 Merge remote branch 'akollegger/master' into osgi
Conflicts:
	project/build/AkkaProject.scala
	project/plugins/Plugins.scala
2010-06-18 11:20:10 +02:00
Jonas Bonér
306d017e7c Fixed final issues in actor deep serialization; now Java and Protobuf support 2010-06-18 09:30:31 +02:00
Andreas Kollegger
3c3d9a4440 synced with jboner/master; decoupled AkkaWrapperProject; bumped bnd4sbt to 1.0.0.RC2 2010-06-17 12:12:42 -04:00
Roman Roelofsen
157956eeeb Started work on OSGi sample 2010-06-17 15:10:39 +02:00
Andreas Kollegger
13cc2de82f Merge branch 'master' of http://github.com/jboner/akka 2010-06-17 08:41:28 -04:00
Roman Roelofsen
c0361de80b Merge remote branch 'origin/master' into osgi 2010-06-17 14:19:48 +02:00
Roman Roelofsen
bfbdc7ae4b All bundles resolve! 2010-06-17 14:19:33 +02:00