diff --git a/core/pom.xml b/core/pom.xml
index 1e7119f1..24d15010 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,6 @@
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-oxm</artifactId>
-            <optional>true</optional>
         </dependency>
         <!-- Spring dependencies -->
         <dependency>
diff --git a/full-assembly.sh b/full-assembly.sh
new file mode 100755
index 00000000..8429c981
--- /dev/null
+++ b/full-assembly.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+mvn clean install assembly:assembly -D descriptor=src/assembly/full.xml
diff --git a/pom.xml b/pom.xml
index 53914aaf..f81deb2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,10 +25,11 @@
         </notifiers>
     </ciManagement>
     <distributionManagement>
+        <downloadUrl>http://www.springframework.org/spring-ws</downloadUrl>
         <repository>
-            <id>static.springframework.org</id>
+            <id>local</id>
             <url>
-                scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/maven2
+                file:///Users/arjen/Projects/Spring/repos/repo
             </url>
         </repository>
         <snapshotRepository>
@@ -205,6 +206,7 @@
                         <link>http://www.xom.nu/apidocs/</link>
                         <link>http://acegisecurity.org/multiproject/acegi-security/apidocs/</link>
                         <link>http://www.extreme.indiana.edu/apis/wsdl4j/</link>
+                        <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
                     </links>
                 </configuration>
             </plugin>
@@ -280,6 +282,11 @@
                 <artifactId>spring-context</artifactId>
                 <version>${spring.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-aop</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-web</artifactId>
@@ -395,7 +402,7 @@
             <dependency>
                 <groupId>org.codehaus.castor</groupId>
                 <artifactId>castor</artifactId>
-                <version>1.0.3</version>
+                <version>1.0.5</version>
             </dependency>
             <!-- JAXB -->
             <dependency>