diff --git a/embedded-repo/com/google/protobuf/protobuf-java/2.1.0/protobuf-java-2.1.0.jar b/embedded-repo/com/google/protobuf/protobuf-java/2.1.0/protobuf-java-2.1.0.jar
new file mode 100644
index 0000000000..961d55122a
Binary files /dev/null and b/embedded-repo/com/google/protobuf/protobuf-java/2.1.0/protobuf-java-2.1.0.jar differ
diff --git a/embedded-repo/com/google/protobuf/protobuf-java/2.1.0/protobuf-java-2.1.0.pom b/embedded-repo/com/google/protobuf/protobuf-java/2.1.0/protobuf-java-2.1.0.pom
new file mode 100644
index 0000000000..f40c24adcf
--- /dev/null
+++ b/embedded-repo/com/google/protobuf/protobuf-java/2.1.0/protobuf-java-2.1.0.pom
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>com.google.protobuf</groupId>
+   <artifactId>protobuf-java</artifactId>
+   <version>2.1.0</version>
+   <packaging>jar</packaging>
+</project>
\ No newline at end of file
diff --git a/embedded-repo/com/twitter/scala-json/0.1/scala-json-1.0.jar b/embedded-repo/com/twitter/scala-json/0.1/scala-json-1.0.jar
new file mode 100644
index 0000000000..df0ec2eaa6
Binary files /dev/null and b/embedded-repo/com/twitter/scala-json/0.1/scala-json-1.0.jar differ
diff --git a/embedded-repo/com/twitter/scala-json/0.1/scala-json-1.0.pom b/embedded-repo/com/twitter/scala-json/0.1/scala-json-1.0.pom
new file mode 100644
index 0000000000..dd4add411e
--- /dev/null
+++ b/embedded-repo/com/twitter/scala-json/0.1/scala-json-1.0.pom
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>com.twitter</groupId>
+   <artifactId>scala-json</artifactId>
+   <version>0.1</version>
+   <packaging>jar</packaging>
+</project>
\ No newline at end of file
diff --git a/embedded-repo/org/codehaus/jackson/jackson-core-asl/1.1.0/jackson-core-asl-1.1.0.jar b/embedded-repo/org/codehaus/jackson/jackson-core-asl/1.1.0/jackson-core-asl-1.1.0.jar
new file mode 100644
index 0000000000..6b561dd2be
Binary files /dev/null and b/embedded-repo/org/codehaus/jackson/jackson-core-asl/1.1.0/jackson-core-asl-1.1.0.jar differ
diff --git a/embedded-repo/org/codehaus/jackson/jackson-core-asl/1.1.0/jackson-core-asl-1.1.0.pom b/embedded-repo/org/codehaus/jackson/jackson-core-asl/1.1.0/jackson-core-asl-1.1.0.pom
new file mode 100644
index 0000000000..022b2ba772
--- /dev/null
+++ b/embedded-repo/org/codehaus/jackson/jackson-core-asl/1.1.0/jackson-core-asl-1.1.0.pom
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>org.codehaus.jackson</groupId>
+   <artifactId>jackson-core-asl</artifactId>
+   <version>1.1.0</version>
+   <packaging>jar</packaging>
+</project>
\ No newline at end of file
diff --git a/embedded-repo/org/codehaus/jackson/jackson-mapper-asl/1.1.0/jackson-mapper-asl-1.1.0.jar b/embedded-repo/org/codehaus/jackson/jackson-mapper-asl/1.1.0/jackson-mapper-asl-1.1.0.jar
new file mode 100644
index 0000000000..1b37ad3772
Binary files /dev/null and b/embedded-repo/org/codehaus/jackson/jackson-mapper-asl/1.1.0/jackson-mapper-asl-1.1.0.jar differ
diff --git a/embedded-repo/org/codehaus/jackson/jackson-mapper-asl/1.1.0/jackson-mapper-asl-1.1.0.pom b/embedded-repo/org/codehaus/jackson/jackson-mapper-asl/1.1.0/jackson-mapper-asl-1.1.0.pom
new file mode 100644
index 0000000000..a16880d32e
--- /dev/null
+++ b/embedded-repo/org/codehaus/jackson/jackson-mapper-asl/1.1.0/jackson-mapper-asl-1.1.0.pom
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>org.codehaus.jackson</groupId>
+   <artifactId>jackson-mapper-asl</artifactId>
+   <version>1.1.0</version>
+   <packaging>jar</packaging>
+</project>
\ No newline at end of file
diff --git a/embedded-repo/sbinary/sbinary/0.3/sbinary-0.3.jar b/embedded-repo/sbinary/sbinary/0.3/sbinary-0.3.jar
new file mode 100644
index 0000000000..e7839cfb24
Binary files /dev/null and b/embedded-repo/sbinary/sbinary/0.3/sbinary-0.3.jar differ
diff --git a/embedded-repo/sbinary/sbinary/0.3/sbinary-0.3.pom b/embedded-repo/sbinary/sbinary/0.3/sbinary-0.3.pom
new file mode 100644
index 0000000000..5110b4fdbe
--- /dev/null
+++ b/embedded-repo/sbinary/sbinary/0.3/sbinary-0.3.pom
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>sbinary</groupId>
+   <artifactId>sbinary</artifactId>
+   <version>0.3</version>
+   <packaging>jar</packaging>
+</project>
\ No newline at end of file
diff --git a/fun-test-java/pom.xml b/fun-test-java/pom.xml
index 35dc68d7d8..b52881e155 100644
--- a/fun-test-java/pom.xml
+++ b/fun-test-java/pom.xml
@@ -1,112 +1,112 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <name>Akka Functional Tests in Java</name>
-    <artifactId>akka-fun-test-java</artifactId>
+  <name>Akka Functional Tests in Java</name>
+  <artifactId>akka-fun-test-java</artifactId>
 
-    <packaging>jar</packaging>
+  <packaging>jar</packaging>
 
-    <parent>
-        <artifactId>akka</artifactId>
-        <groupId>${akka.groupId}</groupId>
-        <version>${akka.version}</version>
-    </parent>
+  <parent>
+    <artifactId>akka</artifactId>
+    <groupId>${akka.groupId}</groupId>
+    <version>${akka.version}</version>
+  </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>${akka.groupId}</groupId>
-            <artifactId>akka-kernel</artifactId>
-            <version>${akka.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.grizzly</groupId>
-            <artifactId>grizzly-servlet-webserver</artifactId>
-            <version>1.9.9</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-            <version>1.0.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-            <version>1.0.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>1.1.0-ea</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-atom</artifactId>
-            <version>1.0.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jmock</groupId>
-            <artifactId>jmock</artifactId>
-            <version>2.4.0</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>${akka.groupId}</groupId>
+      <artifactId>akka-kernel</artifactId>
+      <version>${akka.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.grizzly</groupId>
+      <artifactId>grizzly-servlet-webserver</artifactId>
+      <version>1.9.9</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
+      <version>1.0.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-json</artifactId>
+      <version>1.0.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-client</artifactId>
+      <version>1.1.0-ea</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-atom</artifactId>
+      <version>1.0.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <version>2.4.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <sourceDirectory>src/main</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                    <includes>
-                        <include>**/*</include>
-                    </includes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/Abstract*</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <filtering>false</filtering>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <filtering>false</filtering>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**</include>
-                </includes>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-    </build>
-    <reporting>
-        <plugins></plugins>
-    </reporting>
+  <build>
+    <sourceDirectory>src/main</sourceDirectory>
+    <testSourceDirectory>src/test/java</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <includes>
+            <include>**/*</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/Abstract*</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>**</include>
+        </includes>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+  </build>
+  <reporting>
+    <plugins></plugins>
+  </reporting>
 </project>
diff --git a/kernel/pom.xml b/kernel/pom.xml
index f34ab308d4..3c4295eaaa 100644
--- a/kernel/pom.xml
+++ b/kernel/pom.xml
@@ -61,6 +61,8 @@
       <artifactId>zookeeper</artifactId>
       <version>3.1.0</version>
     </dependency>
+
+    <!-- For Protocol/Serialization -->
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-core-asl</artifactId>
diff --git a/pom.xml b/pom.xml
index 0e6ff4f86e..394d898dce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,158 +2,158 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <name>Akka Actor Kernel</name>
-    <artifactId>akka</artifactId>
-    <groupId>${akka.groupId}</groupId>
-    <version>${akka.version}</version>
-    <inceptionYear>2009</inceptionYear>
-    <packaging>pom</packaging>
+  <name>Akka Actor Kernel</name>
+  <artifactId>akka</artifactId>
+  <groupId>${akka.groupId}</groupId>
+  <version>${akka.version}</version>
+  <inceptionYear>2009</inceptionYear>
+  <packaging>pom</packaging>
 
-    <properties>
-        <akka.version>0.5</akka.version>
-        <akka.groupId>se.scalablesolutions.akka</akka.groupId>
-        <scala.version>2.7.5</scala.version>
-    </properties>
+  <properties>
+    <akka.version>0.5</akka.version>
+    <akka.groupId>se.scalablesolutions.akka</akka.groupId>
+    <scala.version>2.7.5</scala.version>
+  </properties>
 
-    <modules>
-        <module>util-java</module>
-        <module>kernel</module>
-        <module>fun-test-java</module>
-        <module>samples-scala</module>
-        <module>samples-java</module>
-    </modules>
+  <modules>
+    <module>util-java</module>
+    <module>kernel</module>
+    <module>fun-test-java</module>
+    <module>samples-scala</module>
+    <module>samples-java</module>
+  </modules>
 
-    <repositories>
-        <repository>
-            <id>repo1.maven</id>
-            <name>Maven Main Repository</name>
-            <url>http://repo1.maven.org/maven2</url>
-            <!--<snapshots>
-            	<enabled>true</enabled>
-            </snapshots>-->
-        </repository>
-        <repository>
-            <id>project.embedded.module</id>
-            <name>Project Embedded Repository</name>
-            <url>file://${basedir}/../embedded-repo</url>
-        </repository>
-        <repository>
-            <id>scala-tools-snapshots</id>
-            <name>Scala-Tools Maven2 Snapshot Repository</name>
-            <url>http://scala-tools.org/repo-snapshots</url>
-        </repository>
-        <repository>
-            <id>scala-tools</id>
-            <name>Scala-Tools Maven2 Repository</name>
-            <url>http://scala-tools.org/repo-releases</url>
-        </repository>
-        <repository>
-            <id>lag</id>
-            <name>Configgy's' Repository</name>
-            <url>http://www.lag.net/repo</url>
-        </repository>
-        <repository>
-            <id>maven2-repository.dev.java.net</id>
-            <name>Java.net Repository for Maven</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-        <repository>
-            <id>java.net</id>
-            <name>Java.net Legacy Repository for Maven</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>guiceyfruit.release</id>
-            <name>GuiceyFruit Release Repository</name>
-            <url>http://guiceyfruit.googlecode.com/svn/repo/releases/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>guiceyfruit.snapshot</id>
-            <name>GuiceyFruit Snapshot Repository</name>
-            <url>http://guiceyfruit.googlecode.com/svn/repo/snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-        <repository>
-  			<id>google-maven-repository</id>
-  			<name>Google Maven Repository</name>
-  			<url>http://google-maven-repository.googlecode.com/svn/repository/</url>
-		</repository>
-        <repository>
-            <id>repository.codehaus.org</id>
-            <name>Codehaus Maven Repository</name>
-            <url>http://repository.codehaus.org</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>repository.jboss.org</id>
-            <name>JBoss Repository for Maven</name>
-            <url>http://repository.jboss.org/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
+  <repositories>
+    <repository>
+      <id>repo1.maven</id>
+      <name>Maven Main Repository</name>
+      <url>http://repo1.maven.org/maven2</url>
+      <!--<snapshots>
+          <enabled>true</enabled>
+          </snapshots>-->
+    </repository>
+    <repository>
+      <id>project.embedded.module</id>
+      <name>Project Embedded Repository</name>
+      <url>file://${basedir}/../embedded-repo</url>
+    </repository>
+    <repository>
+      <id>scala-tools-snapshots</id>
+      <name>Scala-Tools Maven2 Snapshot Repository</name>
+      <url>http://scala-tools.org/repo-snapshots</url>
+    </repository>
+    <repository>
+      <id>scala-tools</id>
+      <name>Scala-Tools Maven2 Repository</name>
+      <url>http://scala-tools.org/repo-releases</url>
+    </repository>
+    <repository>
+      <id>lag</id>
+      <name>Configgy's' Repository</name>
+      <url>http://www.lag.net/repo</url>
+    </repository>
+    <repository>
+      <id>maven2-repository.dev.java.net</id>
+      <name>Java.net Repository for Maven</name>
+      <url>http://download.java.net/maven/2</url>
+    </repository>
+    <repository>
+      <id>java.net</id>
+      <name>Java.net Legacy Repository for Maven</name>
+      <url>http://download.java.net/maven/1</url>
+      <layout>legacy</layout>
+    </repository>
+    <repository>
+      <id>guiceyfruit.release</id>
+      <name>GuiceyFruit Release Repository</name>
+      <url>http://guiceyfruit.googlecode.com/svn/repo/releases/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <repository>
+      <id>guiceyfruit.snapshot</id>
+      <name>GuiceyFruit Snapshot Repository</name>
+      <url>http://guiceyfruit.googlecode.com/svn/repo/snapshots/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+    <repository>
+      <id>google-maven-repository</id>
+      <name>Google Maven Repository</name>
+      <url>http://google-maven-repository.googlecode.com/svn/repository/</url>
+    </repository>
+    <repository>
+      <id>repository.codehaus.org</id>
+      <name>Codehaus Maven Repository</name>
+      <url>http://repository.codehaus.org</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>repository.jboss.org</id>
+      <name>JBoss Repository for Maven</name>
+      <url>http://repository.jboss.org/maven2</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>scala-tools.org</id>
-            <name>Scala-Tools Maven2 Repository</name>
-            <url>http://scala-tools.org/repo-releases</url>
-        </pluginRepository>
-    </pluginRepositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>scala-tools.org</id>
+      <name>Scala-Tools Maven2 Repository</name>
+      <url>http://scala-tools.org/repo-releases</url>
+    </pluginRepository>
+  </pluginRepositories>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <configuration>
-                    <tasks>
-                        <!-- To start an akka server, use: mvn antrun:run -->
-                        <!--echo message="akka kernel starting..."/>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <configuration>
+          <tasks>
+            <!-- To start an akka server, use: mvn antrun:run -->
+            <!--echo message="akka kernel starting..."/>
 
-                    <property name="compile_classpath" refid="maven.compile.classpath"/>
-                    <property name="runtime_classpath" refid="maven.runtime.classpath"/>
-                    <property name="test_classpath"    refid="maven.test.classpath"/>
+<property name="compile_classpath" refid="maven.compile.classpath"/>
+<property name="runtime_classpath" refid="maven.runtime.classpath"/>
+<property name="test_classpath"    refid="maven.test.classpath"/>
 
-                    <java classname="com.scalablesolutions.akka.kernel.Kernel" fork="true">
-                      <classpath>
-                        <pathelement path="${runtime_classpath}"/>
-                        <pathelement path="${compile_classpath}"/>
-                      </classpath>
-                      <jvmarg value="-server"/>
-                      <jvmarg value="-Xms256M"/>
-                      <jvmarg value="-Xmx256M"/>
-                      <jvmarg value="-verbosegc"/>
-                      <for profiling/performance...
-                      <jvmarg value="-javaagent:tmp/shiftone-jrat.jar"/>
-                      <jvmarg value="-agentlib:hprof=heap=sites"/>
-                      <jvmarg value="-agentlib:hprof=cpu=samples"/>
-                      <jvmarg value="-agentlib:hprof=cpu=times,thread=y"/>
-                      <arg value="com.scalablesolutions.akka.kernel.Kernel"/>
-                      <arg value="."/>
-                    </java>
-                    <echo message="akka server is shutdown"/-->
-                    </tasks>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+<java classname="com.scalablesolutions.akka.kernel.Kernel" fork="true">
+<classpath>
+<pathelement path="${runtime_classpath}"/>
+<pathelement path="${compile_classpath}"/>
+</classpath>
+<jvmarg value="-server"/>
+<jvmarg value="-Xms256M"/>
+<jvmarg value="-Xmx256M"/>
+<jvmarg value="-verbosegc"/>
+<for profiling/performance...
+<jvmarg value="-javaagent:tmp/shiftone-jrat.jar"/>
+<jvmarg value="-agentlib:hprof=heap=sites"/>
+<jvmarg value="-agentlib:hprof=cpu=samples"/>
+<jvmarg value="-agentlib:hprof=cpu=times,thread=y"/>
+<arg value="com.scalablesolutions.akka.kernel.Kernel"/>
+<arg value="."/>
+</java>
+<echo message="akka server is shutdown"/-->
+          </tasks>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/samples-java/pom.xml b/samples-java/pom.xml
index 7c6186db3e..1fab6318e9 100644
--- a/samples-java/pom.xml
+++ b/samples-java/pom.xml
@@ -1,67 +1,67 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>akka-samples-java</artifactId>
-    <name>Akka Java Samples Module</name>
+  <artifactId>akka-samples-java</artifactId>
+  <name>Akka Java Samples Module</name>
 
-    <packaging>jar</packaging>
+  <packaging>jar</packaging>
 
-    <parent>
-        <artifactId>akka</artifactId>
-        <groupId>${akka.groupId}</groupId>
-        <version>${akka.version}</version>
-    </parent>
+  <parent>
+    <artifactId>akka</artifactId>
+    <groupId>${akka.groupId}</groupId>
+    <version>${akka.version}</version>
+  </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>${akka.groupId}</groupId>
-            <artifactId>akka-kernel</artifactId>
-            <version>${akka.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${akka.groupId}</groupId>
-            <artifactId>akka-util-java</artifactId>
-            <version>${akka.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-            <version>1.0</version>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>${akka.groupId}</groupId>
+      <artifactId>akka-kernel</artifactId>
+      <version>${akka.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${akka.groupId}</groupId>
+      <artifactId>akka-util-java</artifactId>
+      <version>${akka.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>jsr311-api</artifactId>
+      <version>1.0</version>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                    <includes>
-                        <include>**/*</include>
-                    </includes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <configuration>
-                            <tasks>
-                                <copy file="target/akka-samples-java-${akka.version}.jar"
-                                      tofile="../deploy/akka-samples-java-${akka.version}.jar"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <includes>
+            <include>**/*</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>install</phase>
+            <configuration>
+              <tasks>
+                <copy file="target/akka-samples-java-${akka.version}.jar"
+                      tofile="../deploy/akka-samples-java-${akka.version}.jar"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/samples-scala/pom.xml b/samples-scala/pom.xml
index d6e6813bbe..27c0835d5a 100644
--- a/samples-scala/pom.xml
+++ b/samples-scala/pom.xml
@@ -1,118 +1,118 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>akka-samples-scala</artifactId>
-    <name>Akka Scala Samples Module</name>
+  <artifactId>akka-samples-scala</artifactId>
+  <name>Akka Scala Samples Module</name>
 
-    <packaging>jar</packaging>
+  <packaging>jar</packaging>
 
-    <parent>
-        <artifactId>akka</artifactId>
-        <groupId>${akka.groupId}</groupId>
-        <version>${akka.version}</version>
-    </parent>
+  <parent>
+    <artifactId>akka</artifactId>
+    <groupId>${akka.groupId}</groupId>
+    <version>${akka.version}</version>
+  </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>${akka.groupId}</groupId>
-            <artifactId>akka-kernel</artifactId>
-            <version>${akka.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${akka.groupId}</groupId>
-            <artifactId>akka-util-java</artifactId>
-            <version>${akka.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-            <version>1.0</version>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>${akka.groupId}</groupId>
+      <artifactId>akka-kernel</artifactId>
+      <version>${akka.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${akka.groupId}</groupId>
+      <artifactId>akka-util-java</artifactId>
+      <version>${akka.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>jsr311-api</artifactId>
+      <version>1.0</version>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <sourceDirectory>src/main/scala</sourceDirectory>
-        <testSourceDirectory>src/test/scala</testSourceDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.scala-tools</groupId>
-                <artifactId>maven-scala-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>compile</goal>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <args>
-                        <arg>-target:jvm-1.5</arg>
-                        <arg>-unchecked</arg>
-                    </args>
-                    <scalaVersion>${scala.version}</scalaVersion>
-                    <vscaladocVersion>1.1</vscaladocVersion>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <configuration>
-                    <downloadSources>true</downloadSources>
-                    <buildcommands>
-                        <buildcommand>
-                            ch.epfl.lamp.sdt.core.scalabuilder
-                        </buildcommand>
-                    </buildcommands>
-                    <additionalProjectnatures>
-                        <projectnature>
-                            ch.epfl.lamp.sdt.core.scalanature
-                        </projectnature>
-                    </additionalProjectnatures>
-                    <classpathContainers>
-                        <classpathContainer>
-                            org.eclipse.jdt.launching.JRE_CONTAINER
-                        </classpathContainer>
-                        <classpathContainer>
-                            ch.epfl.lamp.sdt.launching.SCALA_CONTAINER
-                        </classpathContainer>
-                    </classpathContainers>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <configuration>
-                            <tasks>
-                                <copy file="target/akka-samples-scala-${akka.version}.jar"
-                                      tofile="../deploy/akka-samples-scala-${akka.version}.jar"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <filtering>false</filtering>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <filtering>false</filtering>
-                <directory>src/main/scala</directory>
-                <includes>
-                    <include>**</include>
-                </includes>
-                <excludes>
-                    <exclude>**/*.scala</exclude>
-                </excludes>
-            </resource>
-        </resources>
-    </build>
+  <build>
+    <sourceDirectory>src/main/scala</sourceDirectory>
+    <testSourceDirectory>src/test/scala</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.scala-tools</groupId>
+        <artifactId>maven-scala-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <args>
+            <arg>-target:jvm-1.5</arg>
+            <arg>-unchecked</arg>
+          </args>
+          <scalaVersion>${scala.version}</scalaVersion>
+          <vscaladocVersion>1.1</vscaladocVersion>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <downloadSources>true</downloadSources>
+          <buildcommands>
+            <buildcommand>
+              ch.epfl.lamp.sdt.core.scalabuilder
+            </buildcommand>
+          </buildcommands>
+          <additionalProjectnatures>
+            <projectnature>
+              ch.epfl.lamp.sdt.core.scalanature
+            </projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>
+              org.eclipse.jdt.launching.JRE_CONTAINER
+            </classpathContainer>
+            <classpathContainer>
+              ch.epfl.lamp.sdt.launching.SCALA_CONTAINER
+            </classpathContainer>
+          </classpathContainers>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>install</phase>
+            <configuration>
+              <tasks>
+                <copy file="target/akka-samples-scala-${akka.version}.jar"
+                      tofile="../deploy/akka-samples-scala-${akka.version}.jar"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/main/scala</directory>
+        <includes>
+          <include>**</include>
+        </includes>
+        <excludes>
+          <exclude>**/*.scala</exclude>
+        </excludes>
+      </resource>
+    </resources>
+  </build>
 </project>
diff --git a/util-java/pom.xml b/util-java/pom.xml
index 7ee8202922..93c3c8cd80 100644
--- a/util-java/pom.xml
+++ b/util-java/pom.xml
@@ -1,68 +1,68 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>akka-util-java</artifactId>
-    <name>Akka Java Utilities Module</name>
+  <artifactId>akka-util-java</artifactId>
+  <name>Akka Java Utilities Module</name>
 
-    <packaging>jar</packaging>
+  <packaging>jar</packaging>
 
-    <parent>
-        <artifactId>akka</artifactId>
-        <groupId>${akka.groupId}</groupId>
-        <version>${akka.version}</version>
-    </parent>
+  <parent>
+    <artifactId>akka</artifactId>
+    <groupId>${akka.groupId}</groupId>
+    <version>${akka.version}</version>
+  </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.guiceyfruit</groupId>
-            <artifactId>guice-core</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.guiceyfruit</groupId>
-            <artifactId>guice-jsr250</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.guiceyfruit</groupId>
+      <artifactId>guice-core</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.guiceyfruit</groupId>
+      <artifactId>guice-jsr250</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>2.1.0</version>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                    <includes>
-                        <include>**/*</include>
-                    </includes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <configuration>
-                            <tasks>
-                                <copy file="target/akka-util-java-${akka.version}.jar"
-                                      tofile="../lib/akka-util-java-${akka.version}.jar"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                          <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <testSourceDirectory>src/test/java</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <includes>
+            <include>**/*</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>install</phase>
+            <configuration>
+              <tasks>
+                <copy file="target/akka-util-java-${akka.version}.jar"
+                      tofile="../lib/akka-util-java-${akka.version}.jar"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>