diff --git a/pom.xml b/pom.xml
index 8e861e21bb..258a11f4b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,285 +7,287 @@
 <!-- ** against Alfresco with Maven. POMs, dependencies and ** -->
 <!-- ** projects information are up to date and released    ** -->
 <!-- ** together with the official Alfresco artifacts at    ** -->
-<!---**          https://artifacts.alfresco.com.            ** -->  
+<!---**          https://artifacts.alfresco.com.            ** -->
 <!---** Fox the SDK and Maven project samples check         ** -->
-<!---** http://code.google.com/p/maven-alfresco-archetypes/ ** -->  
+<!---** http://code.google.com/p/maven-alfresco-archetypes/ ** -->
 <!-- ********************************************************* -->
 <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.alfresco</groupId>
-  <artifactId>alfresco-rm-parent</artifactId>
-  <packaging>pom</packaging>
-  <version>2.2-SNAPSHOT</version>
-  <name>Alfresco Records Management</name>
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>org.alfresco</groupId>
+   <artifactId>alfresco-rm-parent</artifactId>
+   <packaging>pom</packaging>
+   <version>2.2-SNAPSHOT</version>
+   <name>Alfresco Records Management</name>
 
-  <url>http://www.alfresco.org/</url>
-  <inceptionYear>2005</inceptionYear>
-  <organization>
-    <name>Alfresco Software</name>
-    <url>http://www.alfresco.org/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>LGPL 3</name>
-    </license>
-  </licenses>
-  <scm>
-    <connection>https://svn.alfresco.com/repos/alfresco-open-mirror/modules/recordsmanagement/HEAD</connection>
-    <developerConnection>https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD</developerConnection>
-  </scm>
-  <issueManagement>
-    <system>JIRA</system>
-    <url>https://issues.alfresco.com/jira/browse/RM</url>
-  </issueManagement>
-  <ciManagement>
-    <system>Bamboo</system>
-    <url>https://bamboo.alfresco.com/bamboo/browse/RM</url>
-  </ciManagement>
+   <url>http://www.alfresco.org/</url>
+   <inceptionYear>2005</inceptionYear>
+   <organization>
+      <name>Alfresco Software</name>
+      <url>http://www.alfresco.org/</url>
+   </organization>
+   <licenses>
+      <license>
+         <name>LGPL 3</name>
+      </license>
+   </licenses>
+   <scm>
+      <connection>https://svn.alfresco.com/repos/alfresco-open-mirror/modules/recordsmanagement/HEAD</connection>
+      <developerConnection>https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD</developerConnection>
+   </scm>
+   <issueManagement>
+      <system>JIRA</system>
+      <url>https://issues.alfresco.com/jira/browse/RM</url>
+   </issueManagement>
+   <ciManagement>
+      <system>Bamboo</system>
+      <url>https://bamboo.alfresco.com/bamboo/browse/RM</url>
+   </ciManagement>
 
-  <prerequisites>
-    <maven>3.0.3</maven>
-  </prerequisites>
+   <prerequisites>
+      <maven>3.0.3</maven>
+   </prerequisites>
 
-  <repositories>
-    <!-- Pointing to Alfresco repository group. Value is switched between community and enterprise -->
-    <repository>
-      <id>alfresco-public</id>
-      <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
-    </repository>
-  </repositories>
+   <repositories>
+      <!-- Pointing to Alfresco repository group. Value is switched between community and enterprise -->
+      <repository>
+         <id>alfresco-public</id>
+         <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+      </repository>
+   </repositories>
 
-  <distributionManagement>
+   <distributionManagement>
       <!-- For now internal releases repositories -->
       <repository>
-          <id>alfresco-internal</id>
-          <url>https://artifacts.alfresco.com/nexus/content/repositories/internal-releases/</url>
+         <id>alfresco-internal</id>
+         <url>https://artifacts.alfresco.com/nexus/content/repositories/internal-releases/</url>
       </repository>
       <!-- For now internal snapshot repositories -->
       <snapshotRepository>
-          <id>alfresco-internal-snapshots</id>
-          <url>https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots/</url>
-      </snapshotRepository>      
+         <id>alfresco-internal-snapshots</id>
+         <url>https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots/</url>
+      </snapshotRepository>
       <site>
-          <id>alfresco-site</id>
-          <name>Alfresco Maven site</name>
-          <url>http://localhost/</url>
-      </site>      
-  </distributionManagement>
+         <id>alfresco-site</id>
+         <name>Alfresco Maven site</name>
+         <url>http://localhost/</url>
+      </site>
+   </distributionManagement>
 
-  <modules>
-    <module>rm-server</module>
-    <module>rm-share</module>
-  </modules>
+   <modules>
+      <module>rm-server</module>
+      <module>rm-share</module>
+   </modules>
 
-  <properties>
-    <alfresco.base.version>4.2.0</alfresco.base.version>
+   <properties>
+      <alfresco.base.version>4.2.0</alfresco.base.version>
 
-    <!-- Database properties - default values to be overridden in settings.xml -->
-    <db.driver>org.postgresql.Driver</db.driver>
-    <db.name>alfresco</db.name>
-    <db.url>jdbc:postgresql:${db.name}</db.url>
-    <db.master.url>jdbc:postgresql:template1</db.master.url>
-    <db.username>alfresco</db.username>
-    <db.password>alfresco</db.password>
+      <!-- Database properties - default values to be overridden in settings.xml -->
+      <db.driver>org.postgresql.Driver</db.driver>
+      <db.name>alfresco</db.name>
+      <db.url>jdbc:postgresql:${db.name}</db.url>
+      <db.master.url>jdbc:postgresql:template1</db.master.url>
+      <db.username>alfresco</db.username>
+      <db.password>alfresco</db.password>
 
-    <!-- Maven specific build properties -->
-    <maven.build.sourceVersion>1.7</maven.build.sourceVersion>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <!-- Maven specific build properties -->
+      <maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies>
+      <maven.alfresco.version>1.1.1</maven.alfresco.version>
+      <maven.build.sourceVersion>1.7</maven.build.sourceVersion>
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <!-- Sonar specific properties -->
-    <sonar.jacoco.reportPath>${project.build.directory}/jacoco.exec</sonar.jacoco.reportPath>
-  </properties>
+      <!-- Sonar specific properties -->
+      <sonar.jacoco.reportPath>${project.build.directory}/jacoco.exec</sonar.jacoco.reportPath>
+   </properties>
 
-  <build>                  
-    <!-- Non standard folder layout -->
-    <sourceDirectory>source/java</sourceDirectory>
-    <testSourceDirectory>test/java</testSourceDirectory>
-    <resources>
-        <resource>
+   <build>
+      <!-- Non standard folder layout -->
+      <sourceDirectory>source/java</sourceDirectory>
+      <testSourceDirectory>test/java</testSourceDirectory>
+      <resources>
+         <resource>
             <directory>config</directory>
-        </resource>
-    </resources>
-    <testResources>
-        <testResource>
-             <directory>test/resources</directory> 
-        </testResource>
-    </testResources>
+         </resource>
+      </resources>
+      <testResources>
+         <testResource>
+            <directory>test/resources</directory>
+         </testResource>
+      </testResources>
 
-	<plugins>
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-enforcer-plugin</artifactId>
-			<version>1.3.1</version>
-			<executions>
-				<execution>
-					<id>enforce-java</id>
-					<goals>
-						<goal>enforce</goal>
-					</goals>
-					<configuration>
-						<rules>
-							<requireJavaVersion>
-								<version>1.7.0</version>
-							</requireJavaVersion>
-						</rules>
-					</configuration>
-				</execution>
-			</executions>
-		</plugin>
-	</plugins>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>1.3.1</version>
+            <executions>
+               <execution>
+                  <id>enforce-java</id>
+                  <goals>
+                     <goal>enforce</goal>
+                  </goals>
+                  <configuration>
+                     <rules>
+                        <requireJavaVersion>
+                           <version>1.7.0</version>
+                        </requireJavaVersion>
+                     </rules>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
 
-    <!-- Defining version and some configuration of Maven plugins -->
-    <pluginManagement>
-        <plugins>
+      <!-- Defining version and some configuration of Maven plugins -->
+      <pluginManagement>
+         <plugins>
             <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>2.5</version>
+               <artifactId>maven-clean-plugin</artifactId>
+               <version>2.5</version>
             </plugin>
             <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>${maven.build.sourceVersion}</source>
-                    <target>${maven.build.sourceVersion}</target>
-                </configuration>        
+               <artifactId>maven-compiler-plugin</artifactId>
+               <version>3.1</version>
+               <configuration>
+                  <source>${maven.build.sourceVersion}</source>
+                  <target>${maven.build.sourceVersion}</target>
+               </configuration>
             </plugin>
             <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.7</version>
+               <artifactId>maven-deploy-plugin</artifactId>
+               <version>2.7</version>
             </plugin>
             <plugin>
-                <artifactId>maven-install-plugin</artifactId>
-                <version>2.5</version>
+               <artifactId>maven-install-plugin</artifactId>
+               <version>2.5</version>
             </plugin>
             <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
+               <artifactId>maven-resources-plugin</artifactId>
+               <version>2.6</version>
             </plugin>
             <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.3</version>
+               <artifactId>maven-site-plugin</artifactId>
+               <version>3.3</version>
             </plugin>
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4</version>
+               <artifactId>maven-assembly-plugin</artifactId>
+               <version>2.4</version>
             </plugin>
             <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.8</version>
+               <artifactId>maven-dependency-plugin</artifactId>
+               <version>2.8</version>
             </plugin>
             <plugin>
-                <artifactId>maven-help-plugin</artifactId>
-                <version>2.2</version>
+               <artifactId>maven-help-plugin</artifactId>
+               <version>2.2</version>
             </plugin>
             <plugin>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.4.1</version>
+               <artifactId>maven-release-plugin</artifactId>
+               <version>2.4.1</version>
             </plugin>
             <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
+               <artifactId>maven-source-plugin</artifactId>
+               <version>2.2.1</version>
             </plugin>
             <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.16</version>
+               <artifactId>maven-failsafe-plugin</artifactId>
+               <version>2.16</version>
             </plugin>
             <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.16</version>
-                <configuration>
-                    <!-- To prevent tests alfresco.log to be created in project roots and bother while synchronizing with SCM -->
-                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                    <runOrder>alphabetical</runOrder>
-                    <argLine>-Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
-                    <systemPropertyVariables>
-                        <!-- Database related properties -->
-                        <db.url>${db.url}</db.url>
-                        <db.driver>${db.driver}</db.driver>
-                        <db.name>${db.name}</db.name>
-                        <db.username>${db.username}</db.username>
-                        <db.password>${db.password}</db.password>
-                        <dir.root>${basedir}/target/alf_test_data</dir.root>
-                    </systemPropertyVariables>
-                </configuration>
+               <artifactId>maven-surefire-plugin</artifactId>
+               <version>2.16</version>
+               <configuration>
+                  <!-- To prevent tests alfresco.log to be created in project roots and bother while synchronizing with SCM -->
+                  <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                  <runOrder>alphabetical</runOrder>
+                  <argLine>-Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
+                  <systemPropertyVariables>
+                     <!-- Database related properties -->
+                     <db.url>${db.url}</db.url>
+                     <db.driver>${db.driver}</db.driver>
+                     <db.name>${db.name}</db.name>
+                     <db.username>${db.username}</db.username>
+                     <db.password>${db.password}</db.password>
+                     <dir.root>${basedir}/target/alf_test_data</dir.root>
+                  </systemPropertyVariables>
+               </configuration>
             </plugin>
             <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.9.1</version>
+               <artifactId>maven-javadoc-plugin</artifactId>
+               <version>2.9.1</version>
             </plugin>
             <plugin>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <version>2.9</version>
+               <artifactId>maven-eclipse-plugin</artifactId>
+               <version>2.9</version>
             </plugin>
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
+               <artifactId>maven-antrun-plugin</artifactId>
+               <version>1.7</version>
             </plugin>
             <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
+               <artifactId>maven-jar-plugin</artifactId>
+               <version>2.4</version>
             </plugin>
             <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <warSourceDirectory>source/web</warSourceDirectory>
-                    <useCache>true</useCache>
-                </configuration>
+               <artifactId>maven-war-plugin</artifactId>
+               <version>2.4</version>
+               <configuration>
+                  <warSourceDirectory>source/web</warSourceDirectory>
+                  <useCache>true</useCache>
+               </configuration>
             </plugin>
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>8.1.13.v20130916</version>
-                <configuration>
-                    <webAppSourceDirectory>source/web</webAppSourceDirectory>
-                </configuration>
+               <groupId>org.mortbay.jetty</groupId>
+               <artifactId>jetty-maven-plugin</artifactId>
+               <version>8.1.13.v20130916</version>
+               <configuration>
+                  <webAppSourceDirectory>source/web</webAppSourceDirectory>
+               </configuration>
             </plugin>
             <plugin>
-                <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat7-maven-plugin</artifactId>
-                <version>2.1</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.codehaus.plexus</groupId>
-                        <artifactId>plexus-archiver</artifactId>
-                        <version>2.3</version>
-                    </dependency>
-                </dependencies>
+               <groupId>org.apache.tomcat.maven</groupId>
+               <artifactId>tomcat7-maven-plugin</artifactId>
+               <version>2.1</version>
+               <dependencies>
+                  <dependency>
+                     <groupId>org.codehaus.plexus</groupId>
+                     <artifactId>plexus-archiver</artifactId>
+                     <version>2.3</version>
+                  </dependency>
+               </dependencies>
             </plugin>
             <plugin>
-                <groupId>org.antlr</groupId>
-                <artifactId>antlr3-maven-plugin</artifactId>
-                <version>${dependency.antlr.version}</version>
+               <groupId>org.antlr</groupId>
+               <artifactId>antlr3-maven-plugin</artifactId>
+               <version>${dependency.antlr.version}</version>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sql-maven-plugin</artifactId>
-                <version>1.5</version>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>sql-maven-plugin</artifactId>
+               <version>1.5</version>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>rpm-maven-plugin</artifactId>
-                <version>2.1-alpha-3</version>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>rpm-maven-plugin</artifactId>
+               <version>2.1-alpha-3</version>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>versions-maven-plugin</artifactId>
-                <version>2.1</version>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>versions-maven-plugin</artifactId>
+               <version>2.1</version>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.8</version>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>build-helper-maven-plugin</artifactId>
+               <version>1.8</version>
             </plugin>
-			<plugin>
-				<groupId>com.google.code.maven-replacer-plugin</groupId>
-				<artifactId>replacer</artifactId>
-				<version>1.5.2</version>
-			</plugin>
-        </plugins>
-    </pluginManagement>
-  </build>
+            <plugin>
+               <groupId>com.google.code.maven-replacer-plugin</groupId>
+               <artifactId>replacer</artifactId>
+               <version>1.5.2</version>
+            </plugin>
+         </plugins>
+      </pluginManagement>
+   </build>
 
 </project>
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index c921b8e0f8..b377d52369 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -1,21 +1,14 @@
-<!-- ****************************************************** -->
-<!-- ** Experimental Maven build - use at your own risk! ** -->
-<!-- ****************************************************** -->
-
-<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>
+<?xml version="1.0"?><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">
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm-parent</artifactId>
       <version>2.2-SNAPSHOT</version>
    </parent>
-   <artifactId>rm-server</artifactId>
-   <name>Alfresco RM</name>
-   <properties>
-      <app.filtering.enabled>true</app.filtering.enabled>
-      <maven.alfresco.version>1.1.1</maven.alfresco.version>
-   </properties>
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>alfresco-rm-server</artifactId>
+   <name>Alfresco RM Server</name>
    <build>
       <resources>
          <resource>
@@ -67,6 +60,29 @@
             <artifactId>alfresco-maven-plugin</artifactId>
             <version>${maven.alfresco.version}</version>
             <extensions>true</extensions>
+            <configuration>
+               <backup>true</backup>
+               <ampLocation>${project.build.directory}/${project.build.finalName}.amp</ampLocation>
+               <!-- FIXME -->
+               <warLocation>${project.build.directory}/../../../software/tomcat/webapps/alfresco.war</warLocation>
+            </configuration>
+         </plugin>
+         <plugin>
+            <artifactId>maven-war-plugin</artifactId>
+            <configuration>
+               <overlays>
+                  <overlay>
+                     <groupId>org.alfresco</groupId>
+                     <artifactId>alfresco</artifactId>
+                     <type>war</type>
+                  </overlay>
+                  <overlay>
+                     <groupId>org.alfresco</groupId>
+                     <artifactId>alfresco-rm-server</artifactId>
+                     <type>amp</type>
+                  </overlay>
+               </overlays>
+            </configuration>
          </plugin>
       </plugins>
    </build>
@@ -126,6 +142,12 @@
       </profile>
    </profiles>
    <dependencies>
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco</artifactId>
+         <version>${alfresco.base.version}</version>
+         <type>war</type>
+      </dependency>
       <dependency>
          <groupId>org.alfresco</groupId>
          <artifactId>alfresco-remote-api</artifactId>