--- a/server/pom.xml	Tue Nov 13 11:46:39 2012 +0100
+++ b/server/pom.xml	Tue Nov 06 13:23:19 2012 +0100
@@ -8,7 +8,10 @@
     <packaging>war</packaging>
 
     <properties>
-        <coweb-version>0.8.3</coweb-version>
+        <coweb-version>0.8.3.1</coweb-version>
+        <jersey-version>1.14</jersey-version>
+        <spring-version>3.1.2.RELEASE</spring-version>
+        <junit.version>4.10</junit.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -52,6 +55,16 @@
                             </excludes>
                             <targetPath>lib</targetPath>
                         </overlay>
+                        <overlay>
+                            <groupId>org.opencoweb.cowebx</groupId>
+                            <artifactId>cowebx-widgets-dojo</artifactId>
+                            <type>war</type>
+                            <excludes>
+                                <exclude>META-INF/**</exclude>
+                                <exclude>WEB-INF/**</exclude>
+                            </excludes>
+                            <targetPath>lib/cowebx/dojo</targetPath>
+                        </overlay>
                     </overlays>
                    <webResources>
                        <resource>
@@ -61,13 +74,42 @@
                                <exclude>**/data</exclude>
                            </excludes>
                        </resource>
+                       <resource>
+                           <directory>src/main/web-resources</directory>
+                       </resource>                       
                    </webResources>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-
+    <repositories>
+        <repository>
+            <id>spring-maven-release</id>
+            <name>Spring Maven Release Repository</name>
+            <url>http://maven.springframework.org/release</url>
+        </repository>
+        <repository>
+            <id>spring-maven-milestone</id>
+            <name>Spring Maven MILESTONE Repository</name>
+            <url>http://maven.springframework.org/milestone</url>
+        </repository>
+    </repositories>
     <dependencies>
+        <dependency>  
+            <groupId>javax.inject</groupId>  
+            <artifactId>javax.inject</artifactId>  
+            <version>1</version>  
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.cometd.java</groupId>
+            <artifactId>cometd-java-annotations</artifactId>
+            <version>2.5.0</version>
+        </dependency>  
         <dependency>
             <groupId>org.opencoweb</groupId>
             <artifactId>coweb-bots</artifactId>
@@ -85,25 +127,91 @@
             <type>war</type>
         </dependency>
         <dependency>
+            <groupId>org.opencoweb.cowebx</groupId>
+            <artifactId>cowebx-widgets-dojo</artifactId>
+            <version>${coweb-version}</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
         	<groupId>com.sun.jersey</groupId>
         	<artifactId>jersey-server</artifactId>
-        	<version>1.13</version>
+        	<version>${jersey-version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-servlet</artifactId>
-            <version>1.13</version>
+            <groupId>com.sun.jersey.contribs</groupId>
+            <artifactId>jersey-spring</artifactId>
+            <version>${jersey-version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
-            <version>2.8.0</version>
+            <version>2.9.0</version>
         </dependency>
         <dependency> 
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <version>1.6.6</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${spring-version}</version>
+        </dependency>        
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring-version}</version>
+        </dependency>        
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons-core</artifactId>
+            <version>1.4.0.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+            <version>1.2.0.RELEASE</version>
+        </dependency> 
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-mongodb</artifactId>
+            <version>1.1.0.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>persistence-api</artifactId>  
+            <version>1.0.2</version>
+        </dependency>
+        <dependency>                          
+            <groupId>junit</groupId>           
+            <artifactId>junit</artifactId>     
+            <version>${junit.version}</version>
+            <scope>test</scope>                
+        </dependency>         
     </dependencies>
     <organization>
     	<name>IRI</name>