diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml
index d1555a43..2f27ad1b 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml
@@ -84,4 +84,62 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <!-- Overrides the run profile to disable securecomms -->
+        <profile>
+            <id>run</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-war-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>prepare-exploded-war</id>
+                                <goals>
+                                    <goal>exploded</goal>
+                                </goals>
+                                <phase>prepare-package</phase>
+                            </execution>
+                            <execution>
+                                <id>default-war</id>
+                                <configuration>
+                                    <webXml>${project.build.directory}/${project.build.finalName}-nossl/WEB-INF/web.xml</webXml>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!-- Replaces web.xml where applicable, commenting out the security-constraints -->
+                    <plugin>
+                        <groupId>com.google.code.maven-replacer-plugin</groupId>
+                        <artifactId>replacer</artifactId>
+                        <executions>
+                            <execution>
+                                <id>disable-securecomms</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>replace</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <ignoreErrors>true</ignoreErrors>
+                            <file>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</file>
+                            <outputDir>${project.build.directory}/${project.build.finalName}-nossl/WEB-INF/</outputDir>
+                            <preserveDir>false</preserveDir>
+                            <replacements>
+                                <replacement>
+                                    <token><![CDATA[<!-- Toggle securecomms placeholder start -->]]></token>
+                                    <value><![CDATA[<!--]]></value>
+                                </replacement>
+                                <replacement>
+                                    <token><![CDATA[<!-- Toggle securecomms placeholder end -->]]></token>
+                                    <value><![CDATA[-->]]></value>
+                                </replacement>
+                            </replacements>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/web.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 4372b3c1..00000000
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,911 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!DOCTYPE web-app PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-  "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-   <display-name>Alfresco Web Client</display-name>
-
-   <description>Alfresco Web Client</description>
-
-   <context-param>
-      <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
-      <param-value>true</param-value>
-   </context-param>
-
-   <context-param>
-      <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-      <param-value>server</param-value>
-   </context-param>
-
-   <context-param>
-      <param-name>javax.faces.PARTIAL_STATE_SAVING_METHOD</param-name>
-      <param-value>false</param-value>
-   </context-param>
-
-   <context-param>
-      <param-name>javax.faces.CONFIG_FILES</param-name>
-      <param-value>/WEB-INF/faces-config-app.xml,/WEB-INF/faces-config-beans.xml,/WEB-INF/faces-config-navigation.xml,/WEB-INF/faces-config-common.xml,/WEB-INF/faces-config-repo.xml,/WEB-INF/faces-config-wcm.xml,/WEB-INF/faces-config-custom.xml</param-value>
-   </context-param>
-
-   <context-param>
-      <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
-      <param-value>true</param-value>
-   </context-param>
-
-   <context-param>
-      <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
-      <param-value>false</param-value>
-      <description>This is an EXPERIMENTAL feature, so leave it off for now!</description>
-   </context-param>
-
-   <context-param>
-      <param-name>org.apache.myfaces.SERIALIZE_STATE_IN_SESSION</param-name>
-      <param-value>false</param-value>
-      <description>Stop MyFaces from Serializing the state to the session</description>
-   </context-param>
-
-    <!-- TODO: Change this to false for production -->
-    <context-param>
-        <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
-        <param-value>true</param-value>
-        <description>
-            If true, rendered HTML code will be formatted, so that it is "human readable".
-            i.e. additional line separators and whitespace will be written, that do not
-            influence the HTML code.
-            Default: "true"
-        </description>
-    </context-param>
-
-    <context-param>
-        <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
-        <param-value>false</param-value>
-        <description>
-            If true, a javascript function will be rendered that is able to restore the
-            former vertical scroll on every request. Convenient feature if you have pages
-            with long lists and you do not want the browser page to always jump to the top
-            if you trigger a link or button action that stays on the same page.
-            Default: "false"
-        </description>
-    </context-param>
-
-   <!-- Spring Application Context location -->
-   <context-param>
-      <param-name>contextConfigLocation</param-name>
-      <param-value>/WEB-INF/web-application-context.xml</param-value>
-      <description>Spring config file location</description>
-   </context-param>
-   
-   <context-param>
-      <param-name>log4jExposeWebAppRoot</param-name>
-      <param-value>false</param-value>
-      <description>Do not try to resolve web app root as file</description>
-   </context-param>
-
-    <!--  These were previously init params for the WebDAV servlet,
-          but since they are also needed to MT-enable the 
-          ExternalAccess servlet, I have made them context wide. -->
-   <context-param>
-         <param-name>store</param-name>
-         <param-value>workspace://SpacesStore</param-value>
-   </context-param>
-   <context-param>
-         <param-name>rootPath</param-name>
-         <param-value>/app:company_home</param-value>
-   </context-param>
-
-   <context-param>
-      <param-name>org.apache.myfaces.ERROR_HANDLING</param-name>
-      <param-value>false</param-value>
-   </context-param>
-   
-   <!-- Activiti context param placeholder -->
-
-   <context-param> 
-      <param-name>com.ibm.ws.jsf.loadExternalDtd</param-name> 
-      <param-value>false</param-value> 
-      <description>Sets "http://apache.org/xml/features/nonvalidating/load-external-dtd" feature on the SAXParser to false if this parameter is false</description> 
-   </context-param>
-   
-   <filter>
-      <filter-name>Authentication Filter</filter-name>
-      <description>Authentication filter mapped only to faces URLs. Other URLs generally use proprietary means to talk to the AuthenticationComponent</description>
-      <filter-class>org.alfresco.repo.web.filter.beans.BeanProxyFilter</filter-class>
-      <init-param>
-         <param-name>beanName</param-name>
-         <param-value>AuthenticationFilter</param-value>
-      </init-param>
-   </filter>
-   
-   <filter>
-      <filter-name>Global Authentication Filter</filter-name>
-      <description>Authentication filter mapped to all authenticated URLs. Mainly for SSO support</description>
-      <filter-class>org.alfresco.repo.web.filter.beans.BeanProxyFilter</filter-class>
-      <init-param>
-         <param-name>beanName</param-name>
-         <param-value>GlobalAuthenticationFilter</param-value>
-      </init-param>
-   </filter>
-
-   <filter>
-      <filter-name>WebScript Authentication Filter</filter-name>
-      <description>Authentication filter mapped to web script URLs. Mainly for SSO support</description>
-      <filter-class>org.alfresco.repo.web.filter.beans.BeanProxyFilter</filter-class>
-      <init-param>
-         <param-name>beanName</param-name>
-         <param-value>WebscriptAuthenticationFilter</param-value>
-      </init-param>
-   </filter>
-   
-   <filter>
-      <filter-name>WebDAV Authentication Filter</filter-name>
-      <filter-class>org.alfresco.repo.web.filter.beans.BeanProxyFilter</filter-class>
-      <init-param>
-         <param-name>beanName</param-name>
-         <param-value>WebDavAuthenticationFilter</param-value>
-      </init-param>
-   </filter>
-
-   <filter>
-      <filter-name>Admin Authentication Filter</filter-name>
-      <filter-class>org.alfresco.web.app.servlet.AdminAuthenticationFilter</filter-class>
-   </filter>
-   
-   <filter>
-      <filter-name>CacheExpiresFilter</filter-name>
-      <description>Set HTTP cache Expires header 30 days forward for a mapping.</description>
-      <filter-class>org.alfresco.web.scripts.servlet.StaticAssetCacheFilter</filter-class>
-      <init-param>
-         <param-name>expires</param-name>
-         <param-value>30</param-value>
-         <description>Add an Expires Header 30 days forward</description>
-      </init-param>
-   </filter>
-
-   <filter>
-      <filter-name>Global Localization Filter</filter-name>
-      <description>Sets fallback default locale for ALL requests</description>
-      <filter-class>org.alfresco.web.app.servlet.GlobalLocalizationFilter</filter-class>
-   </filter>
-
-   <filter>
-      <filter-name>JSF Session Synchronized Filter</filter-name>
-      <filter-class>org.alfresco.repo.web.filter.beans.SessionSynchronizedFilter</filter-class>
-   </filter>
-
-   <filter-mapping>
-      <filter-name>Global Localization Filter</filter-name>
-      <url-pattern>/*</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/navigate/*</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/command/*</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/download/*</url-pattern>
-   </filter-mapping>
-   
-   <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/template/*</url-pattern>
-   </filter-mapping>
-   
-   <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/n/*</url-pattern>
-   </filter-mapping>
-   
-   <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/c/*</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/t/*</url-pattern>
-   </filter-mapping>
-   
-   <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/d/*</url-pattern>
-   </filter-mapping>
-   
-   <!-- The WebScript Authentication filter sits in front of web service URLs in addition to the global authentication filter -->
-   <filter-mapping>
-      <filter-name>WebScript Authentication Filter</filter-name>
-      <url-pattern>/wcservice/*</url-pattern>
-   </filter-mapping>
-   
-   <filter-mapping>
-      <filter-name>WebScript Authentication Filter</filter-name>
-      <url-pattern>/wcs/*</url-pattern>
-   </filter-mapping>
-   
-   <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/wcservice/*</url-pattern>
-   </filter-mapping>
-   
-   <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/wcs/*</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/ajax/*</url-pattern>
-   </filter-mapping>
-   
-   <filter-mapping>
-      <filter-name>Global Authentication Filter</filter-name>
-      <url-pattern>/faces/*</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Authentication Filter</filter-name>
-      <url-pattern>/faces/*</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>WebDAV Authentication Filter</filter-name>
-      <url-pattern>/webdav/*</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Admin Authentication Filter</filter-name>
-      <url-pattern>/faces/jsp/admin/*</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Admin Authentication Filter</filter-name>
-      <url-pattern>/faces/jsp/categories/*</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Admin Authentication Filter</filter-name>
-      <url-pattern>/faces/jsp/groups/*</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Admin Authentication Filter</filter-name>
-      <url-pattern>/faces/jsp/users/delete-user.jsp</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Admin Authentication Filter</filter-name>
-      <url-pattern>/faces/jsp/users/users.jsp</url-pattern>
-   </filter-mapping>
-
-   <filter-mapping>
-      <filter-name>Admin Authentication Filter</filter-name>
-      <url-pattern>/faces/jsp/admin/system-info.jsp</url-pattern>
-   </filter-mapping>
-   
-   <filter-mapping>
-      <filter-name>JSF Session Synchronized Filter</filter-name>
-      <url-pattern>/faces/*</url-pattern>
-   </filter-mapping>
-   
-   <filter-mapping>
-      <filter-name>CacheExpiresFilter</filter-name>
-      <url-pattern>*.jpg</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-      <filter-name>CacheExpiresFilter</filter-name>
-      <url-pattern>*.png</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-      <filter-name>CacheExpiresFilter</filter-name>
-      <url-pattern>*.gif</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-      <filter-name>CacheExpiresFilter</filter-name>
-      <url-pattern>*.css</url-pattern>
-   </filter-mapping>
-   <filter-mapping>
-      <filter-name>CacheExpiresFilter</filter-name>
-      <url-pattern>*.js</url-pattern>
-   </filter-mapping>
-
-   <listener>
-      <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-   </listener>
-
-   <listener>
-      <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-   </listener>
-   
-   <!-- Spring Context Loader listener - can disable loading of context if runtime config changes are needed -->
-   <listener>
-      <listener-class>org.alfresco.web.app.ContextLoaderListener</listener-class>
-   </listener>
-
-   <!-- Web Application Context listener - session create/destroy debugging and bootstrap Spring init -->
-   <listener>
-      <listener-class>org.alfresco.web.app.ContextListener</listener-class>
-   </listener>
-
-   <!-- WebDAV session listener - ensures that no locked resources is left after session expires -->
-   <listener>
-      <listener-class>org.alfresco.repo.webdav.WebDAVSessionListener</listener-class>
-   </listener>
-
-   <!-- Web Services context listener for OpenCMIS -->
-   <listener>
-      <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
-   </listener>
-   
-   <!-- Activiti listener placeholder -->
-
-
-   <!-- Faces Servlet -->
-   <servlet>
-      <servlet-name>Faces Servlet</servlet-name>
-      <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-      <load-on-startup>1</load-on-startup>
-   </servlet>
-
-   <servlet>
-      <servlet-name>uploadFile</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.UploadFileServlet</servlet-class>
-   </servlet>
-
-   <servlet>
-      <servlet-name>uploadContent</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.UploadContentServlet</servlet-class>
-   </servlet>
-
-   <servlet>
-      <servlet-name>downloadContent</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.DownloadContentServlet</servlet-class>
-   </servlet>
-
-   <servlet>
-      <servlet-name>downloadRawContent</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.DownloadRawContentServlet</servlet-class>
-   </servlet>
-
-   <servlet>
-      <servlet-name>guestDownloadContent</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.GuestDownloadContentServlet</servlet-class>
-   </servlet>
-
-   <servlet>
-      <servlet-name>guestTemplateContent</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.GuestTemplateContentServlet</servlet-class>
-   </servlet>
-
-   <servlet>
-      <servlet-name>externalAccess</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.ExternalAccessServlet</servlet-class>
-   </servlet>
-
-   <servlet>
-      <servlet-name>templateContent</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.TemplateContentServlet</servlet-class>
-   </servlet>
-
-   <servlet>
-      <servlet-name>commandServlet</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.CommandServlet</servlet-class>
-   </servlet>
-
-   <servlet>
-      <servlet-name>ajaxServlet</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.ajax.AjaxServlet</servlet-class>
-   </servlet>
-
-   <servlet>
-      <servlet-name>axis</servlet-name>
-      <servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
-      <load-on-startup>5</load-on-startup>
-   </servlet>
-
-   <servlet>
-      <servlet-name>CXFServlet</servlet-name>
-      <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
-      <load-on-startup>6</load-on-startup>
-   </servlet>
-
-   <servlet>
-      <servlet-name>WebDAV</servlet-name>
-      <servlet-class>org.alfresco.repo.webdav.WebDAVServlet</servlet-class>
-      <load-on-startup>5</load-on-startup>
-   </servlet>
-
-   <servlet>
-      <servlet-name>apiServlet</servlet-name>
-      <servlet-class>org.springframework.extensions.webscripts.servlet.WebScriptServlet</servlet-class>
-      <init-param>
-         <param-name>authenticator</param-name>
-         <param-value>webscripts.authenticator.basic</param-value>
-      </init-param>
-   </servlet>
-   
-   <servlet>
-      <servlet-name>wcapiServlet</servlet-name>
-      <servlet-class>org.springframework.extensions.webscripts.servlet.WebScriptServlet</servlet-class>
-      <init-param>
-         <param-name>authenticator</param-name>
-         <param-value>webscripts.authenticator.webclient</param-value>
-      </init-param>
-   </servlet>
-
-   <servlet>
-      <servlet-name>portalapiServlet</servlet-name>
-      <servlet-class>org.springframework.extensions.webscripts.servlet.WebScriptServlet</servlet-class>
-      <init-param>
-         <param-name>authenticator</param-name>
-         <param-value>webscripts.authenticator.webclient</param-value>
-      </init-param>
-   </servlet>
-
-   <servlet>
-      <servlet-name>facebookServlet</servlet-name>
-      <servlet-class>org.alfresco.repo.web.scripts.facebook.FacebookServlet</servlet-class>
-      <init-param>
-         <param-name>authenticator</param-name>
-         <param-value>webscripts.authenticator.facebook</param-value>
-      </init-param>
-   </servlet>
-
-   <servlet>
-      <servlet-name>fbapiServlet</servlet-name>
-      <servlet-class>org.alfresco.repo.web.scripts.facebook.FacebookAPIServlet</servlet-class>
-      <init-param>
-         <param-name>authenticator</param-name>
-         <param-value>webscripts.authenticator.facebook</param-value>
-      </init-param>
-   </servlet>
-
-   <servlet>
-      <servlet-name>proxyServlet</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.HTTPProxyServlet</servlet-class>
-   </servlet>
-
-   <servlet>
-      <servlet-name>workflowDefinitionImageServlet</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.WorkflowDefinitionImageServlet</servlet-class>
-   </servlet>
-
-   <servlet>
-      <servlet-name>JBPMDeployProcessServlet</servlet-name>
-      <servlet-class>org.alfresco.web.app.servlet.JBPMDeployProcessServlet</servlet-class>
-   </servlet>
-
-   <servlet>
-      <servlet-name>CMISFileShareServlet</servlet-name>
-      <servlet-class>org.apache.chemistry.opencmis.browser.BrowseServlet</servlet-class>
-      <init-param>
-         <param-name>auxroot</param-name>
-         <param-value>cmisfs/browser/</param-value>
-      </init-param>
-      <init-param>
-         <param-name>allow</param-name>
-         <param-value>http.*</param-value>
-      </init-param>
-      <init-param>
-         <param-name>stylesheet:application/atomsvc+xml</param-name>
-         <param-value>/cmisfs/stylesheets/service.xsl</param-value>
-      </init-param>
-      <init-param>
-         <param-name>stylesheet:application/atom+xml;type=feed</param-name>
-         <param-value>/cmisfs/stylesheets/feed.xsl</param-value>
-      </init-param>
-      <init-param>
-         <param-name>stylesheet:application/cmistree+xml</param-name>
-         <param-value>/cmisfs/stylesheets/feed.xsl</param-value>
-      </init-param>
-      <init-param>
-         <param-name>stylesheet:application/atom+xml;type=entry</param-name>
-         <param-value>/cmisfs/stylesheets/entry.xsl</param-value>
-      </init-param>
-      <init-param>
-         <param-name>stylesheet:application/cmisallowableactions+xml</param-name>
-         <param-value>/cmisfs/stylesheets/actions.xsl</param-value>
-      </init-param>
-      <init-param>
-         <param-name>stylesheet:application/cmisacl+xml</param-name>
-         <param-value>/cmisfs/stylesheets/acl.xsl</param-value>
-      </init-param>
-      <init-param>
-         <param-name>override-stylesheet:renditions</param-name>
-         <param-value>/cmisfs/stylesheets/renditions.xsl</param-value>
-      </init-param>
-      <init-param>
-         <param-name>override-stylesheet:relationships</param-name>
-         <param-value>/cmisfs/stylesheets/relationships.xsl</param-value>
-      </init-param>
-      <init-param>
-         <param-name>override-stylesheet:thumbnails</param-name>
-         <param-value>/cmisfs/stylesheets/thumbnails.xsl</param-value>
-      </init-param>
-   </servlet>
-
-   <servlet>
-      <servlet-name>cmisws</servlet-name>
-      <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-      <load-on-startup>7</load-on-startup>
-   </servlet>
-
-   <servlet>
-      <servlet-name>cmisatom</servlet-name>
-      <servlet-class>org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet</servlet-class>
-      <init-param>
-         <param-name>callContextHandler</param-name>
-         <param-value>org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler</param-value>
-      </init-param>
-      <load-on-startup>8</load-on-startup>
-   </servlet>
-
-   <servlet>
-      <servlet-name>cmisbrowser</servlet-name>
-      <servlet-class>org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet</servlet-class>
-      <init-param>
-         <param-name>callContextHandler</param-name>
-         <param-value>org.apache.chemistry.opencmis.server.shared.BasicAuthCallContextHandler</param-value>
-      </init-param>
-      <load-on-startup>8</load-on-startup>
-   </servlet>
-
-   <servlet>
-      <servlet-name>cmistck</servlet-name>
-      <servlet-class>org.apache.chemistry.opencmis.tck.runner.WebRunnerServlet</servlet-class>
-      <load-on-startup>8</load-on-startup>
-   </servlet>
-
-   <servlet>
-      <servlet-name>authenticatorServlet</servlet-name>
-      <servlet-class>org.alfresco.repo.web.scripts.servlet.AuthenticatorServlet</servlet-class>
-   </servlet>
-   
-   <!-- Activiti servlet placeholder -->
-    
-   <servlet-mapping>
-      <servlet-name>Faces Servlet</servlet-name>
-      <url-pattern>/faces/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>uploadFile</servlet-name>
-      <url-pattern>/uploadFileServlet</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>uploadContent</servlet-name>
-      <url-pattern>/upload/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>downloadContent</servlet-name>
-      <url-pattern>/download/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>downloadContent</servlet-name>
-      <url-pattern>/d/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>downloadRawContent</servlet-name>
-      <url-pattern>/dr</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>guestDownloadContent</servlet-name>
-      <url-pattern>/guestDownload/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>guestDownloadContent</servlet-name>
-      <url-pattern>/gd/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>templateContent</servlet-name>
-      <url-pattern>/template/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>templateContent</servlet-name>
-      <url-pattern>/t/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>guestTemplateContent</servlet-name>
-      <url-pattern>/guestTemplate/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>guestTemplateContent</servlet-name>
-      <url-pattern>/gt/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>externalAccess</servlet-name>
-      <url-pattern>/navigate/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>externalAccess</servlet-name>
-      <url-pattern>/n/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>commandServlet</servlet-name>
-      <url-pattern>/command/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>commandServlet</servlet-name>
-      <url-pattern>/c/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>ajaxServlet</servlet-name>
-      <url-pattern>/ajax/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>axis</servlet-name>
-      <url-pattern>/api/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>CXFServlet</servlet-name>
-      <url-pattern>/cmis/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-        <servlet-name>WebDAV</servlet-name>
-        <url-pattern>/webdav/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>apiServlet</servlet-name>
-      <url-pattern>/service/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>apiServlet</servlet-name>
-      <url-pattern>/s/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>wcapiServlet</servlet-name>
-      <url-pattern>/wcservice/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>wcapiServlet</servlet-name>
-      <url-pattern>/wcs/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>portalapiServlet</servlet-name>
-      <url-pattern>/168service/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>portalapiServlet</servlet-name>
-      <url-pattern>/168s/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>facebookServlet</servlet-name>
-      <url-pattern>/facebook/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>facebookServlet</servlet-name>
-      <url-pattern>/fb/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>fbapiServlet</servlet-name>
-      <url-pattern>/fbservice/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>fbapiServlet</servlet-name>
-      <url-pattern>/fbs/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>proxyServlet</servlet-name>
-      <url-pattern>/proxy</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>JBPMDeployProcessServlet</servlet-name>
-      <url-pattern>/jbpm/deployprocess</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>workflowDefinitionImageServlet</servlet-name>
-      <url-pattern>/workflowdefinitionimage/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>CMISFileShareServlet</servlet-name>
-      <url-pattern>/cmisbrowse</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>cmisws</servlet-name>
-      <url-pattern>/cmisws/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>cmisatom</servlet-name>
-      <url-pattern>/cmisatom/*</url-pattern>
-   </servlet-mapping>
-
-   <servlet-mapping>
-      <servlet-name>cmisbrowser</servlet-name>
-      <url-pattern>/cmisbrowser/*</url-pattern>
-   </servlet-mapping>
-    
-   <!-- The CMIS TCK is deactivated by default. -->
-   <!-- CMISTCK
-   <servlet-mapping>
-      <servlet-name>cmistck</servlet-name>
-      <url-pattern>/cmistck</url-pattern>
-   </servlet-mapping>
-   CMISTCK -->
-   
-   <!-- Activiti servlet mapping placeholder -->
-
-   <session-config>
-      <session-timeout>60</session-timeout>
-   </session-config>
-
-   <welcome-file-list>
-      <welcome-file>index.jsp</welcome-file>
-   </welcome-file-list>
-
-   <error-page>
-      <exception-type>java.lang.Exception</exception-type>
-      <location>/jsp/error.jsp</location>
-   </error-page>
-
-   <resource-ref>
-      <description>The Alfresco database connection</description>
-      <res-ref-name>jdbc/dataSource</res-ref-name>
-      <res-type>javax.sql.DataSource</res-type>
-      <res-auth>Container</res-auth>
-      <res-sharing-scope>Unshareable</res-sharing-scope>
-   </resource-ref>
-   <!-- 
-   <security-constraint>
-      <web-resource-collection>
-         <web-resource-name>SOLR</web-resource-name>
-         <url-pattern>/service/api/solr/*</url-pattern>
-      </web-resource-collection>
-
-      <auth-constraint>
-         <role-name>repoclient</role-name>
-      </auth-constraint>
-
-      <user-data-constraint>
-         <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-      </user-data-constraint>
-   </security-constraint>
-
-   <security-constraint>
-      <web-resource-collection>
-         <web-resource-name>SOLR</web-resource-name>
-         <url-pattern>/s/api/solr/*</url-pattern>
-      </web-resource-collection>
-
-      <auth-constraint>
-         <role-name>repoclient</role-name>
-      </auth-constraint>
-
-      <user-data-constraint>
-         <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-      </user-data-constraint>
-   </security-constraint>
-   
-   <security-constraint>
-      <web-resource-collection>
-         <web-resource-name>SOLR</web-resource-name>
-         <url-pattern>/wcservice/api/solr/*</url-pattern>
-      </web-resource-collection>
-
-      <auth-constraint>
-         <role-name>repoclient</role-name>
-      </auth-constraint>
-
-      <user-data-constraint>
-         <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-      </user-data-constraint>
-   </security-constraint>
-   
-   <security-constraint>
-      <web-resource-collection>
-         <web-resource-name>SOLR</web-resource-name>
-         <url-pattern>/wcs/api/solr/*</url-pattern>
-      </web-resource-collection>
-
-      <auth-constraint>
-         <role-name>repoclient</role-name>
-      </auth-constraint>
-
-      <user-data-constraint>
-         <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-      </user-data-constraint>
-   </security-constraint>
-   
-   <login-config>
-      <auth-method>CLIENT-CERT</auth-method>
-      <realm-name>Repository</realm-name>
-   </login-config>
-
-   <security-role>
-     <role-name>repoclient</role-name>
-   </security-role>
-    -->
-
-   <env-entry>
-      <description>A flag that globally enables or disables startup of the major Alfresco subsystems.</description>
-      <env-entry-name>properties/startup.enable</env-entry-name>
-      <env-entry-value>true</env-entry-value>
-      <env-entry-type>java.lang.Boolean</env-entry-type>
-   </env-entry>
-
-   <env-entry>
-      <description>The filesystem directory below which content and index data is stored. Should be on a shared disk
-         if this is a clustered installation.</description>
-      <env-entry-name>properties/dir.root</env-entry-name>
-      <env-entry-value/> <!-- Empty value included for JBoss compatibility -->
-      <env-entry-type>java.lang.String</env-entry-type>
-   </env-entry>
-
-   <env-entry>
-      <description>The fully qualified name of a org.hibernate.dialect.Dialect subclass that allows Hibernate to
-         generate SQL optimized for a particular relational database. Choose from org.hibernate.dialect.DerbyDialect,
-         org.hibernate.dialect.MySQLInnoDBDialect,
-         org.alfresco.repo.domain.hibernate.dialect.AlfrescoOracle9Dialect,
-         org.alfresco.repo.domain.hibernate.dialect.AlfrescoSybaseAnywhereDialect,
-         org.alfresco.repo.domain.hibernate.dialect.AlfrescoSQLServerDialect, org.hibernate.dialect.PostgreSQLDialect</description>
-      <env-entry-name>properties/hibernate.dialect</env-entry-name>
-      <env-entry-value/> <!-- Empty value included for JBoss compatibility -->
-      <env-entry-type>java.lang.String</env-entry-type>
-   </env-entry>
-
-   <env-entry>
-      <description>Mapping from tokens in Hibernate queries to SQL tokens. For PostgreSQL, set this to "true
-         TRUE, false FALSE".</description>
-      <env-entry-name>properties/hibernate.query.substitutions</env-entry-name>
-      <env-entry-value/> <!-- Empty value included for JBoss compatibility -->
-      <env-entry-type>java.lang.String</env-entry-type>
-   </env-entry>
-
-   <env-entry>
-      <description>Enable use of JDBC3 PreparedStatement.getGeneratedKeys() to retrieve natively generated keys
-         after insert. Requires JDBC3+ driver. Set to false if your driver has problems with the Hibernate identifier
-         generators. By default, tries to determine the driver capabilities using connection metadata. </description>
-      <env-entry-name>properties/hibernate.jdbc.use_get_generated_keys</env-entry-name>
-      <env-entry-value/> <!-- Empty value included for JBoss compatibility -->
-      <env-entry-type>java.lang.String</env-entry-type>
-   </env-entry>
-
-   <env-entry>
-      <description>Qualify unqualified table names with the given schema/tablespace in generated SQL. It may be
-         necessary to set this when the target database has more than one schema.</description>
-      <env-entry-name>properties/hibernate.default_schema</env-entry-name>
-      <env-entry-value/> <!-- Empty value included for JBoss compatibility -->
-      <env-entry-type>java.lang.String</env-entry-type>
-   </env-entry>
-
-</web-app>
\ No newline at end of file
diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index eebab048..06ada210 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -419,7 +419,8 @@
                 <phase>process-test-resources</phase>
                 <goals><goal>copy-resources</goal></goals>
                 <configuration>
-                  <outputDirectory>${app.amp.test.output.folder}</outputDirectory>
+                  <!-- <outputDirectory>${app.amp.test.output.folder}</outputDirectory> -->
+                 <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
                   <resources>
                     <resource>
                       <directory>${app.amp.folder}/config</directory>
@@ -444,13 +445,18 @@
                   <argLine>${app.testing.jvm.args}</argLine>
                   <additionalClasspathElements>
                       <!-- Adds the previously built ${app.amp.test.output.folder} to test classpath to enable module installation at test time -->
-                      <additionalClasspathElement>${app.amp.test.output.folder}</additionalClasspathElement>
+                      <!-- <additionalClasspathElement>${app.amp.test.output.folder}</additionalClasspathElement> -->
                   </additionalClasspathElements>
               </configuration>
             </plugin>
         </plugins>
       </build>
       <dependencies>
+          <dependency>
+              <artifactId>junit-remote</artifactId>
+              <groupId>com.tradeshift</groupId>
+              <version>3</version>
+          </dependency>
           <!-- SDK AMP Testing Dependencies -->
           <dependency>
             <groupId>com.h2database</groupId>
@@ -468,7 +474,8 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
             <version>3.0.5.RELEASE</version>
-            <scope>test</scope>
+            <!-- To make remote testing working -->
+            <!--             <scope>test</scope> -->
           </dependency>
           <!-- Requires this explicit test dependency, for a Spring 3.0.5 bug 
           |    See https://jira.springsource.org/browse/SPR-8527 
@@ -499,6 +506,9 @@
     <!-- Enable AMP project packing on a WAR and run embedded in Tomcat -->
     <profile>
       <id>amp-to-war</id>
+      <properties>
+        <skipTests>true</skipTests>
+      </properties>
       <build>
         <plugins>
           <!-- Fetch and unpack Alfresco Repository / Share in the target / folder -->
@@ -550,7 +560,7 @@
                 </configuration>
               </execution>
               <execution>
-                <id>copy-tomcat-context</id>
+                <id>copy-tomcat-resources</id>
                 <phase>prepare-package</phase>
                 <goals><goal>copy-resources</goal></goals>
                 <configuration>
@@ -560,12 +570,28 @@
                       <directory>tomcat</directory>
                       <filtering>${app.filtering.enabled}</filtering>
                       <targetPath>WEB-INF</targetPath>
+                      <includes>
+                        <include>context.xml</include>
+                      </includes>
+                    </resource>
+                    <resource>
+                      <directory>tomcat</directory>
+                      <filtering>${app.filtering.enabled}</filtering>
+                      <targetPath>WEB-INF/classes/alfresco/extension</targetPath>
+                      <includes>
+                        <include>rad-context.xml</include>
+                      </includes>
                     </resource>
                     <resource>
                       <directory>src/test/properties/${env}</directory>
                       <filtering>${app.filtering.enabled}</filtering>
                       <targetPath>WEB-INF/classes</targetPath>
                     </resource>
+                    <resource>
+                      <directory>${project.build.testOutputDirectory}</directory>
+                      <filtering>${app.filtering.enabled}</filtering>
+                      <targetPath>WEB-INF/classes</targetPath>
+                    </resource>
                   </resources>
                 </configuration>
               </execution>