diff --git a/rm-server/config/readme.txt b/rm-server/config/readme.txt
deleted file mode 100644
index 4659be670f..0000000000
--- a/rm-server/config/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Files in this directory will be added to the amp.
\ No newline at end of file
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 2116606b80..cd4ef75b7e 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -4,182 +4,204 @@
 
 <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>
-  <parent>
-    <groupId>org.alfresco</groupId>
-    <artifactId>alfresco-rm-parent</artifactId>
-    <version>2.2-SNAPSHOT</version>
-  </parent>
-  <artifactId>alfresco-rm</artifactId>
-  <name>Alfresco RM</name>
-
-  <dependencies>
-    <dependency>
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
       <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-remote-api</artifactId>
-      <version>${alfresco.base.version}</version>
-    </dependency>
-
-    <!-- 'config' dependencies -->
-    <dependency>
-      <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-data-model</artifactId>
-      <version>${alfresco.base.version}</version>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-repository</artifactId>
-      <version>${alfresco.base.version}</version>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-remote-api</artifactId>
-      <version>${alfresco.base.version}</version>
-      <classifier>config</classifier>
-    </dependency>
-
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.extensions.surf</groupId>
-      <artifactId>spring-webscripts</artifactId>
-      <version>1.2.0</version>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>2.5</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-repository</artifactId>
-      <version>${alfresco.base.version}</version>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-remote-api</artifactId>
-      <version>${alfresco.base.version}</version>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.chemistry</groupId>
-      <artifactId>chemistry-tck-atompub</artifactId>
-      <version>0.1-incubating-unreleased</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- Database drivers -->
-    <dependency>
-      <groupId>postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>9.1-901.jdbc4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.14</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <!-- Additional source folder to be added: source/compatibility -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
+      <artifactId>alfresco-rm-parent</artifactId>
+      <version>2.2-SNAPSHOT</version>
+   </parent>
+   <artifactId>alfresco-rm</artifactId>
+   <name>Alfresco RM</name>
+   <properties>
+      <app.filtering.enabled>true</app.filtering.enabled>
+      <maven.alfresco.version>1.1.1</maven.alfresco.version>
+   </properties>
+   <build>
+      <resources>
+         <resource>
+            <directory>config</directory>
+            <targetPath>../${project.build.finalName}/config</targetPath>
+            <filtering>${app.filtering.enabled}</filtering>
+            <excludes>
+               <exclude>alfresco/extension/dev-context.xml</exclude>
+            </excludes>
+         </resource>
+         <resource>
+            <directory>config/alfresco/module/org_alfresco_module_rm</directory>
+            <targetPath>../${project.build.finalName}</targetPath>
+            <includes>
+               <include>module.properties</include>
+            </includes>
+            <filtering>${app.filtering.enabled}</filtering>
+         </resource>
+      </resources>
+      <plugins>
+         <!-- Additional source folder to be added: source/compatibility -->
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                   <id>add-source</id>
+                   <goals>
+                      <goal>add-source</goal>
+                   </goals>
+                   <configuration>
+                       <sources>
+                          <source>source/compatibility</source>
+                       </sources>
+                   </configuration>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <sources>
-                <source>source/compatibility</source>
-              </sources>
+               <includes>
+                  <include>**/AllTestSuite.class</include>
+               </includes>
             </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/AllTestSuite.class</include>
-          </includes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-       <profile>
-           <id>wipeDB</id>
-           <build>
-               <plugins>
-                   <!-- Wipe the database before starting tests -->
-                   <plugin>
-                       <groupId>org.codehaus.mojo</groupId>
-                       <artifactId>sql-maven-plugin</artifactId>
+         </plugin>
+         <plugin>
+            <groupId>org.alfresco.maven.plugin</groupId>
+            <artifactId>alfresco-maven-plugin</artifactId>
+            <version>${maven.alfresco.version}</version>
+            <extensions>true</extensions>
+         </plugin>
+      </plugins>
+   </build>
+   <profiles>
+      <profile>
+         <id>wipeDB</id>
+         <build>
+            <plugins>
+               <!-- Wipe the database before starting tests -->
+               <plugin>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <artifactId>sql-maven-plugin</artifactId>
+                  <configuration>
+                     <autocommit>true</autocommit>
+                     <driver>${db.driver}</driver>
+                     <url>${db.master.url}</url>
+                     <username>${db.username}</username>
+                     <password>${db.password}</password>
+                  </configuration>
+                  <dependencies>
+                     <dependency>
+                        <groupId>postgresql</groupId>
+                        <artifactId>postgresql</artifactId>
+                        <version>9.1-901.jdbc4</version>
+                     </dependency>
+                     <dependency>
+                        <groupId>mysql</groupId>
+                        <artifactId>mysql-connector-java</artifactId>
+                        <version>5.1.14</version>
+                     </dependency>
+                  </dependencies>
+                  <executions>
+                     <execution>
+                        <id>wipe-database</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                           <goal>execute</goal>
+                        </goals>
                         <configuration>
-                            <autocommit>true</autocommit>
-                            <driver>${db.driver}</driver>
-                            <url>${db.master.url}</url>
-                            <username>${db.username}</username>
-                            <password>${db.password}</password>
+                           <sqlCommand>drop database if exists alfresco</sqlCommand>
                         </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>postgresql</groupId>
-                                <artifactId>postgresql</artifactId>
-                                <version>9.1-901.jdbc4</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>mysql</groupId>
-                                <artifactId>mysql-connector-java</artifactId>
-                                <version>5.1.14</version>
-                            </dependency>
-                        </dependencies>
-                       <executions>
-                           <execution>
-                               <id>wipe-database</id>
-                               <phase>process-test-resources</phase>
-                               <goals>
-                                   <goal>execute</goal>
-                               </goals>
-                               <configuration>
-                                   <sqlCommand>drop database if exists alfresco</sqlCommand>
-                               </configuration>
-                           </execution>
-                           <execution>
-                               <id>create-database</id>
-                               <phase>process-test-resources</phase>
-                               <goals>
-                                   <goal>execute</goal>
-                               </goals>
-                               <configuration>
-                                   <sqlCommand>create database alfresco</sqlCommand>
-                               </configuration>
-                           </execution>
-                       </executions>
-                   </plugin>
-               </plugins>
-           </build>
-       </profile>
-  </profiles>
-
-</project>
+                     </execution>
+                     <execution>
+                        <id>create-database</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                           <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                           <sqlCommand>create database alfresco</sqlCommand>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
+   <dependencies>
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco-remote-api</artifactId>
+         <version>${alfresco.base.version}</version>
+      </dependency>
+      <!-- 'config' dependencies -->
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco-data-model</artifactId>
+         <version>${alfresco.base.version}</version>
+         <classifier>config</classifier>
+      </dependency>
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco-repository</artifactId>
+         <version>${alfresco.base.version}</version>
+         <classifier>config</classifier>
+      </dependency>
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco-remote-api</artifactId>
+         <version>${alfresco.base.version}</version>
+         <classifier>config</classifier>
+      </dependency>
+      <!-- Test dependencies -->
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>4.11</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.springframework.extensions.surf</groupId>
+         <artifactId>spring-webscripts</artifactId>
+         <version>1.2.0</version>
+         <classifier>tests</classifier>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.springframework</groupId>
+         <artifactId>spring-test</artifactId>
+         <version>2.5</version>
+         <scope>test</scope>
+       </dependency>
+       <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco-repository</artifactId>
+         <version>${alfresco.base.version}</version>
+         <classifier>tests</classifier>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>alfresco-remote-api</artifactId>
+         <version>${alfresco.base.version}</version>
+         <classifier>tests</classifier>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.chemistry</groupId>
+         <artifactId>chemistry-tck-atompub</artifactId>
+         <version>0.1-incubating-unreleased</version>
+         <scope>test</scope>
+      </dependency>
+      <!-- Database drivers -->
+      <dependency>
+         <groupId>postgresql</groupId>
+         <artifactId>postgresql</artifactId>
+         <version>9.1-901.jdbc4</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>mysql</groupId>
+         <artifactId>mysql-connector-java</artifactId>
+         <version>5.1.14</version>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
+</project>
\ No newline at end of file