raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge branch 'master' into wip-comet

Browse source
This commit is contained in:
Viktor Klang 2010-02-12 18:48:34 +01:00
commit 4776704530
29 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-amqp/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka</artifactId> <artifactId>akka</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-cluster/akka-cluster-jgroups/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka-cluster-parent</artifactId> <artifactId>akka-cluster-parent</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-cluster/akka-cluster-shoal/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka-cluster-parent</artifactId> <artifactId>akka-cluster-parent</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-cluster/akka-cluster-tribes/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka-cluster-parent</artifactId> <artifactId>akka-cluster-parent</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-cluster/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka</artifactId> <artifactId>akka</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
akka-comet/pom.xml
View file

@ -11,7 +11,7 @@
<parent> <parent>
<artifactId>akka</artifactId> <artifactId>akka</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<!-- Core deps --> <!-- Core deps -->

2
akka-core/pom.xml
View file

@ -11,7 +11,7 @@
<parent> <parent>
<artifactId>akka</artifactId> <artifactId>akka</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<!-- Core deps --> <!-- Core deps -->

2
akka-fun-test-java/pom.xml
View file

@ -11,7 +11,7 @@
<parent> <parent>
<artifactId>akka</artifactId> <artifactId>akka</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-kernel/pom.xml
View file

@ -11,7 +11,7 @@
<parent> <parent>
<artifactId>akka</artifactId> <artifactId>akka</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<!-- akka deps --> <!-- akka deps -->

2
akka-persistence/akka-persistence-cassandra/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka-persistence-parent</artifactId> <artifactId>akka-persistence-parent</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-persistence/akka-persistence-common/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka-persistence-parent</artifactId> <artifactId>akka-persistence-parent</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-persistence/akka-persistence-mongo/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka-persistence-parent</artifactId> <artifactId>akka-persistence-parent</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-persistence/akka-persistence-redis/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka-persistence-parent</artifactId> <artifactId>akka-persistence-parent</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-persistence/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka</artifactId> <artifactId>akka</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
akka-rest/pom.xml
View file

@ -11,7 +11,7 @@
<parent> <parent>
<artifactId>akka</artifactId> <artifactId>akka</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<!-- Core deps --> <!-- Core deps -->

2
akka-samples/akka-sample-chat/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka-samples-parent</artifactId> <artifactId>akka-samples-parent</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<build> <build>

2
akka-samples/akka-sample-lift/config/akka.conf
View file

@ -15,7 +15,7 @@
</log> </log>
<akka> <akka>
version = "0.6" version = "0.7-SNAPSHOT"
<actor> <actor>
timeout = 5000 # default timeout for future based invocations timeout = 5000 # default timeout for future based invocations

2
akka-samples/akka-sample-lift/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka-samples-parent</artifactId> <artifactId>akka-samples-parent</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>

2
akka-samples/akka-sample-rest-java/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka-samples-parent</artifactId> <artifactId>akka-samples-parent</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<build> <build>

2
akka-samples/akka-sample-rest-scala/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka-samples-parent</artifactId> <artifactId>akka-samples-parent</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-samples/akka-sample-security/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka-samples-parent</artifactId> <artifactId>akka-samples-parent</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-samples/akka-sample-security/src/main/resources/akka.conf
View file

@ -6,7 +6,7 @@
# Modify as needed. # Modify as needed.
<akka> <akka>
version = "0.6" version = "0.7-SNAPSHOT"
boot = ["se.scalablesolutions.akka.security.samples.Boot"] # FQN to the class doing initial active object/actor boot = ["se.scalablesolutions.akka.security.samples.Boot"] # FQN to the class doing initial active object/actor
# supervisor bootstrap, should be defined in default constructor # supervisor bootstrap, should be defined in default constructor

2
akka-samples/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka</artifactId> <artifactId>akka</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

2
akka-security/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka</artifactId> <artifactId>akka</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-util-java/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka</artifactId> <artifactId>akka</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-util/pom.xml
View file

@ -10,7 +10,7 @@
<parent> <parent>
<artifactId>akka</artifactId> <artifactId>akka</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>

2
akka-util/src/main/scala/Config.scala
View file

@ -12,7 +12,7 @@ import net.lag.configgy.{Configgy, ParseException}
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a> * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/ */
object Config extends Logging { object Config extends Logging {
val VERSION = "0.6" val VERSION = "0.7-SNAPSHOT"
// Set Multiverse options for max speed // Set Multiverse options for max speed
System.setProperty("org.multiverse.MuliverseConstants.sanityChecks", "false") System.setProperty("org.multiverse.MuliverseConstants.sanityChecks", "false")

2
config/akka-reference.conf
View file

@ -15,7 +15,7 @@
</log> </log>
<akka> <akka>
version = "0.6" version = "0.7-SNAPSHOT"
# FQN to the class doing initial active object/actor # FQN to the class doing initial active object/actor
# supervisor bootstrap, should be defined in default constructor # supervisor bootstrap, should be defined in default constructor

2
pom.xml
View file

@ -7,7 +7,7 @@
<name>Akka Project</name> <name>Akka Project</name>
<artifactId>akka</artifactId> <artifactId>akka</artifactId>
<groupId>se.scalablesolutions.akka</groupId> <groupId>se.scalablesolutions.akka</groupId>
<version>0.6</version> <version>0.7-SNAPSHOT</version>
<inceptionYear>2009</inceptionYear> <inceptionYear>2009</inceptionYear>
<url>http://akkasource.org</url> <url>http://akkasource.org</url>
<packaging>pom</packaging> <packaging>pom</packaging>