Commit graph

161 commits

Author SHA1 Message Date
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
Roman Roelofsen
556cbc3405 Removed some dependencies since they will be provided by their own bundles 2010-06-07 16:46:49 +02:00
Roman Roelofsen
b367851729 Added dependencies-bundle. 2010-06-07 16:28:19 +02:00
Roman Roelofsen
9230db2499 Merge branch 'master' into osgi
Conflicts:
	project/plugins/Plugins.scala
2010-06-07 16:02:02 +02:00
Roman Roelofsen
15d6ce3c50 Removed Maven projects and added bnd4sbt 2010-06-07 15:59:47 +02:00
Andreas Kollegger
96728a0b5a initial implementation of OSGiWrapperProject, applied to jgroups dependency to make it OSGi-friendly 2010-06-06 20:05:26 -04:00
Andreas Kollegger
69f2321f13 merged with master; changed renaming of artifacts to use override def artifactID 2010-06-06 15:08:01 -04:00
Andreas Kollegger
75dc8474b7 initial changes for OSGification: added bnd4sbt plugin, changed artifact naming to include _osgi 2010-06-06 14:33:10 -04:00
Viktor Klang
5694fde51c Freezing Atmosphere dep 2010-06-04 22:11:05 +02:00
Jonas Bonér
fb2ef58fb1 Re-adding runnable Active Object Java tests, which all pass 2010-06-01 21:26:21 +02:00
Jonas Bonér
2ed0feab46 Merge branch 'master' of git@github.com:jboner/akka 2010-06-01 20:57:26 +02:00
Jonas Bonér
56e7428e47 Removed trailing whitespace 2010-06-01 18:41:39 +02:00
Jonas Bonér
c8732569a7 Converted tabs to spaces 2010-06-01 18:33:37 +02:00
Jonas Bonér
89f53eaf0a Removed redundant servlet spec API jar from dist manifest 2010-06-01 18:10:48 +02:00
Viktor Klang
c4a72fd28e Fixed Jersey dependency 2010-05-31 22:34:32 +02:00
Viktor Klang
dc22b8c7b6 Upgraded Atmosphere to 0.6-SNAPSHOT 2010-05-30 21:40:20 +02:00
Jonas Bonér
1904363a74 Upgraded ScalaTest to Scala 2.8.0.RC3 compat lib 2010-05-30 13:04:22 +02:00
Martin Krasser
2d2bdda330 Upgrade to Camel 2.3.0 2010-05-30 08:22:23 +02:00
Viktor Klang
c660a9c469 Merge branch 'master' of github.com:jboner/akka into wip-akka-rest-fix 2010-05-29 14:39:30 +02:00
Heiko Seeberger
d1d8773f04 closes #247: Added all missing module configurations. 2010-05-29 07:28:42 +02:00
Heiko Seeberger
c21e2d1484 Merge branch 'master' into 247-hseeberger 2010-05-29 06:59:32 +02:00
Jonas Bonér
1c37f0cddd Upgraded to Protobuf 2.3.0 2010-05-29 00:53:52 +02:00
Jonas Bonér
47e65346af Merge branch 'master' of git@github.com:jboner/akka 2010-05-29 00:04:07 +02:00
Jonas Bonér
a891ddd3c0 Upgraded Configgy to one build for Scala 2.8 RC3 2010-05-29 00:02:36 +02:00
Viktor Klang
d587d1a5fe Fixing sbt run (exclude slf4j 1.5.11) 2010-05-28 22:05:44 +02:00
Heiko Seeberger
b5f4cfae25 re #247: Added module configuration for akka-persistence-cassandra. Attention: Necessary to delete .ivy2 directory! 2010-05-28 20:52:09 +02:00
Heiko Seeberger
f4298eb5c0 re #247: Removed all vals for repositories except for embeddedRepo. Introduced module configurations necessary for akka-core; other modules still missing. 2010-05-28 20:24:00 +02:00
Debasish Ghosh
c7b2352857 project file updated for redisclient for 2.8.0.RC3 2010-05-28 23:35:17 +05:30
Debasish Ghosh
b52697390f updated project file for sjson for 2.8.RC3 2010-05-28 23:25:40 +05:30
Jonas Bonér
89bf596f38 Switched Listeners impl from Agent to CopyOnWriteArraySet 2010-05-28 19:32:32 +02:00
Jonas Bonér
c70852177f Merge branch 'scala_2.8.RC3' 2010-05-28 18:56:48 +02:00