diff --git a/bin/start-akka-server.bat b/bin/start-akka-server.bat
deleted file mode 100755
index cc0ed74dbb..0000000000
--- a/bin/start-akka-server.bat
+++ /dev/null
@@ -1,85 +0,0 @@
-@ECHO OFF
- 
-@REM IF "%1"=="" goto error
-IF "%AKKA_HOME%"=="" goto error_no_akka_home
-IF "%JAVA_COMMAND%"=="" set JAVA_COMMAND=%JAVA_HOME%\bin\java
-IF "%JAVA_HOME%"=="" goto error_no_java_home
- 
-set VERSION=0.5
-set LIB_DIR=%AKKA_HOME%\lib
-
-set CLASSPATH=%AKKA_HOME%\config
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\akka-kernel-0.5.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\akka-util-java-0.5.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\aopalliance-1.0.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\asm-3.1.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\aspectwerkz-jdk5-2.1.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\aspectwerkz-nodeps-jdk5-2.1.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\atmosphere-core-0.3.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\atmosphere-portable-runtime-0.3.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\camel-core-2.0-SNAPSHOT.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\atmosphere-compat-0.3.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\cassandra-0.4.0-trunk.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\cglib-2.2.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\commons-cli-1.1.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\commons-io-1.3.2.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\commons-logging-1.0.4.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\commons-math-1.1.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\commons-pool-1.5.1.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\configgy-1.3.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\fscontext.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\google-collect-snapshot-20090211.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\grizzly-comet-webserver-1.8.6.3.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\guice-core-2.0-SNAPSHOT.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\jackson-core-asl-1.1.0.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\jackson-mapper-asl-1.1.0.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\jersey-client-1.1.1-ea.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\jersey-core-1.1.1-ea.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\jersey-json-1.1.1-ea.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\jersey-server-1.1.1-ea.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\jersey-scala-1.1.2-ea-SNAPSHOT.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\JSAP-2.1.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\jsr311-api-1.0.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\libfb303.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\libthrift.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\log4j-1.2.15.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\netty-3.1.0.GA.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\providerutil.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\protobuf-java-2.1.0.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\scala-library-2.7.5.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\scala-stats-1.0.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\servlet-api-2.5.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\slf4j-api-1.4.3.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\slf4j-log4j12-1.4.3.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\stringtemplate-3.0.jar
-set CLASSPATH=%CLASSPATH%;%LIB_DIR%\zookeeper-3.1.0.jar
-
-@REM Add for debugging; -Xdebug -Xrunjdwp;transport=dt_socket,server=y,suspend=y,address=5005 \
-@REM To have Akka dump the generated classes, add the '-Daspectwerkz.transform.dump=*' option and it will dump classes to $BASE_DIR/_dump
-
-set JVM_OPTS=-server -Xms128M -Xmx1G -XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=90 -XX:+AggressiveOpts -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=1 -XX:+CMSParallelRemarkEnabled -XX:+HeapDumpOnOutOfMemoryError -Dcom.sun.management.jmxremote.port=8080 -Dcom.sun.management.jmxremote.ssl=false -Djava.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory -Dcom.sun.grizzly.cometSupport=true -Dcom.sun.management.jmxremote.authenticate=false
-
-@ECHO ON
-
-%JAVA_HOME%\bin\java %JVM_OPTS% -cp %CLASSPATH% se.scalablesolutions.akka.kernel.Kernel %1 %2 %3
- 
-@exit /B %ERRORLEVEL%
-  
-;error
-    IF EXIST "%AKKA_HOME%\bin\usage.txt" (
-        type %AKKA_HOME%\bin\usage.txt"
-    ) ELSE (
-        echo AKKA_HOME does not point to the Akka directory
-    )
-@goto error_exit
- 
-;error_no_java_home
-@echo Please specify the JAVA_HOME environment variable.
-@goto error_exit
- 
-;error_no_akka_home
-@echo Please specify the AKKA_HOME environment variable.
-@goto error_exit
- 
-;error_exit
-@exit /B -1
\ No newline at end of file
diff --git a/bin/start-akka-server.sh b/bin/start-akka-server.sh
deleted file mode 100755
index 44961c324d..0000000000
--- a/bin/start-akka-server.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-VERSION=0.5
-
-BASE_DIR=$(dirname $0)/..
-echo 'Starting Akka Kernel from directory' $BASE_DIR
-
-LIB_DIR=$BASE_DIR/lib
-
-CLASSPATH=$BASE_DIR/config
-CLASSPATH=$CLASSPATH:$LIB_DIR/akka-kernel-0.5.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/akka-util-java-0.5.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/antlr-3.1.3.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/aopalliance-1.0.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/asm-3.1.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/aspectwerkz-jdk5-2.1.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/aspectwerkz-nodeps-jdk5-2.1.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/atmosphere-core-0.3.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/atmosphere-portable-runtime-0.3.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/camel-core-2.0-SNAPSHOT.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/atmosphere-compat-0.3.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/cassandra-0.4.0-trunk.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/cglib-2.2.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/commons-cli-1.1.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/commons-collections-3.2.1.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/commons-io-1.3.2.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/commons-javaflow-1.0-SNAPSHOT.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/commons-lang-2.4.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/commons-logging-1.0.4.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/commons-math-1.1.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/commons-pool-1.5.1.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/configgy-1.3.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/fscontext.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/google-collect-snapshot-20090211.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/grizzly-comet-webserver-1.8.6.3.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/guice-core-2.0-SNAPSHOT.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/jackson-core-asl-1.1.0.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/jackson-mapper-asl-1.1.0.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/javautils-2.7.4-0.1.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/jersey-client-1.1.1-ea.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/jersey-core-1.1.1-ea.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/jersey-json-1.1.1-ea.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/jersey-server-1.1.1-ea.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/jersey-scala-1.1.2-ea-SNAPSHOT.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/JSAP-2.1.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/jsr311-api-1.0.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/libfb303.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/libthrift.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/log4j-1.2.15.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/netty-3.1.0.GA.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/providerutil.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/protobuf-java-2.1.0.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/scala-library-2.7.5.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/scala-stats-1.0.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/servlet-api-2.5.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/slf4j-api-1.4.3.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/slf4j-log4j12-1.4.3.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/stringtemplate-3.0.jar
-CLASSPATH=$CLASSPATH:$LIB_DIR/zookeeper-3.1.0.jar
-
-# Add for debugging: -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 \
-# To have Akka dump the generated classes, add the '-Daspectwerkz.transform.dump=*' option and it will dump classes to $BASE_DIR/_dump
-JVM_OPTS=" \
-        -server \
-        -Xms128M \
-        -Xmx1G \
-        -XX:SurvivorRatio=8 \
-        -XX:TargetSurvivorRatio=90 \
-        -XX:+AggressiveOpts \
-        -XX:+UseParNewGC \
-        -XX:+UseConcMarkSweepGC \
-        -XX:CMSInitiatingOccupancyFraction=1 \
-        -XX:+CMSParallelRemarkEnabled \
-        -XX:+HeapDumpOnOutOfMemoryError \
-        -Dcom.sun.management.jmxremote.port=8080 \
-        -Dcom.sun.management.jmxremote.ssl=false \
-        -Djava.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory \
-        -Dcom.sun.grizzly.cometSupport=true \
-        -Dcom.sun.management.jmxremote.authenticate=false"
- 
-echo $JAVA_HOME/bin/java $JVM_OPTS -cp $CLASSPATH se.scalablesolutions.akka.kernel.Kernel ${1}
-$JAVA_HOME/bin/java $JVM_OPTS -cp $CLASSPATH se.scalablesolutions.akka.kernel.Kernel ${1}
diff --git a/kernel/pom.xml b/kernel/pom.xml
index 04b6fcc144..12dead8077 100644
--- a/kernel/pom.xml
+++ b/kernel/pom.xml
@@ -47,11 +47,6 @@
       <artifactId>configgy</artifactId>
       <version>1.3</version>
     </dependency>
-    <!--dependency>
-      <groupId>org.guiceyfruit</groupId>
-      <artifactId>guiceyfruit-core</artifactId>
-      <version>2.0</version>
-    </dependency-->
     <dependency>
       <groupId>org.guiceyfruit</groupId>
       <artifactId>guice-core</artifactId>
@@ -128,21 +123,6 @@
       <artifactId>fb303</artifactId>
       <version>1.0</version>
     </dependency>
-    <!--dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>high-scale-lib</groupId>
-      <artifactId>high-scale-lib</artifactId>
-      <version>1.0</version>
-    </dependency-->
-    <!--dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.4</version>
-    </dependency-->
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
@@ -230,6 +210,31 @@
 
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-2</version>
+        <executions>
+          <execution>
+            <id>create-executable-jar</id>
+            <phase>install</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptorRefs>
+                <descriptorRef>
+                  jar-with-dependencies
+                </descriptorRef>
+              </descriptorRefs>
+              <archive>
+                <manifest>
+                  <mainClass>se.scalablesolutions.akka.kernel.Kernel</mainClass>
+                </manifest>
+              </archive>
+           </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
@@ -237,8 +242,8 @@
             <phase>install</phase>
             <configuration>
               <tasks>
-                <copy file="target/akka-kernel-${akka.version}.jar"
-                      tofile="../lib/akka-kernel-${akka.version}.jar"/>
+                <copy file="target/akka-kernel-${akka.version}-jar-with-dependencies.jar"
+                      tofile="../dist/akka-${akka.version}.jar"/>
               </tasks>
             </configuration>
             <goals>
@@ -247,24 +252,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.dstovall</groupId>
-        <artifactId>onejar-maven-plugin</artifactId>
-        <version>1.4.1</version>
-        <executions>
-          <execution>
-            <configuration>
-              <mainClass>se.scalablesolutions.akka.kernel.Kernel</mainClass>
-              <onejarVersion>0.96</onejarVersion>
-              <attachToBuild>true</attachToBuild>
-              <classifier>onejar</classifier>
-            </configuration>
-            <goals>
-              <goal>one-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
     <resources>
       <resource>
diff --git a/lib/JSAP-2.1.jar b/lib/JSAP-2.1.jar
deleted file mode 100644
index 15d1f37a78..0000000000
Binary files a/lib/JSAP-2.1.jar and /dev/null differ
diff --git a/lib/aopalliance-1.0.jar b/lib/aopalliance-1.0.jar
deleted file mode 100644
index 578b1a0c35..0000000000
Binary files a/lib/aopalliance-1.0.jar and /dev/null differ
diff --git a/lib/asm-3.1.jar b/lib/asm-3.1.jar
deleted file mode 100644
index 8217cae0a1..0000000000
Binary files a/lib/asm-3.1.jar and /dev/null differ
diff --git a/lib/aspectwerkz-jdk5-2.1.jar b/lib/aspectwerkz-jdk5-2.1.jar
deleted file mode 100755
index c258335f67..0000000000
Binary files a/lib/aspectwerkz-jdk5-2.1.jar and /dev/null differ
diff --git a/lib/aspectwerkz-nodeps-jdk5-2.1.jar b/lib/aspectwerkz-nodeps-jdk5-2.1.jar
deleted file mode 100644
index 3a65f7b3de..0000000000
Binary files a/lib/aspectwerkz-nodeps-jdk5-2.1.jar and /dev/null differ
diff --git a/lib/aspectwerkz2.dtd b/lib/aspectwerkz2.dtd
deleted file mode 100755
index 5ed29fe769..0000000000
--- a/lib/aspectwerkz2.dtd
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--*****************************************************************************************************************************
-	AspectWerkz DTD 2.0
-
-This DTD is provided as is. Some elements might have been deprecated since 0.7.4  (see comments)
-
-This DTD might be incomplete - drop a mail on the user / dev mailing list
-
-This DTD might clash with some of existing XML files since it imposes for some elements an order
-(see aspect: introductions then pointcuts then advices)
-
-The "unspecified" order of the aspectwerkz childs might change to the one similar of aspects
-(transformation scope, introduction-def, advice-def, advices-def, abstract-aspect, aspect, package)
-
-To use this DTD, start your defintion file with
-	<!DOCTYPE aspectwerkz PUBLIC
-	    "-//AspectWerkz//DTD 2.0//EN"
-	    "http://aspectwerkz.codehaus.org/dtd/aspectwerkz_2_0.dtd">
-
-You can also use the "aliasing DTD" that matchs always the latest release of AspectWerkz
-<!DOCTYPE aspectwerkz PUBLIC
-    "-//AspectWerkz//DTD//EN"
-    "http://aspectwerkz.codehaus.org/dtd/aspectwerkz2.dtd">
-
-To not use this DTD, start your definition file with
-	<?xml version="1.0"?>
-
-Change from 1.0 to 2.0
-    most of the changes implies non backward compatibility
-    aspect/introduce element only allows to introduce interface. Use new <mixin element.
-    introduce@deploymentModel is removed
-    new system/mixin top level element
-    deployment-scope
-    advisable
-******************************************************************************************************************************-->
-
-
-<!--*****************************************************************************************************************************
-aspectwerkz
-*********************************************************************************************************************************
-Aspectwerkz defines the root element
-One system defines a namespace. Usually systems are used with several aop.xml file to isolate system
-following classloader hierarchies.
-******************************************************************************************************************************-->
-<!ELEMENT aspectwerkz (system*)>
-<!--*****************************************************************************************************************************
-system
-*********************************************************************************************************************************
-System allows isolation of AspectWerkz model
-For now we only support a single system.
-A system contains use-aspect syntax OR *-def *-ref syntax. The DTD cannot represent that.
-Attributes:
-    id: unique name of the AspectWerkz system (replaces <aspectwerkz id=..> in 0.8.1 DTD)
-    base-package: provides the global package prefix
-Notes:
-    Due to package nesting, we cannot define an order here
-******************************************************************************************************************************-->
-<!ELEMENT system (
-    (exclude | include | prepare | pointcut | deployment-scope | advisable)*,
-    (aspect | mixin | package)*
-)>
-<!ATTLIST system
-id CDATA #REQUIRED
-base-package CDATA #IMPLIED
->
-<!--*****************************************************************************************************************************
-exclude
-*********************************************************************************************************************************
-Declares one global package prefix. Any class in the scope cannot have aspects on it within this system
-Attributes:
-	package: package prefix
-Note: package does not support pattern, excepted ending ".*" like "foo.*", which is equivalent to "foo."
-During weaving, a class is considered to be in the transformation scope with a classFQN.startsWith( ) test.
-Note: if a class is both in exclude and include, it is considered excluded.
-******************************************************************************************************************************-->
-<!ELEMENT exclude EMPTY>
-<!ATTLIST exclude
-package CDATA #REQUIRED
->
-<!--*****************************************************************************************************************************
-include
-*********************************************************************************************************************************
-Declares one global package prefix. Any class not in the scope cannot have aspects on it within this system
-Attributes:
-	package: package prefix
-Note: package does not support pattern, excepted ending ".*" like "foo.*", which is equivalent to "foo."
-During weaving, a class is considered to be in the transformation scope with a classFQN.startsWith( ) test.
-******************************************************************************************************************************-->
-<!ELEMENT include EMPTY>
-<!ATTLIST include
-package CDATA #REQUIRED
->
-<!--*****************************************************************************************************************************
-prepare
-*********************************************************************************************************************************
-deprecated
-******************************************************************************************************************************-->
-<!ELEMENT prepare EMPTY>
-<!ATTLIST prepare
-package CDATA #REQUIRED
->
-<!--*****************************************************************************************************************************
-package
-*********************************************************************************************************************************
-Declares a package prefix which applies to all FQN (aspect) and patterns (pointcuts, class)
-contained in the package element.
-TODO REMOVE or IMPL - Package elements can be nested to ease writing of package and subpackage
-TODO REMOVE or IMPL - (package@name "bar" nested in package@name "foo" means "foo.bar").
-Attributes:
-	name: package prefix
-Notes:
-    Does not support pattern, excepted ending ".*" like "foo.*" which is equivalent to "foo." and to "foo"
-******************************************************************************************************************************-->
-<!ELEMENT package (
-    (aspect | mixin)*
-)>
-<!ATTLIST package
-name CDATA #REQUIRED
->
-<!--*****************************************************************************************************************************
-aspect
-*********************************************************************************************************************************
-Declares aspect.
-Attributes:
-    name: unique name of the aspect in the system. Defaults to FQN (see class)
-    class: FQN of Aspect (can have metdata or not)
-    container: FQN of AspectContainer, defaults to regular org.codehaus.aspectwerkz.aspect.DefaultAspectContainerStrategy
-    deployment-model: aspect life cycle, defaults to perJVM
-        valid values are: perJVM | perClass | perInstance | perthis(...pc expr) | pertarget(...pc expr)
-******************************************************************************************************************************-->
-<!ELEMENT aspect (
-    param*,
-    (pointcut | deployment-scope | advice | introduce)*
- )>
-<!ATTLIST aspect
-name CDATA #IMPLIED
-class CDATA #REQUIRED
-container CDATA #IMPLIED
-deployment-model CDATA #IMPLIED
->
-<!--*****************************************************************************************************************************
-param
-*********************************************************************************************************************************
-Declares param for a aspect element
-******************************************************************************************************************************-->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
-name CDATA #REQUIRED
-value CDATA #REQUIRED
->
-<!--*****************************************************************************************************************************
-pointcut
-*********************************************************************************************************************************
-Attributes:
-	name
-	expression (required unless element data is used)
-Element data: equivalent to expression, but ignored if pointcut@expression is already specified
-******************************************************************************************************************************-->
-<!ELEMENT pointcut (#PCDATA)>
-<!ATTLIST pointcut
-name CDATA #REQUIRED
-expression CDATA #IMPLIED
->
-<!--*****************************************************************************************************************************
-deployment-scope
-*********************************************************************************************************************************
-Attributes:
-	name
-	expression (required unless element data is used)
-Element data: equivalent to expression, but ignored if deployment-scope@expression is already specified
-******************************************************************************************************************************-->
-<!ELEMENT deployment-scope (#PCDATA)>
-<!ATTLIST deployment-scope
-name CDATA #REQUIRED
-expression CDATA #IMPLIED
->
-<!--*****************************************************************************************************************************
-advisable
-*********************************************************************************************************************************
-Attributes:
-	pointcut-type: the pointcut type: call, get, set, execution, handler, all, or any piped list like get|set
-	expression: the pointcut expression, can be within/withincode/or more fine grained, as long as consistent with pointcut-type
-******************************************************************************************************************************-->
-<!ELEMENT advisable EMPTY>
-<!ATTLIST advisable
-pointcut-type CDATA #REQUIRED
-expression CDATA #REQUIRED
->
-<!--*****************************************************************************************************************************
-advice
-*********************************************************************************************************************************
-Allow for advice declaration for use in several aspects
-Use nested bind-to element for multiple binding
-Attributes:
-	name: method name implementing the advice
-	type: advice type (around | before | after | after finally | after returning | after throwing), "after xxx(TYPE varName)"
-    bind-to: pointcut expression
-******************************************************************************************************************************-->
-<!ELEMENT advice (
-    bind-to*
-)>
-<!ATTLIST advice
-name CDATA #REQUIRED
-type CDATA #REQUIRED
-bind-to CDATA #IMPLIED
-attribute CDATA #IMPLIED
->
-<!--*****************************************************************************************************************************
-bind-to
-*********************************************************************************************************************************
-Allow to bind an advice several times instead of using an OR expression
-******************************************************************************************************************************-->
-<!ELEMENT bind-to EMPTY>
-<!ATTLIST bind-to
-pointcut CDATA #REQUIRED
->
-<!--*****************************************************************************************************************************
-introduce
-*********************************************************************************************************************************
-Attributes:
-    class: interface introduction only
-    bind-to: pointcut expression (only within/hasField/hasMethod makes sense)
-******************************************************************************************************************************-->
-<!ELEMENT introduce (
-    bind-to*
-)>
-<!ATTLIST introduce
-class CDATA #REQUIRED
-bind-to CDATA #IMPLIED
->
-<!--*****************************************************************************************************************************
-mixin
-*********************************************************************************************************************************
-Declares mixin.
-Attributes:
-    class: FQN of mixin
-    bind-to: pointcut where to bind the mixin, optional (can be specified in annotations)
-    deployment-model: mixin life cycle, defaults to perInstance
-    transient: true | false, defaults to false, to control mixin persistence alongside target instances
-    factory: FQN of MixinFactory, implements org.codehaus.aspectwerkz.aspect.MixinFactory, defaults to regular DefaultMixinFactory
-    TODO nested pc + package support ??
-Elements:
-    param: name value pairs
-******************************************************************************************************************************-->
-<!ELEMENT mixin (param*)>
-<!ATTLIST mixin
-class CDATA #REQUIRED
-bind-to CDATA #IMPLIED
-deployment-model (perClass | perInstance | perJVM) #IMPLIED
-transient (false | true) #IMPLIED
-factory CDATA #IMPLIED
->
diff --git a/lib/atmosphere-compat-0.3.jar b/lib/atmosphere-compat-0.3.jar
deleted file mode 100644
index edf4424071..0000000000
Binary files a/lib/atmosphere-compat-0.3.jar and /dev/null differ
diff --git a/lib/atmosphere-core-0.3.jar b/lib/atmosphere-core-0.3.jar
deleted file mode 100644
index aef71c00ba..0000000000
Binary files a/lib/atmosphere-core-0.3.jar and /dev/null differ
diff --git a/lib/atmosphere-portable-runtime-0.3.jar b/lib/atmosphere-portable-runtime-0.3.jar
deleted file mode 100644
index 19875c8c51..0000000000
Binary files a/lib/atmosphere-portable-runtime-0.3.jar and /dev/null differ
diff --git a/lib/camel-core-2.0-SNAPSHOT.jar b/lib/camel-core-2.0-SNAPSHOT.jar
deleted file mode 100644
index 61b8015a70..0000000000
Binary files a/lib/camel-core-2.0-SNAPSHOT.jar and /dev/null differ
diff --git a/lib/cassandra-0.4.0-trunk.jar b/lib/cassandra-0.4.0-trunk.jar
deleted file mode 100755
index 44796086be..0000000000
Binary files a/lib/cassandra-0.4.0-trunk.jar and /dev/null differ
diff --git a/lib/cglib-2.2.jar b/lib/cglib-2.2.jar
deleted file mode 100644
index 084ef6e54b..0000000000
Binary files a/lib/cglib-2.2.jar and /dev/null differ
diff --git a/lib/commons-cli-1.1.jar b/lib/commons-cli-1.1.jar
deleted file mode 100644
index e633afbe68..0000000000
Binary files a/lib/commons-cli-1.1.jar and /dev/null differ
diff --git a/lib/commons-io-1.3.2.jar b/lib/commons-io-1.3.2.jar
deleted file mode 100644
index 865c9e41ce..0000000000
Binary files a/lib/commons-io-1.3.2.jar and /dev/null differ
diff --git a/lib/commons-logging-1.0.4.jar b/lib/commons-logging-1.0.4.jar
deleted file mode 100644
index b73a80fab6..0000000000
Binary files a/lib/commons-logging-1.0.4.jar and /dev/null differ
diff --git a/lib/commons-math-1.1.jar b/lib/commons-math-1.1.jar
deleted file mode 100644
index 6888813fc1..0000000000
Binary files a/lib/commons-math-1.1.jar and /dev/null differ
diff --git a/lib/commons-pool-1.5.1.jar b/lib/commons-pool-1.5.1.jar
deleted file mode 100755
index c3ff84cfb8..0000000000
Binary files a/lib/commons-pool-1.5.1.jar and /dev/null differ
diff --git a/lib/configgy-1.3.jar b/lib/configgy-1.3.jar
deleted file mode 100644
index ebbaea502e..0000000000
Binary files a/lib/configgy-1.3.jar and /dev/null differ
diff --git a/lib/fscontext.jar b/lib/fscontext.jar
deleted file mode 100644
index 0efc25071a..0000000000
Binary files a/lib/fscontext.jar and /dev/null differ
diff --git a/lib/google-collect-snapshot-20090211.jar b/lib/google-collect-snapshot-20090211.jar
deleted file mode 100644
index f5281988e9..0000000000
Binary files a/lib/google-collect-snapshot-20090211.jar and /dev/null differ
diff --git a/lib/grizzly-comet-webserver-1.8.6.3.jar b/lib/grizzly-comet-webserver-1.8.6.3.jar
deleted file mode 100644
index 965c623bac..0000000000
Binary files a/lib/grizzly-comet-webserver-1.8.6.3.jar and /dev/null differ
diff --git a/lib/guice-core-2.0-SNAPSHOT.jar b/lib/guice-core-2.0-SNAPSHOT.jar
deleted file mode 100644
index 2acfd950fa..0000000000
Binary files a/lib/guice-core-2.0-SNAPSHOT.jar and /dev/null differ
diff --git a/lib/jackson-core-asl-1.1.0.jar b/lib/jackson-core-asl-1.1.0.jar
deleted file mode 100644
index 6b561dd2be..0000000000
Binary files a/lib/jackson-core-asl-1.1.0.jar and /dev/null differ
diff --git a/lib/jackson-mapper-asl-1.1.0.jar b/lib/jackson-mapper-asl-1.1.0.jar
deleted file mode 100644
index 1b37ad3772..0000000000
Binary files a/lib/jackson-mapper-asl-1.1.0.jar and /dev/null differ
diff --git a/lib/javautils-2.7.4-0.1.jar b/lib/javautils-2.7.4-0.1.jar
deleted file mode 100644
index a0c51bf7da..0000000000
Binary files a/lib/javautils-2.7.4-0.1.jar and /dev/null differ
diff --git a/lib/jersey-core-1.1.1-ea.jar b/lib/jersey-core-1.1.1-ea.jar
deleted file mode 100644
index d269d80aa7..0000000000
Binary files a/lib/jersey-core-1.1.1-ea.jar and /dev/null differ
diff --git a/lib/jersey-json-1.1.1-ea.jar b/lib/jersey-json-1.1.1-ea.jar
deleted file mode 100644
index ed88d9cde7..0000000000
Binary files a/lib/jersey-json-1.1.1-ea.jar and /dev/null differ
diff --git a/lib/jersey-scala-1.1.2-ea-SNAPSHOT.jar b/lib/jersey-scala-1.1.2-ea-SNAPSHOT.jar
deleted file mode 100644
index a24bb19a7d..0000000000
Binary files a/lib/jersey-scala-1.1.2-ea-SNAPSHOT.jar and /dev/null differ
diff --git a/lib/jersey-server-1.1.1-ea.jar b/lib/jersey-server-1.1.1-ea.jar
deleted file mode 100644
index ed5654e9d5..0000000000
Binary files a/lib/jersey-server-1.1.1-ea.jar and /dev/null differ
diff --git a/lib/jsr311-api-1.0.jar b/lib/jsr311-api-1.0.jar
deleted file mode 100644
index 2bede66c1f..0000000000
Binary files a/lib/jsr311-api-1.0.jar and /dev/null differ
diff --git a/lib/libfb303.jar b/lib/libfb303.jar
deleted file mode 100644
index 129328deff..0000000000
Binary files a/lib/libfb303.jar and /dev/null differ
diff --git a/lib/libthrift.jar b/lib/libthrift.jar
deleted file mode 100644
index 9782f261ae..0000000000
Binary files a/lib/libthrift.jar and /dev/null differ
diff --git a/lib/log4j-1.2.15.jar b/lib/log4j-1.2.15.jar
deleted file mode 100644
index c930a6ab4d..0000000000
Binary files a/lib/log4j-1.2.15.jar and /dev/null differ
diff --git a/lib/netty-3.1.0.GA.jar b/lib/netty-3.1.0.GA.jar
deleted file mode 100644
index 94c9b24902..0000000000
Binary files a/lib/netty-3.1.0.GA.jar and /dev/null differ
diff --git a/lib/protobuf-java-2.1.0.jar b/lib/protobuf-java-2.1.0.jar
deleted file mode 100644
index 961d55122a..0000000000
Binary files a/lib/protobuf-java-2.1.0.jar and /dev/null differ
diff --git a/lib/providerutil.jar b/lib/providerutil.jar
deleted file mode 100644
index 0d6e48f388..0000000000
Binary files a/lib/providerutil.jar and /dev/null differ
diff --git a/lib/sbinary-0.3.jar b/lib/sbinary-0.3.jar
deleted file mode 100644
index e7839cfb24..0000000000
Binary files a/lib/sbinary-0.3.jar and /dev/null differ
diff --git a/lib/scala-json-1.0.jar b/lib/scala-json-1.0.jar
deleted file mode 100644
index df0ec2eaa6..0000000000
Binary files a/lib/scala-json-1.0.jar and /dev/null differ
diff --git a/lib/scala-library-2.7.5.jar b/lib/scala-library-2.7.5.jar
deleted file mode 100644
index 07d2e1381a..0000000000
Binary files a/lib/scala-library-2.7.5.jar and /dev/null differ
diff --git a/lib/scala-stats-1.0.jar b/lib/scala-stats-1.0.jar
deleted file mode 100644
index 6b1b43bf7b..0000000000
Binary files a/lib/scala-stats-1.0.jar and /dev/null differ
diff --git a/lib/servlet-api-2.5.jar b/lib/servlet-api-2.5.jar
deleted file mode 100644
index fb52493468..0000000000
Binary files a/lib/servlet-api-2.5.jar and /dev/null differ
diff --git a/lib/slf4j-api-1.4.3.jar b/lib/slf4j-api-1.4.3.jar
deleted file mode 100644
index ec7050cec3..0000000000
Binary files a/lib/slf4j-api-1.4.3.jar and /dev/null differ
diff --git a/lib/slf4j-log4j12-1.4.3.jar b/lib/slf4j-log4j12-1.4.3.jar
deleted file mode 100644
index c8466de59b..0000000000
Binary files a/lib/slf4j-log4j12-1.4.3.jar and /dev/null differ
diff --git a/lib/zookeeper-3.1.0.jar b/lib/zookeeper-3.1.0.jar
deleted file mode 100644
index b7e639e63a..0000000000
Binary files a/lib/zookeeper-3.1.0.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
index 98f19bd07b..0a100b4187 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,7 +195,7 @@
             <jvmArg>-Xmx1024m</jvmArg>
           </jvmArgs>
           <args>
-            <!-- arg>-unchecked</arg -->
+            <arg>-unchecked</arg>
             <arg>-deprecation</arg>
             <arg>-Xno-varargs-conversion</arg>
           </args>