Commit graph

291 commits

Author SHA1 Message Date
Heiko Seeberger
96d79154f3 Merge branch 'master' into osgi
Conflicts:
	project/build/AkkaProject.scala
	project/plugins/Plugins.scala
2010-07-19 18:05:47 +02:00
Martin Krasser
3056c8b7e1 Merge commit 'remotes/origin/master' into 320-krasserm, resolve conflicts and compile errors. 2010-07-17 07:04:10 +02:00
Martin Krasser
e089d0f6bc Do not download sources 2010-07-16 17:13:15 +02:00
Martin Krasser
dc0e084659 Remove Camel staging repo as Camel 2.4.0 can already be downloaded repo1. 2010-07-16 10:50:08 +02:00
Peter Vlugter
2c4ef418eb And multiverse module config 2010-07-16 15:23:27 +12:00
Peter Vlugter
d3d3bcbee1 Multiverse 0.6-SNAPSHOT again 2010-07-16 15:19:54 +12:00
Viktor Klang
1c4d8d79e6 Fixing case 286 2010-07-16 00:36:47 +02:00
Jonas Bonér
e1e4196c16 Merge branch 'master' of git@github.com:jboner/akka
Conflicts:
	akka-amqp/src/main/scala/RpcClientActor.scala
2010-07-15 21:39:23 +02:00
Jonas Bonér
6e4c0cffc1 Upgraded to new fresh Multiverse with CountDownCommitBarrier bugfix 2010-07-15 21:14:16 +02:00
momania
5f8b2b1209 Close #336 2010-07-15 18:52:19 +02:00
Jonas Bonér
e43bb778f1 Upgraded Akka to Scala 2.8.0 final, finally... 2010-07-15 18:04:10 +02:00
Martin Krasser
3e42d822e5 Merge commit 'remotes/origin/master' into 320-krasserm 2010-07-15 07:47:24 +02:00
Jonas Bonér
1df89f454e Removed Java Active Object tests, not needed now that we have them ported to Scala in the akka-core module 2010-07-14 14:46:09 +02:00
Martin Krasser
f05b3b6109 re #320 Non-blocking in-out message exchanges with actors
Additionally:
- upgrade to Camel 2.4
- drop @consume support for actors
- some refactorings
2010-07-13 07:11:42 +02:00
Debasish Ghosh
addeeb5411 bug fix in redisclient, version upgraded to 1.4 2010-07-11 21:06:35 +05:30
momania
f9e5c44784 Merge branch 'master' of http://github.com/jboner/akka
Conflicts:
	akka-amqp/src/main/scala/AMQP.scala
2010-07-02 12:49:57 +02:00
Jonas Bonér
26d757d683 Merged in patch with method to find actor by function predicate on the ActorRegistry 2010-07-02 10:51:08 +02:00
momania
91536f4430 RabbitMQ to 1.8.0 2010-07-02 09:50:26 +02:00
Jonas Bonér
d229a0f80a CodeFellow integration 2010-07-01 12:33:58 +02:00
Jonas Bonér
b7a7527ca2 Fixed bug in remote deserialization + fixed some failing tests + cleaned up and reorganized code 2010-06-30 16:19:03 +02:00
Jonas Bonér
dbb33f8bd1 Upgraded to AspectWerkz 2.2 + merged in patch for using Actor.isDefinedAt for akka-patterns stuff 2010-06-28 19:06:39 +02:00
Roman Roelofsen
1d7c4d7988 Merge branch 'master' into osgi 2010-06-28 12:23:14 +02:00
Viktor Klang
c55ed7bbdd Fix for #286 2010-06-27 11:38:55 +02:00
Viktor Klang
929c1e20c9 Updated to Netty 3.2.1.Final 2010-06-26 23:46:57 +02:00
Viktor Klang
05cb3b283f Upgraded to Atmosphere 0.6 final 2010-06-26 14:21:00 +02:00
Martin Krasser
0bf05326ef Tests for #289 2010-06-24 20:55:01 +02:00
Roman Roelofsen
c2f8d20ed2 Merge branch 'master' into osgi 2010-06-24 15:49:52 +02:00
Martin Krasser
3a448a3093 closes #289: Support for <akka:camel-service> Spring configuration element 2010-06-24 07:13:02 +02:00
Viktor Klang
ba7c2febd1 Added akka.conf values as defaults and removed lift dependency 2010-06-22 22:52:05 +02:00
Heiko Seeberger
dbb12da4f7 OSGi work: Fixed packageAction for AkkaOSGiAssemblyProject (publish-local working now) and reverted to default artifactID (removed superfluous suffix '_osgi'). 2010-06-21 22:02:15 +02:00
Heiko Seeberger
54b48a3d6d OSGi work: Switched to bnd4sbt 1.0.0.RC3, using projectVersion for exported packages now and fixed a merge bug. 2010-06-21 18:40:15 +02:00
Heiko Seeberger
bd057616b3 Merge branch 'master' into osgi
Conflicts:
	project/build/AkkaProject.scala
2010-06-21 16:32:25 +02:00
Peter Vlugter
a0d4d7c833 Updated to Multiverse 0.6-SNAPSHOT 2010-06-20 09:27:42 +12:00
Martin Krasser
7ba76a88fe Enforce commons-codec version 1.4 for akka-core 2010-06-19 18:36:32 +02: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
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
bfbdc7ae4b All bundles resolve! 2010-06-17 14:19:33 +02:00
Jonas Bonér
ed6282393b Upgraded commons-codec to 1.4 2010-06-17 07:30:07 +02:00
Roman Roelofsen
f0b440453d Exclude transitive dependencies
Ongoing work on finding the bundle list
2010-06-16 11:55:57 +02:00
Roman Roelofsen
1cfaded8ec Merge remote branch 'origin/master' into osgi 2010-06-16 00:50:57 +02:00
Roman Roelofsen
c325a74f5c Basic OSGi stuff working. Need to exclude transitive dependencies from the bundle list. 2010-06-16 00:50:52 +02:00
Peter Vlugter
55778b4b84 Marked Multiverse dependency as intransitive 2010-06-11 18:29:41 +12:00
Debasish Ghosh
1b3d854a1f Redis persistence now handles serialized classes.Removed apis for increment / decrement atomically from Ref. Issue #267 fixed 2010-06-11 01:27:02 +05:30
Jonas Bonér
9ba7120272 Improved RemoteClient listener info 2010-06-09 15:20:22 +02:00
Andreas Kollegger
2c5fd110e5 pulled wrappers into AkkaWrapperProject trait file; sjson, objenesis, dispatch-json, netty ok; multiverse is next 2010-06-08 22:57:55 -04:00
Roman Roelofsen
d0fe535a67 Use more idiomatic way to add the assembly task 2010-06-08 10:36:41 +02:00
Roman Roelofsen
89f581ae52 Work in progress! Trying to find an alternative to mvn assembly 2010-06-07 17:36:11 +02:00